' . t('The Diff module replaces the normal Revisions node tab and enhances the listing of revisions with an option to view the differences between any two content revisions.') . '
';
- $output .= '' . t('Configurations for the revision comparison functionality and diff layout plugins.') . '
';
-
- case 'diff.revision_overview':
- return '' . t('Revisions allow you to track differences between multiple versions of your content, and revert to older versions.') . '
';
-
- case 'diff.fields_list':
- return '' . t('This table provides a summary of the field support found on the system. For every field, a diff plugin can be selected and configured. These settings are applied to Unified and Split fields layouts.') . '
';
- }
-}
-
-/**
- * Returns the label of a certain field.
- *
- * Therefore it looks up in all bundles to find the most used field.
- *
- * @param string $entity_type
- * The entity type id.
- * @param string $field_name
- * The field name.
- *
- * @return array
- * Array of labels used for the field sorted by the most used.
- */
-function _diff_field_label($entity_type, $field_name) {
- $labels = [];
- // Count the amount of instances of each label per field storage.
- $bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type);
- $field_manager = \Drupal::service('entity_field.manager');
- foreach (array_keys($bundles) as $bundle) {
- $bundle_instances = $field_manager->getFieldDefinitions($entity_type, $bundle);
- if (isset($bundle_instances[$field_name])) {
- $instance = $bundle_instances[$field_name];
- $label = (string) $instance->getLabel();
- $labels[$label] = isset($labels[$label]) ? ++$labels[$label] : 1;
- }
- }
-
- if (empty($labels)) {
- // Return the original field name if there is no other label found.
- return [$field_name];
- }
-
- // Return the labels sorted by the most used.
- arsort($labels);
- return array_keys($labels);
-}
diff --git a/modules/diff/diff.routing.yml b/modules/diff/diff.routing.yml
deleted file mode 100644
index c3314dd..0000000
--- a/modules/diff/diff.routing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-diff.revisions_diff:
- path: '/node/{node}/revisions/view/{left_revision}/{right_revision}/{filter}'
- defaults:
- _controller: '\Drupal\diff\Controller\NodeRevisionController::compareNodeRevisions'
- _title: Diff General Settings
- requirements:
- _access_node_revision: 'view'
- options:
- _admin_route: TRUE
-
-diff.general_settings:
- path: '/admin/config/content/diff/general'
- defaults:
- _form: '\Drupal\diff\Form\GeneralSettingsForm'
- _title: Diff General Settings
- requirements:
- _permission: 'administer site configuration'
-
-diff.fields_list:
- path: '/admin/config/content/diff/fields'
- defaults:
- _form: '\Drupal\diff\Form\FieldsSettingsForm'
- _title: Fields Settings
- requirements:
- _permission: 'administer site configuration'
diff --git a/modules/diff/diff.services.yml b/modules/diff/diff.services.yml
deleted file mode 100644
index b670e5f..0000000
--- a/modules/diff/diff.services.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-services:
- diff.route_subscriber:
- class: Drupal\diff\Routing\RouteSubscriber
- tags:
- - { name: event_subscriber }
-
- diff.diff.formatter:
- class: Drupal\diff\DiffFormatter
- arguments: ['@config.factory']
-
- plugin.manager.diff.builder:
- class: Drupal\diff\DiffBuilderManager
- parent: default_plugin_manager
- arguments: ['@entity_type.manager', '@config.factory']
-
- plugin.manager.diff.layout:
- class: Drupal\diff\DiffLayoutManager
- parent: default_plugin_manager
- arguments: ['@entity_type.manager', '@config.factory']
-
- diff.entity_parser:
- class: Drupal\diff\DiffEntityParser
- arguments: ['@plugin.manager.diff.builder', '@config.factory']
-
- diff.entity_comparison:
- class: Drupal\diff\DiffEntityComparison
- arguments: ['@config.factory', '@diff.diff.formatter','@plugin.manager.field.field_type', '@diff.entity_parser', '@plugin.manager.diff.builder']
-
- diff.html_diff:
- class: HtmlDiffAdvanced
-
- theme.negotiator.visual_diff:
- class: Drupal\diff\VisualDiffThemeNegotiator
- arguments: ['@config.factory']
- tags:
- - { name: theme_negotiator, priority: 0 }
diff --git a/modules/diff/diff.views.inc b/modules/diff/diff.views.inc
deleted file mode 100644
index 1c9e876..0000000
--- a/modules/diff/diff.views.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-getDefinitions() as $entity_type) {
- // Add the diff_from and diff_to fields to every revisionable entity type.
- if ($entity_type->isRevisionable()) {
- $revision_base_table = $entity_type->getRevisionDataTable() ?: $entity_type->getRevisionTable();
-
- $data[$revision_base_table]['diff_from'] = [
- 'title' => t('Diff from'),
- 'help' => 'Diff "from" radio button to compare revisions. Also adds the "Compare" button.',
- 'field' => [
- 'id' => 'diff__from',
- ],
- ];
- $data[$revision_base_table]['diff_to'] = [
- 'title' => t('Diff to'),
- 'help' => 'Diff "to" radio button to compare revisions.',
- 'field' => [
- 'id' => 'diff__to',
- ],
- ];
- }
- }
-
- return $data;
-}
diff --git a/modules/diff/js/diff.js b/modules/diff/js/diff.js
deleted file mode 100644
index d417aba..0000000
--- a/modules/diff/js/diff.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function ($, Drupal, drupalSettings) {
-
- 'use strict';
-
- Drupal.behaviors.diffRevisions = {
- attach: function (context, settings) {
- // drupalSettings in not anymore bound to attached functions.
- // It is available outside the scope of this anonymous function also.
- var $rows = $('table.diff-revisions tbody tr').once('diff-revisions');
- if ($rows.length === 0) {
- return;
- }
-
- function updateDiffRadios() {
- var newTd = false;
- var oldTd = false;
- if (!$rows.length) {
- return true;
- }
- $rows.each(function () {
- var $row = $(this);
- var $inputs = $row.find('input[type="radio"]');
- var $oldRadio = $inputs.filter('[name="radios_left"]').eq(0);
- var $newRadio = $inputs.filter('[name="radios_right"]').eq(0);
- if (!$oldRadio.length || !$newRadio.length) {
- return true;
- }
- if ($oldRadio.prop('checked')) {
- oldTd = true;
- $oldRadio.css('visibility', 'visible');
- $newRadio.css('visibility', 'hidden');
- }
- else if ($newRadio.prop('checked')) {
- newTd = true;
- $oldRadio.css('visibility', 'hidden');
- $newRadio.css('visibility', 'visible');
- }
- else {
- if (drupalSettings.diffRevisionRadios === 'linear') {
- if (newTd && oldTd) {
- $oldRadio.css('visibility', 'visible');
- $newRadio.css('visibility', 'hidden');
- }
- else if (newTd) {
- $newRadio.css('visibility', 'visible');
- $oldRadio.css('visibility', 'visible');
- }
- else {
- $newRadio.css('visibility', 'visible');
- $oldRadio.css('visibility', 'hidden');
- }
- }
- else {
- $newRadio.css('visibility', 'visible');
- $oldRadio.css('visibility', 'visible');
- }
- }
- });
- return true;
- }
-
- if (drupalSettings.diffRevisionRadios) {
- $rows.find('input[name="radios_left"], input[name="radios_right"]').click(updateDiffRadios);
- updateDiffRadios();
- }
- }
- };
-
-})(jQuery, Drupal, drupalSettings);
diff --git a/modules/diff/src/Annotation/DiffLayoutBuilder.php b/modules/diff/src/Annotation/DiffLayoutBuilder.php
deleted file mode 100644
index f13ae12..0000000
--- a/modules/diff/src/Annotation/DiffLayoutBuilder.php
+++ /dev/null
@@ -1,39 +0,0 @@
-formBuilder()->getForm('Drupal\diff\Form\RevisionOverviewForm', $node);
- }
-
- /**
- * Returns a table which shows the differences between two node revisions.
- *
- * @param \Drupal\node\NodeInterface $node
- * The node whose revisions are compared.
- * @param int $left_revision
- * Vid of the node revision from the left.
- * @param int $right_revision
- * Vid of the node revision from the right.
- * @param string $filter
- * If $filter == 'raw' raw text is compared (including html tags)
- * If $filter == 'raw-plain' markdown function is applied to the text before comparison.
- *
- * @return array
- * Table showing the diff between the two node revisions.
- */
- public function compareNodeRevisions(NodeInterface $node, $left_revision, $right_revision, $filter) {
- $storage = $this->entityTypeManager()->getStorage('node');
- $route_match = \Drupal::routeMatch();
- $left_revision = $storage->loadRevision($left_revision);
- $right_revision = $storage->loadRevision($right_revision);
- $build = $this->compareEntityRevisions($route_match, $left_revision, $right_revision, $filter);
- return $build;
- }
-
-}
diff --git a/modules/diff/src/Controller/PluginRevisionController.php b/modules/diff/src/Controller/PluginRevisionController.php
deleted file mode 100644
index 7b6a53d..0000000
--- a/modules/diff/src/Controller/PluginRevisionController.php
+++ /dev/null
@@ -1,327 +0,0 @@
-config = $this->config('diff.settings');
- $this->diffLayoutManager = $diff_layout_manager;
- $this->entityComparison = $entity_comparison;
- $this->requestStack = $request_stack;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('diff.entity_comparison'),
- $container->get('plugin.manager.diff.layout'),
- $container->get('request_stack')
- );
- }
-
- /**
- * Get all the revision ids of given entity id.
- *
- * @param \Drupal\Core\Entity\EntityStorageInterface $storage
- * The entity storage manager.
- * @param int $entity_id
- * The entity to find revisions of.
- *
- * @return int[]
- * The revision ids.
- */
- public function getRevisionIds(EntityStorageInterface $storage, $entity_id) {
- $result = $storage->getQuery()
- ->allRevisions()
- ->condition($storage->getEntityType()->getKey('id'), $entity_id)
- ->execute();
- $result_array = array_keys($result);
- sort($result_array);
- return $result_array;
- }
-
- /**
- * Returns a table which shows the differences between two entity revisions.
- *
- * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
- * The route match.
- * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
- * The left revision.
- * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
- * The right revision.
- * @param string $filter
- * If $filter == 'raw' raw text is compared (including html tags)
- * If filter == 'raw-plain' markdown function is applied to the text before comparison.
- *
- * @return array
- * Table showing the diff between the two entity revisions.
- */
- public function compareEntityRevisions(RouteMatchInterface $route_match, ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, $filter) {
- $entity_type_id = $left_revision->getEntityTypeId();
- /** @var \Drupal\Core\Entity\EntityInterface $entity */
- $entity = $route_match->getParameter($entity_type_id);
-
- $entity_type_id = $entity->getEntityTypeId();
- $storage = $this->entityTypeManager()->getStorage($entity_type_id);
- // Get language from the entity context.
- $langcode = $entity->language()->getId();
-
- // Get left and right revision in current language.
- $left_revision = $left_revision->getTranslation($langcode);
- $right_revision = $right_revision->getTranslation($langcode);
-
- $revisions_ids = [];
- // Filter revisions of current translation and where the translation is
- // affected.
- foreach ($this->getRevisionIds($storage, $entity->id()) as $revision_id) {
- /** @var \Drupal\Core\Entity\ContentEntityInterface $revision */
- $revision = $storage->loadRevision($revision_id);
- if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
- $revisions_ids[] = $revision_id;
- }
- }
-
- $build = [
- '#title' => $this->t('Changes to %title', ['%title' => $entity->label()]),
- 'header' => [
- '#prefix' => '',
- ],
- 'controls' => [
- '#prefix' => '';
- $build['diff']['#suffix'] = '
';
- $build['diff']['#attributes']['class'][] = 'diff-responsive-table';
- }
- }
-
- $build['#attached']['library'][] = 'diff/diff.general';
- return $build;
- }
-
- /**
- * Builds a navigation dropdown button between the layout plugins.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $entity
- * The entity to be compared.
- * @param int $left_revision_id
- * Revision id of the left revision.
- * @param int $right_revision_id
- * Revision id of the right revision.
- * @param string $active_filter
- * The active filter.
- *
- * @return array
- * The layout filter.
- */
- protected function buildLayoutNavigation(ContentEntityInterface $entity, $left_revision_id, $right_revision_id, $active_filter) {
- $links = [];
- $layouts = $this->diffLayoutManager->getPluginOptions();
- foreach ($layouts as $key => $value) {
- $links[$key] = array(
- 'title' => $value,
- 'url' => $this->diffRoute($entity, $left_revision_id, $right_revision_id, $key),
- );
- }
-
- // Set as the first element the current filter.
- $filter = $links[$active_filter];
- unset($links[$active_filter]);
- array_unshift($links, $filter);
-
- $filter = [
- '#type' => 'operations',
- '#links' => $links,
- ];
-
- return $filter;
- }
-
- /**
- * Creates navigation links between the previous changes and the new ones.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $entity
- * The entity to be compared.
- * @param array $revision_ids
- * The revision ids.
- * @param int $left_revision_id
- * Revision id of the left revision.
- * @param int $right_revision_id
- * Revision id of the right revision.
- * @param string $filter
- * The filter.
- *
- * @return array
- * The revision navigation links.
- */
- protected function buildRevisionsNavigation(ContentEntityInterface $entity, array $revision_ids, $left_revision_id, $right_revision_id, $filter) {
- $revisions_count = count($revision_ids);
- $layout_options = &drupal_static(__FUNCTION__);
- if (!isset($layout_options)) {
- $layout_options = UrlHelper::filterQueryParameters($this->requestStack->getCurrentRequest()->query->all(), ['page']);
- }
- // If there are only 2 revision return an empty row.
- if ($revisions_count == 2) {
- return [];
- }
- else {
- $left_link = $right_link = '';
- $element = [
- '#type' => 'item',
- '#title' => $this->t('Navigation'),
- '#wrapper_attributes' => ['class' => 'diff-navigation'],
- ];
- $i = 0;
- // Find the previous revision.
- while ($left_revision_id > $revision_ids[$i]) {
- $i += 1;
- }
- if ($i != 0) {
- // Build the left link.
- $left_link = Link::fromTextAndUrl($this->t('Previous change'), $this->diffRoute($entity, $revision_ids[$i - 1], $left_revision_id, $filter, $layout_options))->toString();
- }
- $element['left'] = [
- '#type' => 'markup',
- '#markup' => $left_link,
- '#prefix' => '
',
- '#suffix' => '
',
- ];
- // Find the next revision.
- $i = 0;
- while ($i < $revisions_count && $right_revision_id >= $revision_ids[$i]) {
- $i += 1;
- }
- if ($revisions_count != $i && $revision_ids[$i - 1] != $revision_ids[$revisions_count - 1]) {
- // Build the right link.
- $right_link = Link::fromTextAndUrl($this->t('Next change'), $this->diffRoute($entity, $right_revision_id, $revision_ids[$i], $filter, $layout_options))->toString();
- }
- $element['right'] = [
- '#type' => 'markup',
- '#markup' => $right_link,
- '#prefix' => '
',
- '#suffix' => '
',
- ];
- return $element;
- }
- }
-
- /**
- * Creates an url object for diff.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $entity
- * The entity to be compared.
- * @param int $left_revision_id
- * Revision id of the left revision.
- * @param int $right_revision_id
- * Revision id of the right revision.
- * @param string $layout
- * (optional) The filter/layout added to the route.
- * @param array $layout_options
- * (optional) The layout options provided by the selected layout.
- *
- * @return \Drupal\Core\Url
- * The URL object.
- */
- public static function diffRoute(ContentEntityInterface $entity, $left_revision_id, $right_revision_id, $layout = NULL, array $layout_options = NULL) {
- $entity_type_id = $entity->getEntityTypeId();
- // @todo Remove the diff.revisions_diff route so we avoid adding extra cases.
- if ($entity->getEntityTypeId() == 'node') {
- $route_name = 'diff.revisions_diff';
- }
- else {
- $route_name = "entity.$entity_type_id.revisions_diff";
- }
- $route_parameters = [
- $entity_type_id => $entity->id(),
- 'left_revision' => $left_revision_id,
- 'right_revision' => $right_revision_id,
- ];
- if ($layout) {
- $route_parameters['filter'] = $layout;
- }
- $options = [];
- if ($layout_options) {
- $options = [
- 'query' => $layout_options,
- ];
- }
- return Url::fromRoute($route_name, $route_parameters, $options);
- }
-
-}
diff --git a/modules/diff/src/DiffBuilderManager.php b/modules/diff/src/DiffBuilderManager.php
deleted file mode 100644
index 41bc24a..0000000
--- a/modules/diff/src/DiffBuilderManager.php
+++ /dev/null
@@ -1,268 +0,0 @@
-setCacheBackend($cache_backend, 'field_diff_builder_plugins');
- $this->alterInfo('field_diff_builder_info');
- $this->entityTypeManager = $entity_type_manager;
- $this->config = $config_factory->get('diff.settings');
- $this->pluginsConfig = $config_factory->get('diff.plugins');
-
- }
-
- /**
- * Define whether a field should be displayed or not as a diff change.
- *
- * To define if a field should be displayed in the diff comparison, check if
- * it is revisionable and is not the bundle or revision field of the entity.
- *
- * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage_definition
- * The field storage definition.
- *
- * @return bool
- * TRUE if the field will be displayed.
- */
- public function showDiff(FieldStorageDefinitionInterface $field_storage_definition) {
- $show_diff = FALSE;
- // Check if the field is revisionable.
- if ($field_storage_definition->isRevisionable()) {
- $show_diff = TRUE;
- // Do not display the field, if it is the bundle or revision field of the
- // entity.
- $entity_type = $this->entityTypeManager->getDefinition($field_storage_definition->getTargetEntityTypeId());
- // @todo Don't hard code fields after: https://www.drupal.org/node/2248983
- if (in_array($field_storage_definition->getName(), [
- 'revision_log',
- 'revision_uid',
- $entity_type->getKey('bundle'),
- $entity_type->getKey('revision'),
- ])) {
- $show_diff = FALSE;
- }
- }
- return $show_diff;
- }
-
- /**
- * Creates a plugin instance for a field definition.
- *
- * Creates the instance based on the selected plugin for the field.
- *
- * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
- * The field definition.
- *
- * @return \Drupal\diff\FieldDiffBuilderInterface|null
- * The plugin instance, NULL if none.
- */
- public function createInstanceForFieldDefinition(FieldDefinitionInterface $field_definition) {
- $selected_plugin = $this->getSelectedPluginForFieldStorageDefinition($field_definition->getFieldStorageDefinition());
- if ($selected_plugin['type'] != 'hidden') {
- return $this->createInstance($selected_plugin['type'], $selected_plugin['settings']);
- }
- return NULL;
- }
-
- /**
- * Selects a default plugin for a field storage definition.
- *
- * Checks if a plugin has been already selected for the field, otherwise
- * chooses one between the plugins that can be applied to the field.
- *
- * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_definition
- * The field storage definition.
- *
- * @return array
- * An array with the key type (which contains the plugin ID) and settings.
- * The special type hidden indicates that the field should not be shown.
- */
- public function getSelectedPluginForFieldStorageDefinition(FieldStorageDefinitionInterface $field_definition) {
- $plugin_options = $this->getApplicablePluginOptions($field_definition);
- $field_key = $field_definition->getTargetEntityTypeId() . '.' . $field_definition->getName();
-
- // Start with the stored configuration, this returns NULL if there is none.
- $selected_plugin = $this->pluginsConfig->get('fields.' . $field_key);
-
- // If there is configuration and it is a valid type or exlplicitly set to
- // hidden, then use that, otherwise try to find a suitable default plugin.
- if ($selected_plugin && (in_array($selected_plugin['type'], array_keys($plugin_options)) || $selected_plugin['type'] == 'hidden')) {
- return $selected_plugin + ['settings' => []];
- }
- elseif (!empty($plugin_options) && $this->isFieldStorageDefinitionDisplayed($field_definition)) {
- return ['type' => key($plugin_options), 'settings' => []];
- }
- else {
- return ['type' => 'hidden', 'settings' => []];
- }
- }
-
- /**
- * Determines if the field is displayed.
- *
- * Determines if a field should be displayed when comparing revisions based on
- * the entity view display if there is no plugin selected for the field.
- *
- * @param FieldStorageDefinitionInterface $field_storage_definition
- * The field name.
- *
- * @return bool
- * Whether the field is displayed.
- */
- public function isFieldStorageDefinitionDisplayed(FieldStorageDefinitionInterface $field_storage_definition) {
- if (($field_storage_definition instanceof BaseFieldDefinition && $field_storage_definition->isDisplayConfigurable('view')) || $field_storage_definition instanceof FieldStorageConfig) {
- $field_key = 'content.' . $field_storage_definition->getName() . '.type';
- $storage = $this->entityTypeManager->getStorage('entity_view_display');
- $query = $storage->getQuery()->condition('targetEntityType', $field_storage_definition->getTargetEntityTypeId());
- if ($field_storage_definition instanceof FieldStorageConfig) {
- $bundles = $field_storage_definition->getBundles();
- $query->condition('bundle', (array) $bundles, 'IN');
- }
- $result = $query->exists($field_key)->range(0, 1)->execute();
- return !empty($result) ? TRUE : FALSE;
- }
- else {
- $view_options = (bool) $field_storage_definition->getDisplayOptions('view');
- return $view_options;
- }
- }
-
- /**
- * Gets the applicable plugin options for a given field.
- *
- * Loop over the plugins that can be applied to the field and builds an array
- * of possible plugins based on each plugin weight.
- *
- * @param FieldStorageDefinitionInterface $field_definition
- * The field storage definition.
- *
- * @return array
- * The plugin option for the given field based on plugin weight.
- */
- public function getApplicablePluginOptions(FieldStorageDefinitionInterface $field_definition) {
- $plugins = $this->getPluginDefinitions();
- // Build a list of all diff plugins supporting the field type of the field.
- $plugin_options = [];
- if (isset($plugins[$field_definition->getType()])) {
- // Sort the plugins based on their weight.
- uasort($plugins[$field_definition->getType()], 'Drupal\Component\Utility\SortArray::sortByWeightElement');
-
- foreach ($plugins[$field_definition->getType()] as $id => $weight) {
- $definition = $this->getDefinition($id, FALSE);
- // Check if the plugin is applicable.
- if (isset($definition['class']) && in_array($field_definition->getType(), $definition['field_types'])) {
- /** @var FieldDiffBuilderInterface $class */
- $class = $definition['class'];
- if ($class::isApplicable($field_definition)) {
- $plugin_options[$id] = $this->getDefinitions()[$id]['label'];
- }
- }
- }
- }
- return $plugin_options;
- }
-
- /**
- * Initializes the local pluginDefinitions property.
- *
- * Loop over the plugin definitions and build an array keyed by the field type
- * that plugins can be applied to.
- *
- * @return array
- * The initialized plugins array sort by field type.
- */
- public function getPluginDefinitions() {
- if (!isset($this->pluginDefinitions)) {
- // Get the definition of all the FieldDiffBuilder plugins.
- foreach ($this->getDefinitions() as $plugin_definition) {
- if (isset($plugin_definition['field_types'])) {
- // Iterate through all the field types this plugin supports
- // and for every such field type add the id of the plugin.
- if (!isset($plugin_definition['weight'])) {
- $plugin_definition['weight'] = 0;
- }
-
- foreach ($plugin_definition['field_types'] as $id) {
- $this->pluginDefinitions[$id][$plugin_definition['id']]['weight'] = $plugin_definition['weight'];
- }
- }
- }
- }
- return $this->pluginDefinitions;
- }
-
- /**
- * Clear the pluginDefinitions local property array.
- */
- public function clearCachedDefinitions() {
- unset($this->pluginDefinitions);
- }
-
-}
diff --git a/modules/diff/src/DiffEntityComparison.php b/modules/diff/src/DiffEntityComparison.php
deleted file mode 100644
index 65e15d0..0000000
--- a/modules/diff/src/DiffEntityComparison.php
+++ /dev/null
@@ -1,354 +0,0 @@
-configFactory = $config_factory;
- $this->pluginsConfig = $this->configFactory->get('diff.plugins');
- $this->diffFormatter = $diff_formatter;
- $this->fieldTypeDefinitions = $plugin_manager->getDefinitions();
- $this->entityParser = $entity_parser;
- $this->diffBuilderManager = $diff_builder_manager;
- }
-
- /**
- * This method should return an array of items ready to be compared.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $left_entity
- * The left entity.
- * @param \Drupal\Core\Entity\ContentEntityInterface $right_entity
- * The right entity.
- *
- * @return array
- * Items ready to be compared by the Diff component.
- */
- public function compareRevisions(ContentEntityInterface $left_entity, ContentEntityInterface $right_entity) {
- $result = array();
-
- $left_values = $this->entityParser->parseEntity($left_entity);
- $right_values = $this->entityParser->parseEntity($right_entity);
-
- foreach ($left_values as $left_key => $values) {
- list (, $field_key) = explode(':', $left_key);
- // Get the compare settings for this field type.
- $compare_settings = $this->pluginsConfig->get('fields.' . $field_key);
- $result[$left_key] = [
- '#name' => (isset($compare_settings['settings']['show_header']) && $compare_settings['settings']['show_header'] == 0) ? '' : $values['label'],
- '#settings' => $compare_settings,
- '#data' => [],
- ];
-
- // Fields which exist on the right entity also.
- if (isset($right_values[$left_key])) {
- $result[$left_key]['#data'] += $this->combineFields($left_values[$left_key], $right_values[$left_key]);
- // Unset the field from the right entity so that we know if the right
- // entity has any fields that left entity doesn't have.
- unset($right_values[$left_key]);
- }
- // This field exists only on the left entity.
- else {
- $result[$left_key]['#data'] += $this->combineFields($left_values[$left_key], []);
- }
- }
-
- // Fields which exist only on the right entity.
- foreach ($right_values as $right_key => $values) {
- list (, $field_key) = explode(':', $right_key);
- $compare_settings = $this->pluginsConfig->get('fields.' . $field_key);
- $result[$right_key] = [
- '#name' => (isset($compare_settings['settings']['show_header']) && $compare_settings['settings']['show_header'] == 0) ? '' : $values['label'],
- '#settings' => $compare_settings,
- '#data' => [],
- ];
- $result[$right_key]['#data'] += $this->combineFields([], $right_values[$right_key]);
- }
-
- return $result;
- }
-
- /**
- * Combine two fields into an array with keys '#left' and '#right'.
- *
- * @param array $left_values
- * Entity field formatted into an array of strings.
- * @param array $right_values
- * Entity field formatted into an array of strings.
- *
- * @return array
- * Array resulted after combining the left and right values.
- */
- protected function combineFields(array $left_values, array $right_values) {
- $result = array(
- '#left' => array(),
- '#right' => array(),
- );
- $max = max(array(count($left_values), count($right_values)));
- for ($delta = 0; $delta < $max; $delta++) {
- // EXPERIMENTAL: Transform thumbnail from ImageFieldBuilder.
- // @todo Make thumbnail / rich diff data pluggable.
- // @see https://www.drupal.org/node/2840566
- if (isset($left_values[$delta])) {
- $value = $left_values[$delta];
- if (isset($value['#thumbnail'])) {
- $result['#left_thumbnail'][] = $value['#thumbnail'];
- }
- else {
- $result['#left'][] = is_array($value) ? implode("\n", $value) : $value;
- }
- }
- if (isset($right_values[$delta])) {
- $value = $right_values[$delta];
- if (isset($value['#thumbnail'])) {
- $result['#right_thumbnail'][] = $value['#thumbnail'];
- }
- else {
- $result['#right'][] = is_array($value) ? implode("\n", $value) : $value;
- }
- }
- }
-
- // If a field has multiple values combine them into one single string.
- $result['#left'] = implode("\n", $result['#left']);
- $result['#right'] = implode("\n", $result['#right']);
-
- return $result;
- }
-
- /**
- * Prepare the table rows for #type 'table'.
- *
- * @param string $a
- * The source string to compare from.
- * @param string $b
- * The target string to compare to.
- * @param bool $show_header
- * Display diff context headers. For example, "Line x".
- * @param array $line_stats
- * Tracks line numbers across multiple calls to DiffFormatter.
- *
- * @see \Drupal\Component\Diff\DiffFormatter::format
- *
- * @return array
- * Array of rows usable with #type => 'table' returned by the core diff
- * formatter when format a diff.
- */
- public function getRows($a, $b, $show_header = FALSE, array &$line_stats = NULL) {
- if (!isset($line_stats)) {
- $line_stats = array(
- 'counter' => array('x' => 0, 'y' => 0),
- 'offset' => array('x' => 0, 'y' => 0),
- );
- }
-
- // Header is the line counter.
- $this->diffFormatter->show_header = $show_header;
- $diff = new Diff($a, $b);
-
- return $this->diffFormatter->format($diff);
- }
-
- /**
- * Splits the strings into lines and counts the resulted number of lines.
- *
- * @param array $diff
- * Array of strings.
- */
- public function processStateLine(array &$diff) {
- $data = $diff['#data'];
- if (isset($data['#left']) && $data['#left'] != '') {
- if (is_string($data['#left'])) {
- $diff['#data']['#left'] = explode("\n", $data['#left']);
- }
- $diff['#data']['#count_left'] = count($diff['#data']['#left']);
- }
- else {
- $diff['#data']['#count_left'] = 0;
- $diff['#data']['#left'] = [];
- }
- if (isset($data['#right']) && $data['#right'] != '') {
- if (is_string($data['#right'])) {
- $diff['#data']['#right'] = explode("\n", $data['#right']);
- }
- $diff['#data']['#count_right'] = count($diff['#data']['#right']);
- }
- else {
- $diff['#data']['#count_right'] = 0;
- $diff['#data']['#right'] = [];
- }
- }
-
- /**
- * Gets the revision description of the revision.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $revision
- * The current revision.
- * @param \Drupal\Core\Entity\ContentEntityInterface $previous_revision
- * (optional) The previous revision. Defaults to NULL.
- *
- * @return string
- * The revision log message.
- */
- public function getRevisionDescription(ContentEntityInterface $revision, ContentEntityInterface $previous_revision = NULL) {
- $summary_elements = [];
- $revision_summary = '';
- // Check if the revision has a revision log message.
- if ($revision instanceof RevisionLogInterface) {
- $revision_summary = Xss::filter($revision->getRevisionLogMessage());
- }
- // Auto generate the revision log.
- if ($revision_summary == '') {
- // If there is a previous revision, load values of both revisions, loop
- // over the current revision fields.
- if ($previous_revision) {
- $left_values = $this->summary($previous_revision);
- $right_values = $this->summary($revision);
- foreach ($right_values as $key => $value) {
- // Unset left values after comparing. Add right value label to the
- // summary if it is changed or new.
- if (isset($left_values[$key])) {
- if ($value['value'] != $left_values[$key]['value']) {
- $summary_elements[] = $value['label'];
- }
- unset($left_values[$key]);
- }
- else {
- $summary_elements[] = $value['label'];
- }
- }
- // Add the remaining left values if not present in the right entity.
- foreach ($left_values as $key => $value) {
- if (!isset($right_values[$key])) {
- $summary_elements[] = $value['label'];
- }
- }
- if (count($summary_elements) > 0) {
- $revision_summary = 'Changes on: ' . implode(', ', $summary_elements);
- }
- else {
- $revision_summary = 'No changes.';
- }
- }
- else {
- $revision_summary = 'Initial revision.';
- }
- }
-
- return $revision_summary;
- }
-
- /**
- * Creates an log message based on the changes of entity fields.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $revision
- * The current revision.
- *
- * @return array
- * Array of the revision fields with their value and label.
- */
- protected function summary(ContentEntityInterface $revision) {
- $result = [];
- $entity_type_id = $revision->getEntityTypeId();
- // Loop through entity fields and transform every FieldItemList object
- // into an array of strings according to field type specific settings.
- /** @var \Drupal\Core\Field\FieldItemListInterface $field_items */
- foreach ($revision as $field_items) {
- $show_delta = FALSE;
- // Create a plugin instance for the field definition.
- $plugin = $this->diffBuilderManager->createInstanceForFieldDefinition($field_items->getFieldDefinition());
- if ($plugin && $this->diffBuilderManager->showDiff($field_items->getFieldDefinition()->getFieldStorageDefinition())) {
- // Create the array with the fields of the entity. Recursive if the
- // field contains entities.
- if ($plugin instanceof FieldReferenceInterface) {
- foreach ($plugin->getEntitiesToDiff($field_items) as $entity_key => $reference_entity) {
- foreach ($this->summary($reference_entity) as $key => $build) {
- if ($field_items->getFieldDefinition()->getFieldStorageDefinition()->getCardinality() != 1) {
- $show_delta = TRUE;
- }
- $result[$key] = $build;
- $delta = $show_delta ? '
' . ($entity_key + 1) . ' ' : ' - ';
- $result[$key]['label'] = $field_items->getFieldDefinition()->getLabel() . $delta . $result[$key]['label'];
- };
- }
- }
- else {
- // Create a unique flat key.
- $key = $revision->id() . ':' . $entity_type_id . '.' . $field_items->getName();
-
- $result[$key]['value'] = $field_items->getValue();
- $result[$key]['label'] = $field_items->getFieldDefinition()->getLabel();
- }
- }
- }
-
- return $result;
- }
-
-}
diff --git a/modules/diff/src/DiffEntityParser.php b/modules/diff/src/DiffEntityParser.php
deleted file mode 100644
index bc41aa2..0000000
--- a/modules/diff/src/DiffEntityParser.php
+++ /dev/null
@@ -1,107 +0,0 @@
-config = $config_factory->get('diff.settings');
- $this->pluginsConfig = $config_factory->get('diff.plugins');
- $this->diffBuilderManager = $diff_builder_manager;
- }
-
- /**
- * Transforms an entity into an array of strings.
- *
- * Parses an entity's fields and for every field it builds an array of string
- * to be compared. Basically this function transforms an entity into an array
- * of strings.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $entity
- * An entity containing fields.
- *
- * @return array
- * Array of strings resulted by parsing the entity.
- */
- public function parseEntity(ContentEntityInterface $entity) {
- $result = array();
- $langcode = \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
- // Load entity of current language, otherwise fields are always compared by
- // their default language.
- if ($entity->hasTranslation($langcode)) {
- $entity = $entity->getTranslation($langcode);
- }
- $entity_type_id = $entity->getEntityTypeId();
- // Loop through entity fields and transform every FieldItemList object
- // into an array of strings according to field type specific settings.
- /** @var \Drupal\Core\Field\FieldItemListInterface $field_items */
- foreach ($entity as $field_items) {
- // Define if the current field should be displayed as a diff change.
- $show_diff = $this->diffBuilderManager->showDiff($field_items->getFieldDefinition()->getFieldStorageDefinition());
- if (!$show_diff || !$entity->get($field_items->getFieldDefinition()->getName())->access('view')) {
- continue;
- }
- // Create a plugin instance for the field definition.
- $plugin = $this->diffBuilderManager->createInstanceForFieldDefinition($field_items->getFieldDefinition());
- if ($plugin) {
- // Create the array with the fields of the entity. Recursive if the
- // field contains entities.
- if ($plugin instanceof FieldReferenceInterface) {
- foreach ($plugin->getEntitiesToDiff($field_items) as $entity_key => $reference_entity) {
- foreach ($this->parseEntity($reference_entity) as $key => $build) {
- $result[$key] = $build;
- $result[$key]['label'] = $field_items->getFieldDefinition()->getLabel() . ' > ' . $result[$key]['label'];
- };
- }
- }
- else {
- $build = $plugin->build($field_items);
- if (!empty($build)) {
- $result[$entity->id() . ':' . $entity_type_id . '.' . $field_items->getName()] = $build;
- $result[$entity->id() . ':' . $entity_type_id . '.' . $field_items->getName()]['label'] = $field_items->getFieldDefinition()->getLabel();
- }
- }
- }
- }
-
- $this->diffBuilderManager->clearCachedDefinitions();
- return $result;
- }
-
-}
diff --git a/modules/diff/src/DiffFormatter.php b/modules/diff/src/DiffFormatter.php
deleted file mode 100644
index 020fc57..0000000
--- a/modules/diff/src/DiffFormatter.php
+++ /dev/null
@@ -1,30 +0,0 @@
-get('diff.settings');
- $this->leading_context_lines = $config->get('general_settings.context_lines_leading');
- $this->trailing_context_lines = $config->get('general_settings.context_lines_trailing');
- }
-
-}
diff --git a/modules/diff/src/DiffLayoutBase.php b/modules/diff/src/DiffLayoutBase.php
deleted file mode 100644
index 85c423a..0000000
--- a/modules/diff/src/DiffLayoutBase.php
+++ /dev/null
@@ -1,350 +0,0 @@
-configFactory = $config;
- $this->entityTypeManager = $entity_type_manager;
- $this->entityParser = $entity_parser;
- $this->date = $date;
- $this->configuration += $this->defaultConfiguration();
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('config.factory'),
- $container->get('entity_type.manager'),
- $container->get('diff.entity_parser'),
- $container->get('date.formatter')
- );
- }
-
- /**
- * Build the revision link for a revision.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $revision
- * A revision where to add a link.
- *
- * @return \Drupal\Core\Link
- * Header link for a revision in the table.
- */
- protected function buildRevisionLink(ContentEntityInterface $revision) {
- $entity_type_id = $revision->getEntityTypeId();
- if ($revision instanceof RevisionLogInterface) {
- $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
- $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
- $revision_link = Link::fromTextAndUrl($revision_date, Url::fromRoute($route_name, [
- $entity_type_id => $revision->id(),
- $entity_type_id . '_revision' => $revision->getRevisionId(),
- ]))->toString();
- }
- else {
- $revision_link = Link::fromTextAndUrl($revision->label(), $revision->toUrl('revision'))
- ->toString();
- }
- return $revision_link;
- }
-
- /**
- * Build the revision link for the compared revisions.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
- * Left revision that is compared.
- * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
- * Right revision that is compared.
- *
- * @return array
- * Header link for a revision in the revision comparison display.
- */
- public function buildRevisionsData(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision) {
- $right_revision = $this->buildRevisionData($right_revision);
- $right_revision['#prefix'] = '
';
- $right_revision['#suffix'] = '
';
-
- $left_revision = $this->buildRevisionData($left_revision);
- $left_revision['#prefix'] = '
';
- $left_revision['#suffix'] = '
';
-
- // Show the revisions that are compared.
- return [
- 'header' => [
- 'diff_revisions' => [
- '#type' => 'item',
- '#title' => $this->t('Comparing'),
- '#wrapper_attributes' => ['class' => 'diff-revision'],
- 'items' => [
- '#prefix' => '
',
- '#suffix' => '
',
- 'right_revision' => $right_revision,
- 'left_revision' => $left_revision,
- ],
- ],
- ],
- ];
- }
-
- /**
- * Build the revision link for a revision.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $revision
- * Left revision that is compared.
- *
- * @return array
- * Revision data about author, creation date and log.
- */
- protected function buildRevisionData(ContentEntityInterface $revision) {
- $entity_type_id = $revision->getEntityTypeId();
- if ($revision instanceof RevisionLogInterface) {
- $revision_log = Xss::filter($revision->getRevisionLogMessage());
- $user_id = $revision->getRevisionUserId();
- $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
-
- $revision_link['date'] = [
- '#type' => 'link',
- '#title' => $this->date->format($revision->getRevisionCreationTime(), 'short'),
- '#url' => Url::fromRoute($route_name, [
- $entity_type_id => $revision->id(),
- $entity_type_id . '_revision' => $revision->getRevisionId(),
- ]),
- '#prefix' => '
',
- '#suffix' => '
',
- ];
-
- $revision_link['author'] = [
- '#type' => 'link',
- '#title' => $revision->getRevisionUser()->getDisplayName(),
- '#url' => Url::fromUri(\Drupal::request()->getUriForPath('/user/' . $user_id)),
- '#theme' => 'username',
- '#account' => $revision->getRevisionUser(),
- '#prefix' => '
',
- '#suffix' => '
',
- ];
-
- if ($revision_log) {
- $revision_link['message'] = [
- '#type' => 'markup',
- '#prefix' => '
',
- '#suffix' => '
',
- '#markup' => $revision_log,
- ];
- }
- }
- else {
- $revision_link['label'] = [
- '#type' => 'link',
- '#title' => $revision->label(),
- '#url' => $revision->toUrl('revision'),
- '#prefix' => '
',
- '#suffix' => '
',
- ];
- }
- return $revision_link;
- }
-
- /**
- * Build the filter navigation for the diff comparison.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $entity
- * The entity.
- * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
- * Revision from the left side.
- * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
- * Revision from the right side.
- * @param string $layout
- * The layout plugin selected.
- * @param string $active_filter
- * The active filter.
- *
- * @return array
- * The filter options.
- */
- protected function buildFilterNavigation(ContentEntityInterface $entity, ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, $layout, $active_filter) {
- // Build the view modes filter.
- $options['raw'] = [
- 'title' => $this->t('Raw'),
- 'url' => PluginRevisionController::diffRoute($entity,
- $left_revision->getRevisionId(),
- $right_revision->getRevisionId(),
- $layout,
- ['filter' => 'raw']
- ),
- ];
-
- $options['strip_tags'] = [
- 'title' => $this->t('Strip tags'),
- 'url' => PluginRevisionController::diffRoute($entity,
- $left_revision->getRevisionId(),
- $right_revision->getRevisionId(),
- $layout,
- ['filter' => 'strip_tags']
- ),
- ];
-
- $filter = $options[$active_filter];
- unset($options[$active_filter]);
- array_unshift($options, $filter);
-
- $build['options'] = [
- '#type' => 'operations',
- '#links' => $options,
- ];
- return $build;
- }
-
- /**
- * Applies a markdown function to a string.
- *
- * @param string $markdown
- * Key of the markdown function to be applied to the items.
- * One of drupal_html_to_text, filter_xss, filter_xss_all.
- * @param string $items
- * String to be processed.
- *
- * @return array|string
- * Result after markdown was applied on $items.
- */
- protected function applyMarkdown($markdown, $items) {
- if (!$markdown) {
- return $items;
- }
-
- if ($markdown == 'drupal_html_to_text') {
- return trim(MailFormatHelper::htmlToText($items), "\n");
- }
- elseif ($markdown == 'filter_xss') {
- return trim(Xss::filter($items), "\n");
- }
- elseif ($markdown == 'filter_xss_all') {
- return trim(Xss::filter($items, []), "\n");
- }
- else {
- return $items;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- return $this->configFactory->getEditable('diff.layout_plugins');
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- $config = $this->configFactory->getEditable('diff.layout_plugins');
- $config->set($this->pluginId, $configuration);
- $config->save();
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- return [];
- }
-
-}
diff --git a/modules/diff/src/DiffLayoutInterface.php b/modules/diff/src/DiffLayoutInterface.php
deleted file mode 100644
index 299c559..0000000
--- a/modules/diff/src/DiffLayoutInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-setCacheBackend($cache_backend, 'diff_layout_builder_plugins');
- $this->alterInfo('diff_layout_builder_info');
- $this->entityTypeManager = $entity_type_manager;
- $this->config = $config_factory->get('diff.settings');
- $this->layoutPluginsConfig = $config_factory->get('diff.layout_plugins');
- }
-
- /**
- * Gets the applicable layout plugins.
- *
- * Loop over the plugins that can be used to display the diff comparison
- * sorting them by the weight.
- *
- * @return array
- * The layout plugin options.
- */
- public function getPluginOptions() {
- $plugins = $this->config->get('general_settings.layout_plugins');
- $plugin_options = [];
- // Get the plugins sorted and build an array keyed by the plugin id.
- if ($plugins) {
- // Sort the plugins based on their weight.
- uasort($plugins, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
- foreach ($plugins as $key => $value) {
- if ($this->hasDefinition($key)) {
- $plugin = $this->getDefinition($key);
- if ($plugin && $value['enabled']) {
- $plugin_options[$key] = $plugin['label'];
- }
- }
- }
- }
- return $plugin_options;
- }
-
- /**
- * Gets the default layout plugin selected.
- *
- * Take the first option of the array returned by getPluginOptions.
- *
- * @return string
- * The id of the default plugin.
- */
- public function getDefaultLayout() {
- $plugins = array_keys($this->getPluginOptions());
- return reset($plugins);
- }
-
- /**
- * {@inheritdoc}
- */
- public function findDefinitions() {
- $definitions = parent::findDefinitions();
-
- // Remove plugin html_diff if library is not present.
- $has_htmlDiffAdvanced = class_exists('\HtmlDiffAdvanced');
- if (!$has_htmlDiffAdvanced) {
- unset($definitions['visual_inline']);
- }
- return $definitions;
- }
-
-}
diff --git a/modules/diff/src/FieldDiffBuilderBase.php b/modules/diff/src/FieldDiffBuilderBase.php
deleted file mode 100644
index e271d7f..0000000
--- a/modules/diff/src/FieldDiffBuilderBase.php
+++ /dev/null
@@ -1,151 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->entityParser = $entity_parser;
- parent::__construct($configuration, $plugin_id, $plugin_definition);
-
- $this->configuration += $this->defaultConfiguration();
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager'),
- $container->get('diff.entity_parser')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['show_header'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Show field title'),
- '#weight' => -5,
- '#default_value' => $this->configuration['show_header'],
- );
- $form['markdown'] = array(
- '#type' => 'select',
- '#title' => $this->t('Markdown callback'),
- '#default_value' => $this->configuration['markdown'],
- '#options' => array(
- 'drupal_html_to_text' => $this->t('Drupal HTML to Text'),
- 'filter_xss' => $this->t('Filter XSS (some tags)'),
- 'filter_xss_all' => $this->t('Filter XSS (all tags)'),
- ),
- '#description' => $this->t('These provide ways to clean markup tags to make comparisons easier to read.'),
- );
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
- // By default an empty validation function is provided.
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['show_header'] = $form_state->getValue('show_header');
- $this->configuration['markdown'] = $form_state->getValue('markdown');
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- return array(
- 'show_header' => 1,
- 'markdown' => 'drupal_html_to_text',
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- return $this->configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- $this->configuration = $configuration + $this->defaultConfiguration();
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- return array();
- }
-
- /**
- * {@inheritdoc}
- */
- public static function isApplicable(FieldStorageDefinitionInterface $field_definition) {
- return TRUE;
- }
-
-}
diff --git a/modules/diff/src/FieldDiffBuilderInterface.php b/modules/diff/src/FieldDiffBuilderInterface.php
deleted file mode 100644
index 54dbc26..0000000
--- a/modules/diff/src/FieldDiffBuilderInterface.php
+++ /dev/null
@@ -1,54 +0,0 @@
- "This is an example string",
- * 1 => "Field values or properties",
- * )
- * @endcode
- *
- * @see \Drupal\diff\Plugin\diff\Field\TextFieldBuilder
- *
- * @param FieldItemListInterface $field_items
- * Represents an entity field.
- *
- * @return mixed
- * An array of strings to be compared. If an empty array is returned it
- * means that a field is either empty or no properties need to be compared
- * for that field.
- */
- public function build(FieldItemListInterface $field_items);
-
- /**
- * Returns if the plugin can be used for the provided field.
- *
- * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_definition
- * The field definition that should be checked.
- *
- * @return bool
- * TRUE if the plugin can be used, FALSE otherwise.
- */
- public static function isApplicable(FieldStorageDefinitionInterface $field_definition);
-
-}
diff --git a/modules/diff/src/FieldReferenceInterface.php b/modules/diff/src/FieldReferenceInterface.php
deleted file mode 100644
index 92daf34..0000000
--- a/modules/diff/src/FieldReferenceInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-fieldTypePluginManager = $plugin_manager;
- $this->diffBuilderManager = $diff_builder_manager;
- $this->entityTypeManager = $entity_type_manager;
- $this->entityFieldManager = $entity_field_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config.factory'),
- $container->get('plugin.manager.field.field_type'),
- $container->get('plugin.manager.diff.builder'),
- $container->get('entity_type.manager'),
- $container->get('entity_field.manager')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'diff_admin_plugins';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditableConfigNames() {
- return ['diff.plugins'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $form = parent::buildForm($form, $form_state);
- // The table containing all the field types discovered in the system.
- $form['fields'] = array(
- '#type' => 'table',
- '#tree' => TRUE,
- '#header' => $this->getTableHeader(),
- '#empty' => $this->t('No field types found.'),
- '#prefix' => '
',
- '#suffix' => '
',
- '#attributes' => array(
- 'class' => array('field-ui-overview'),
- 'id' => 'field-display-overview',
- ),
- );
-
- // Build a row in the table for each field of each entity type. Get all the
- // field plugins.
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_name => $entity_type) {
- // Exclude non-revisionable entities.
- if (!$entity_type->isRevisionable()) {
- continue;
- }
- $field_definitions = $this->entityFieldManager->getFieldStorageDefinitions($entity_type_name);
- foreach ($field_definitions as $field_name => $field_definition) {
-
- $show_diff = $this->diffBuilderManager->showDiff($field_definition);
- if (!$show_diff) {
- continue;
- }
-
- $key = $entity_type_name . '.' . $field_name;
- // Build a row in the table for this field.
- $form['fields'][$key] = $this->buildFieldRow($entity_type, $field_definition, $form_state);
- }
- }
-
- $this->diffBuilderManager->clearCachedDefinitions();
- // Submit button for the form.
- $form['actions'] = array('#type' => 'actions');
- $form['actions']['submit'] = array(
- '#type' => 'submit',
- '#button_type' => 'primary',
- '#value' => $this->t('Save'),
- );
- $form['#attached']['library'][] = 'field_ui/drupal.field_ui';
- $form['#attached']['library'][] = 'diff/diff.general';
-
- return $form;
- }
-
- /**
- * Builds a row for the table. Each row corresponds to a field type.
- *
- * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
- * The entity type.
- * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_definition
- * Definition the field type.
- * @param FormStateInterface $form_state
- * THe form state object.
- *
- * @return array
- * A table row for the field type listing table.
- */
- protected function buildFieldRow(EntityTypeInterface $entity_type, FieldStorageDefinitionInterface $field_definition, FormStateInterface $form_state) {
- $entity_type_label = $entity_type->getLabel();
- $field_name = $field_definition->getName();
- $field_type = $field_definition->getType();
- $field_key = $entity_type->id() . '.' . $field_name;
-
- $display_options = $this->diffBuilderManager->getSelectedPluginForFieldStorageDefinition($field_definition);
- $plugin_options = $this->diffBuilderManager->getApplicablePluginOptions($field_definition);
-
- // Base button element for the various plugin settings actions.
- $base_button = [
- '#submit' => [[$this, 'multiStepSubmit']],
- '#ajax' => [
- 'callback' => [$this, 'multiStepAjax'],
- 'wrapper' => 'field-display-overview-wrapper',
- 'effect' => 'fade',
- ],
- '#field_key' => $field_key,
- ];
-
- $field_row['entity_type'] = [
- '#markup' => $entity_type_label,
- ];
- $labels = _diff_field_label($entity_type->id(), $field_name);
- $field_row['field_label'] = [
- '#markup' => array_shift($labels),
- ];
-
- $field_type_label = $this->fieldTypePluginManager->getDefinitions()[$field_type]['label'];
- $field_row['field_type'] = [
- '#markup' => $field_type_label,
- ];
-
- // Check the currently selected plugin, and merge persisted values for its
- // settings.
- if ($type = $form_state->getValue(['fields', $field_key, 'plugin', 'type'])) {
- $display_options['type'] = $type;
- }
-
- $plugin_settings = $form_state->get('plugin_settings');
-
- if (isset($plugin_settings[$field_key]['settings'])) {
- $modified = FALSE;
- if (!empty($display_options['settings'])) {
- foreach ($display_options['settings'] as $key => $value) {
- if ($plugin_settings[$field_key]['settings'][$key] != $value) {
- $modified = TRUE;
- break;
- }
- }
- }
- // In case settings are not identical to the ones in the config display
- // a warning message. Don't display it twice.
- if ($modified && empty($_SESSION['messages']['warning'])) {
- drupal_set_message($this->t('You have unsaved changes.'), 'warning');
- }
- $display_options['settings'] = $plugin_settings[$field_key]['settings'];
- }
-
- $field_row['plugin'] = array(
- 'type' => array(
- '#type' => 'select',
- '#options' => $plugin_options,
- '#empty_option' => $this->t("- Don't compare -"),
- '#empty_value' => 'hidden',
- '#title_display' => 'invisible',
- '#attributes' => array(
- 'class' => array('field-plugin-type'),
- ),
- '#default_value' => $display_options,
- '#ajax' => array(
- 'callback' => [$this, 'multiStepAjax'],
- 'method' => 'replace',
- 'wrapper' => 'field-display-overview-wrapper',
- 'effect' => 'fade',
- ),
- '#field_key' => $field_key,
- ),
- 'settings_edit_form' => array(),
- );
-
- // Get a configured instance of the plugin.
- $plugin = $this->getPlugin($display_options);
-
- // We are currently editing this field's plugin settings. Display the
- // settings form and submit buttons.
- if ($form_state->get('plugin_settings_edit') == $field_key) {
- $field_row['plugin']['settings_edit_form'] = array(
- '#type' => 'container',
- '#attributes' => array('class' => array('field-plugin-settings-edit-form')),
- '#parents' => ['fields', $field_key, 'settings_edit_form'],
- 'label' => array(
- '#markup' => $this->t('Plugin settings:' . '
' . $plugin_options[$display_options['type']] . ' '),
- ),
- 'settings' => $plugin->buildConfigurationForm(array(), $form_state),
- 'actions' => array(
- '#type' => 'actions',
- 'save_settings' => $base_button + [
- '#type' => 'submit',
- '#button_type' => 'primary',
- '#name' => $field_key . '_plugin_settings_update',
- '#value' => $this->t('Update'),
- '#op' => 'update',
- ],
- 'cancel_settings' => $base_button + [
- '#type' => 'submit',
- '#name' => $field_key . '_plugin_settings_cancel',
- '#value' => $this->t('Cancel'),
- '#op' => 'cancel',
- // Do not check errors for the 'Cancel' button, but make sure we
- // get the value of the 'plugin type' select.
- '#limit_validation_errors' => [['fields', $field_key, 'plugin', 'type']],
- ],
- ),
- );
- $field_row['settings_edit'] = array();
- $field_row['#attributes']['class'][] = 'field-plugin-settings-editing';
- }
- else {
- $field_row['settings_edit'] = [];
- // Display the configure settings button only if a plugin is selected.
- if ($plugin) {
- $field_row['settings_edit'] = $base_button + array(
- '#type' => 'image_button',
- '#name' => $field_key . '_settings_edit',
- '#src' => 'core/misc/icons/787878/cog.svg',
- '#attributes' => ['class' => ['field-plugin-settings-edit'], 'alt' => $this->t('Edit')],
- '#op' => 'edit',
- // Do not check errors for the 'Edit' button, but make sure we get
- // the value of the 'plugin type' select.
- '#limit_validation_errors' => [['fields', $field_key, 'plugin', 'type']],
- '#prefix' => '
',
- '#suffix' => '
',
- );
- }
- }
-
- return $field_row;
- }
-
- /**
- * Form submission handler for multi-step buttons.
- *
- * @param array $form
- * The form array.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The form state object.
- */
- public function multiStepSubmit(array $form, FormStateInterface $form_state) {
- $trigger = $form_state->getTriggeringElement();
- $op = $trigger['#op'];
-
- switch ($op) {
- case 'edit':
- // Store the field whose settings are currently being edited.
- $field_key = $trigger['#field_key'];
- $form_state->set('plugin_settings_edit', $field_key);
- break;
-
- case 'update':
- // Store the saved settings, and set the field back to 'non edit' mode.
- $field_key = $trigger['#field_key'];
- if ($plugin_settings = $form_state->getValue(['fields', $field_key, 'settings_edit_form', 'settings'])) {
- $form_state->set(['plugin_settings', $field_key, 'settings'], $plugin_settings);
- }
- $form_state->set('plugin_settings_edit', NULL);
- break;
-
- case 'cancel':
- // Set the field back to 'non edit' mode.
- $form_state->set('plugin_settings_edit', NULL);
- break;
- }
-
- $form_state->setRebuild();
- }
-
- /**
- * Ajax handler for multi-step buttons.
- *
- * @param array $form
- * The form array.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The form state object.
- *
- * @return array
- * The fields form for a plugin.
- */
- public function multiStepAjax(array $form, FormStateInterface $form_state) {
- $trigger = $form_state->getTriggeringElement();
- if (isset($trigger['#op'])) {
- $op = $trigger['#op'];
-
- // Pick the elements that need to receive the ajax-new-content effect.
- $updated_rows = [];
- $updated_columns = [];
- switch ($op) {
- case 'edit':
- $updated_rows = [$trigger['#field_key']];
- $updated_columns = array('plugin');
- break;
-
- case 'update':
- case 'cancel':
- $updated_rows = [$trigger['#field_key']];
- $updated_columns = array('plugin', 'settings_edit');
- break;
- }
-
- foreach ($updated_rows as $name) {
- foreach ($updated_columns as $key) {
- $element = &$form['fields'][$name][$key];
- $element['#prefix'] = '
' . (isset($element['#prefix']) ? $element['#prefix'] : '');
- $element['#suffix'] = (isset($element['#suffix']) ? $element['#suffix'] : '') . '
';
- }
- }
- }
- // Return the whole table.
- return $form['fields'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- $form_values = $form_state->getValues();
- $plugin_settings = $form_state->get('plugin_settings');
- $fields = $form_values['fields'];
-
- foreach ($fields as $field_key => $field_values) {
- // Validate only non-null plugins.
- if ($field_values['plugin']['type'] != 'hidden') {
- $settings = array();
- $key = NULL;
- // Form submitted without pressing update button on plugin settings form.
- if (isset($field_values['settings_edit_form']['settings'])) {
- $settings = $field_values['settings_edit_form']['settings'];
- $key = 1;
- }
- // Form submitted after settings were updated.
- elseif (isset($plugin_settings[$field_key]['settings'])) {
- $settings = $plugin_settings[$field_key]['settings'];
- $key = 2;
- }
- if (!empty($settings)) {
- // Build a new Form State object and populate it with values.
- $state = new FormState();
- $state->setValues($settings);
- $state->set('fields', $field_key);
- $plugin = $this->diffBuilderManager->createInstance($field_values['plugin']['type'], []);
- // Send the values to the plugins form validate handler.
- $plugin->validateConfigurationForm($form, $state);
- // Assign the validation messages back to the big table.
- if ($key == 1) {
- $form_state->setValue(['fields', $field_key, 'settings_edit_form', 'settings'], $state->getValues());
- }
- elseif ($key == 2) {
- $form_state->set(['plugin_settings', $field_key, 'settings'], $state->getValues());
- }
- }
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $form_values = $form_state->getValues();
- $plugin_settings = $form_state->get('plugin_settings');
- $fields = $form_values['fields'];
-
- $config = $this->config('diff.plugins');
-
- // Save the settings.
- foreach ($fields as $field_key => $field_values) {
- if ($field_values['plugin']['type'] == 'hidden') {
- $config->set('fields.' . $field_key, ['type' => 'hidden', 'settings' => []]);
- }
- else {
-
- // Initialize the plugin, if the type is unchanged then with the
- // existing settings, otherwise let it fall back to the default
- // settings.
- $configuration = [];
- if ($config->get('fields.' . $field_key . '.type') == $field_values['plugin']['type'] && $config->get('fields.' . $field_key . '.settings')) {
- $configuration = $config->get('fields.' . $field_key . '.settings');
- }
- $plugin = $this->diffBuilderManager->createInstance($field_values['plugin']['type'], $configuration);
-
- // Get plugin settings. They lie either directly in submitted form
- // values (if the whole form was submitted while some plugin settings
- // were being edited), or have been persisted in $form_state.
-
- $values = NULL;
- // Form submitted without pressing update button on plugin settings form.
- if (isset($field_values['settings_edit_form']['settings'])) {
- $values = $field_values['settings_edit_form']['settings'];
- }
- // Form submitted after settings were updated.
- elseif (isset($plugin_settings[$field_key]['settings'])) {
- $values = $plugin_settings[$field_key]['settings'];
- }
-
- // Build a FormState object and call the plugin submit handler.
- if ($values) {
- $state = new FormState();
- $state->setValues($values);
- $plugin->submitConfigurationForm($form, $state);
- }
-
- $config->set('fields.' . $field_key, [
- 'type' => $field_values['plugin']['type'],
- 'settings' => $plugin->getConfiguration(),
- ]);
- }
- }
- $config->save();
-
- drupal_set_message($this->t('Your settings have been saved.'));
- }
-
- /**
- * Returns a plugin object or NULL if no plugin could be found.
- *
- * @param array $configuration
- * The plugin configuration.
- *
- * @return \Drupal\diff\FieldDiffBuilderInterface|null
- * The plugin.
- */
- protected function getPlugin(array $configuration) {
- if ($configuration && isset($configuration['type']) && $configuration['type'] != 'hidden') {
- if (!isset($configuration['settings'])) {
- $configuration['settings'] = array();
- }
- return $this->diffBuilderManager->createInstance(
- $configuration['type'], $configuration['settings']
- );
- }
-
- return NULL;
- }
-
- /**
- * Returns the header for the table.
- */
- protected function getTableHeader() {
- return array(
- 'entity_type' => $this->t('Entity Type'),
- 'field_name' => $this->t('Field'),
- 'field_type' => $this->t('Field Type'),
- 'plugin' => $this->t('Plugin'),
- 'settings_edit' => '',
- );
- }
-
-}
diff --git a/modules/diff/src/Form/GeneralSettingsForm.php b/modules/diff/src/Form/GeneralSettingsForm.php
deleted file mode 100644
index 596f5d1..0000000
--- a/modules/diff/src/Form/GeneralSettingsForm.php
+++ /dev/null
@@ -1,245 +0,0 @@
-diffLayoutManager = $diff_layout_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config.factory'),
- $container->get('plugin.manager.diff.layout')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'diff_general_settings';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditableConfigNames() {
- return [
- 'diff.settings',
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $field_type = NULL) {
- $config = $this->config('diff.settings');
-
- $form['radio_behavior'] = array(
- '#type' => 'select',
- '#title' => $this->t('Diff radio behavior'),
- '#default_value' => $config->get('general_settings' . '.' . 'radio_behavior'),
- '#options' => array(
- 'simple' => $this->t('Simple exclusion'),
- 'linear' => $this->t('Linear restrictions'),
- ),
- '#empty_option' => $this->t('- None -'),
- '#description' => $this->t('
Simple exclusion means that users will not be able to select the same revision,
Linear restrictions means that users can only select older or newer revisions of the current selections.'),
- );
-
- $layout_plugins = $this->diffLayoutManager->getDefinitions();
- $weight = count($layout_plugins) + 1;
- $layout_plugins_order = [];
- foreach ($layout_plugins as $id => $layout_plugin) {
- $layout_plugin_settings = $config->get('general_settings.layout_plugins')[$id];
- $layout_plugins_order[$id] = [
- 'label' => $layout_plugin['label'],
- 'description' => $layout_plugin['description'] ?: '',
- 'enabled' => $layout_plugin_settings['enabled'],
- 'weight' => isset($layout_plugin_settings['weight']) ? $layout_plugin_settings['weight'] : $weight,
- ];
- $weight++;
- }
-
- $form['layout_plugins'] = [
- '#type' => 'table',
- '#header' => [t('Layout'), t('Description'), t('Weight')],
- '#empty' => t('There are no items yet. Add an item.'),
- '#suffix' => '
' . $this->t('The layout plugins that are enabled to display the revision comparison.') . '
',
- '#tabledrag' => [
- [
- 'action' => 'order',
- 'relationship' => 'sibling',
- 'group' => 'diff-layout-plugins-order-weight',
- ],
- ],
- ];
-
- uasort($layout_plugins_order, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
-
- foreach ($layout_plugins_order as $id => $layout_plugin) {
- $form['layout_plugins'][$id] = [
- '#attributes' => [
- 'class' => ['draggable'],
- ],
- 'enabled' => [
- '#type' => 'checkbox',
- '#title' => $layout_plugin['label'],
- '#title_display' => 'after',
- '#default_value' => $layout_plugin['enabled'],
- ],
- 'description' => [
- '#type' => 'markup',
- '#markup' => Xss::filter($layout_plugin['description']),
- ],
- 'weight' => [
- '#type' => 'weight',
- '#title' => t('Weight for @title', ['@title' => $layout_plugin['label']]),
- '#title_display' => 'invisible',
- '#delta' => 50,
- '#default_value' => (int) $layout_plugin['weight'],
- '#array_parents' => [
- 'settings',
- 'sites',
- $id,
- ],
- '#attributes' => ['class' => ['diff-layout-plugins-order-weight']],
- ],
- ];
- }
-
- $form['field_based_settings'] = [
- '#type' => 'details',
- '#title' => $this->t('Field based layout settings'),
- '#open' => TRUE,
- '#states' => [
- 'visible' => [
- [':input[name="layout_plugins[split_fields][enabled]"]' => ['checked' => TRUE]],
- [':input[name="layout_plugins[unified_fields][enabled]"]' => ['checked' => TRUE]],
- ],
- ],
- ];
-
- $context_lines = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
- $options = array_combine($context_lines, $context_lines);
- $form['field_based_settings']['context_lines_leading'] = array(
- '#type' => 'select',
- '#title' => $this->t('Leading'),
- '#description' => $this->t('This governs the number of unchanged
leading context "lines" to preserve.'),
- '#default_value' => $config->get('general_settings' . '.' . 'context_lines_leading'),
- '#options' => $options,
- );
- $form['field_based_settings']['context_lines_trailing'] = array(
- '#type' => 'select',
- '#title' => $this->t('Trailing'),
- '#description' => $this->t('This governs the number of unchanged
trailing context "lines" to preserve.'),
- '#default_value' => $config->get('general_settings' . '.' . 'context_lines_trailing'),
- '#options' => $options,
- );
-
- // Check if Visual inline layout is installed.
- if ($this->diffLayoutManager->hasDefinition('visual_inline')) {
- $form['visual_inline_settings'] = [
- '#type' => 'details',
- '#title' => $this->t('Visual layout settings'),
- '#open' => TRUE,
- '#states' => [
- 'visible' => [
- ':input[name="layout_plugins[visual_inline][enabled]"]' => ['checked' => TRUE],
- ],
- ],
- ];
-
- // Get the theme data to display the related theme name.
- $default_theme_name = $this->config('system.theme')->get('default');
- $admin_theme_name = $this->config('system.theme')->get('admin');
- $form['visual_inline_settings']['visual_inline_theme'] = [
- '#type' => 'select',
- '#title' => $this->t('Theme'),
- '#options' => [
- 'default' => $this->t('Default'),
- 'admin' => $this->t('Admin'),
- ],
- '#description' => $this->t('Use Default to display the comparison as %default theme, or Admin as %admin theme.', [
- '%default' => $default_theme_name,
- '%admin' => $admin_theme_name,
- ]),
- '#default_value' => $config->get('general_settings')['visual_inline_theme'],
- ];
- }
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- parent::validateForm($form, $form_state);
-
- // Make sure there is at least one layout enabled.
- $enabled_layouts = [];
- foreach ($form_state->getValue('layout_plugins') as $key => $layout) {
- if ($layout['enabled']) {
- $enabled_layouts[] = $key;
- }
- }
- if (!$enabled_layouts) {
- $form_state->setErrorByName('layout_plugins', t('At least one layout plugin needs to be enabled.'));
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $config = $this->config('diff.settings');
-
- $keys = array(
- 'radio_behavior',
- 'context_lines_leading',
- 'context_lines_trailing',
- 'layout_plugins',
- 'visual_inline_theme',
- );
- foreach ($keys as $key) {
- $config->set('general_settings.' . $key, $form_state->getValue($key));
- }
- $config->save();
-
- parent::submitForm($form, $form_state);
- }
-
-}
diff --git a/modules/diff/src/Form/RevisionOverviewForm.php b/modules/diff/src/Form/RevisionOverviewForm.php
deleted file mode 100644
index fcb6d50..0000000
--- a/modules/diff/src/Form/RevisionOverviewForm.php
+++ /dev/null
@@ -1,422 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->currentUser = $current_user;
- $this->date = $date;
- $this->renderer = $renderer;
- $this->languageManager = $language_manager;
- $this->config = $this->config('diff.settings');
- $this->diffLayoutManager = $diff_layout_manager;
- $this->entityComparison = $entity_comparison;
- $this->entityQuery = $entity_query;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('entity_type.manager'),
- $container->get('current_user'),
- $container->get('date.formatter'),
- $container->get('renderer'),
- $container->get('language_manager'),
- $container->get('plugin.manager.diff.layout'),
- $container->get('diff.entity_comparison'),
- $container->get('entity.query')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'revision_overview_form';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $node = NULL) {
- $account = $this->currentUser;
- /** @var \Drupal\node\NodeInterface $node */
- $langcode = $node->language()->getId();
- $langname = $node->language()->getName();
- $languages = $node->getTranslationLanguages();
- $has_translations = (count($languages) > 1);
- $node_storage = $this->entityTypeManager->getStorage('node');
- $type = $node->getType();
-
- $pagerLimit = $this->config->get('general_settings.revision_pager_limit');
-
- $query = $this->entityQuery->get('node')
- ->condition($node->getEntityType()->getKey('id'), $node->id())
- ->pager($pagerLimit)
- ->allRevisions()
- ->sort($node->getEntityType()->getKey('revision'), 'DESC')
- ->execute();
- $vids = array_keys($query);
-
- $revision_count = count($vids);
-
- $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', [
- '@langname' => $langname,
- '%title' => $node->label(),
- ]) : $this->t('Revisions for %title', [
- '%title' => $node->label(),
- ]);
- $build['nid'] = array(
- '#type' => 'hidden',
- '#value' => $node->id(),
- );
-
- $table_header = [];
- $table_header['revision'] = $this->t('Revision');
-
- // Allow comparisons only if there are 2 or more revisions.
- if ($revision_count > 1) {
- $table_header += array(
- 'select_column_one' => '',
- 'select_column_two' => '',
- );
- }
- $table_header['operations'] = $this->t('Operations');
-
- $rev_revert_perm = $account->hasPermission("revert $type revisions") ||
- $account->hasPermission('revert all revisions') ||
- $account->hasPermission('administer nodes');
- $rev_delete_perm = $account->hasPermission("delete $type revisions") ||
- $account->hasPermission('delete all revisions') ||
- $account->hasPermission('administer nodes');
- $revert_permission = $rev_revert_perm && $node->access('update');
- $delete_permission = $rev_delete_perm && $node->access('delete');
-
- // Contains the table listing the revisions.
- $build['node_revisions_table'] = array(
- '#type' => 'table',
- '#header' => $table_header,
- '#attributes' => array('class' => array('diff-revisions')),
- );
-
- $build['node_revisions_table']['#attached']['library'][] = 'diff/diff.general';
- $build['node_revisions_table']['#attached']['drupalSettings']['diffRevisionRadios'] = $this->config->get('general_settings.radio_behavior');
-
- $default_revision = $node->getRevisionId();
- // Add rows to the table.
- foreach ($vids as $key => $vid) {
- $previous_revision = NULL;
- if (isset($vids[$key + 1])) {
- $previous_revision = $node_storage->loadRevision($vids[$key + 1]);
- }
- /** @var \Drupal\Core\Entity\ContentEntityInterface $revision */
- if ($revision = $node_storage->loadRevision($vid)) {
- if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
- $username = array(
- '#theme' => 'username',
- '#account' => $revision->getRevisionAuthor(),
- );
- $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
- // Use revision link to link to revisions that are not active.
- if ($vid != $node->getRevisionId()) {
- $link = Link::fromTextAndUrl($revision_date, new Url('entity.node.revision', ['node' => $node->id(), 'node_revision' => $vid]));
- }
- else {
- $link = $node->toLink($revision_date);
- }
-
- if ($vid == $default_revision) {
- $row = [
- 'revision' => $this->buildRevision($link, $username, $revision, $previous_revision),
- ];
-
- // Allow comparisons only if there are 2 or more revisions.
- if ($revision_count > 1) {
- $row += [
- 'select_column_one' => $this->buildSelectColumn('radios_left', $vid, FALSE),
- 'select_column_two' => $this->buildSelectColumn('radios_right', $vid, $vid),
- ];
- }
- $row['operations'] = array(
- '#prefix' => '
',
- '#markup' => $this->t('Current revision'),
- '#suffix' => ' ',
- '#attributes' => array(
- 'class' => array('revision-current'),
- ),
- );
- $row['#attributes'] = [
- 'class' => ['revision-current'],
- ];
- }
- else {
- $route_params = array(
- 'node' => $node->id(),
- 'node_revision' => $vid,
- 'langcode' => $langcode,
- );
- $links = array();
- if ($revert_permission) {
- $links['revert'] = [
- 'title' => $vid < $node->getRevisionId() ? $this->t('Revert') : $this->t('Set as current revision'),
- 'url' => $has_translations ?
- Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) :
- Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
- ];
- }
- if ($delete_permission) {
- $links['delete'] = array(
- 'title' => $this->t('Delete'),
- 'url' => Url::fromRoute('node.revision_delete_confirm', $route_params),
- );
- }
-
- // Here we don't have to deal with 'only one revision' case because
- // if there's only one revision it will also be the default one,
- // entering on the first branch of this if else statement.
- $row = [
- 'revision' => $this->buildRevision($link, $username, $revision, $previous_revision),
- 'select_column_one' => $this->buildSelectColumn('radios_left', $vid,
- isset($vids[1]) ? $vids[1] : FALSE),
- 'select_column_two' => $this->buildSelectColumn('radios_right', $vid, FALSE),
- 'operations' => [
- '#type' => 'operations',
- '#links' => $links,
- ],
- ];
- }
- // Add the row to the table.
- $build['node_revisions_table'][] = $row;
- }
- }
- }
-
- // Allow comparisons only if there are 2 or more revisions.
- if ($revision_count > 1) {
- $build['submit'] = array(
- '#type' => 'submit',
- '#button_type' => 'primary',
- '#value' => t('Compare selected revisions'),
- '#attributes' => array(
- 'class' => array(
- 'diff-button',
- ),
- ),
- );
- }
- $build['pager'] = array(
- '#type' => 'pager',
- );
- $build['#attached']['library'][] = 'node/drupal.node.admin';
- return $build;
- }
-
- /**
- * Set column attributes and return config array.
- *
- * @param string $name
- * Name attribute.
- * @param string $return_val
- * Return value attribute.
- * @param string $default_val
- * Default value attribute.
- *
- * @return array
- * Configuration array.
- */
- protected function buildSelectColumn($name, $return_val, $default_val) {
- return [
- '#type' => 'radio',
- '#title_display' => 'invisible',
- '#name' => $name,
- '#return_value' => $return_val,
- '#default_value' => $default_val,
- ];
- }
-
- /**
- * Set and return configuration for revision.
- *
- * @param \Drupal\Core\Link $link
- * Link attribute.
- * @param string $username
- * Username attribute.
- * @param \Drupal\Core\Entity\ContentEntityInterface $revision
- * Revision parameter for getRevisionDescription function.
- * @param \Drupal\Core\Entity\ContentEntityInterface $previous_revision
- * (optional) Previous revision for getRevisionDescription function.
- * Defaults to NULL.
- *
- * @return array
- * Configuration for revision.
- */
- protected function buildRevision(Link $link, $username, ContentEntityInterface $revision, ContentEntityInterface $previous_revision = NULL) {
- return [
- '#type' => 'inline_template',
- '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}
{{ message }}
{% endif %}',
- '#context' => [
- 'date' => $link->toString(),
- 'username' => $this->renderer->renderPlain($username),
- 'message' => [
- '#markup' => $this->entityComparison->getRevisionDescription($revision, $previous_revision),
- '#allowed_tags' => Xss::getAdminTagList(),
- ],
- ],
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- $input = $form_state->getUserInput();
-
- if (count($form_state->getValue('node_revisions_table')) <= 1) {
- $form_state->setErrorByName('node_revisions_table', $this->t('Multiple revisions are needed for comparison.'));
- }
- elseif (!isset($input['radios_left']) || !isset($input['radios_right'])) {
- $form_state->setErrorByName('node_revisions_table', $this->t('Select two revisions to compare.'));
- }
- elseif ($input['radios_left'] == $input['radios_right']) {
- // @todo Radio-boxes selection resets if there are errors.
- $form_state->setErrorByName('node_revisions_table', $this->t('Select different revisions to compare.'));
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $input = $form_state->getUserInput();
- $vid_left = $input['radios_left'];
- $vid_right = $input['radios_right'];
- $nid = $input['nid'];
-
- // Always place the older revision on the left side of the comparison
- // and the newer revision on the right side (however revisions can be
- // compared both ways if we manually change the order of the parameters).
- if ($vid_left > $vid_right) {
- $aux = $vid_left;
- $vid_left = $vid_right;
- $vid_right = $aux;
- }
- // Builds the redirect Url.
- $redirect_url = Url::fromRoute(
- 'diff.revisions_diff',
- array(
- 'node' => $nid,
- 'left_revision' => $vid_left,
- 'right_revision' => $vid_right,
- 'filter' => $this->diffLayoutManager->getDefaultLayout(),
- )
- );
- $form_state->setRedirectUrl($redirect_url);
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/CommentFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/CommentFieldBuilder.php
deleted file mode 100644
index ee3c3c0..0000000
--- a/modules/diff/src/Plugin/diff/Field/CommentFieldBuilder.php
+++ /dev/null
@@ -1,104 +0,0 @@
- $field_item) {
- if (!$field_item->isEmpty()) {
- $values = $field_item->getValue();
- // Compare the key of the comment status.
- if ($this->configuration['compare_key']) {
- if (isset($values['status'])) {
- $result[$field_key][] = $values['status'];
- }
- }
- // A more human friendly representation.
- if ($this->configuration['compare_string']) {
- if (isset($values['status'])) {
- switch ($values['status']) {
- case CommentItemInterface::OPEN:
- $result[$field_key][] = $this->t('Comments for this entity are open.');
- break;
-
- case CommentItemInterface::CLOSED:
- $result[$field_key][] = $this->t('Comments for this entity are closed.');
- break;
-
- case CommentItemInterface::HIDDEN:
- $result[$field_key][] = $this->t('Comments for this entity are hidden.');
- break;
- }
- }
- }
- }
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['compare_key'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare comment status key'),
- '#default_value' => $this->configuration['compare_key'],
- );
- $form['compare_string'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare comment status string'),
- '#default_value' => $this->configuration['compare_string'],
- );
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['compare_key'] = $form_state->getValue('compare_key');
- $this->configuration['compare_string'] = $form_state->getValue('compare_string');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'compare_key' => 0,
- 'compare_string' => 1,
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/CoreFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/CoreFieldBuilder.php
deleted file mode 100644
index bba3258..0000000
--- a/modules/diff/src/Plugin/diff/Field/CoreFieldBuilder.php
+++ /dev/null
@@ -1,91 +0,0 @@
-renderer = $renderer;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager'),
- $container->get('diff.entity_parser'),
- $container->get('renderer')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function build(FieldItemListInterface $field_items) {
- $result = array();
-
- // Every item from $field_items is of type FieldItemInterface.
- foreach ($field_items as $field_key => $field_item) {
- if (!$field_item->isEmpty()) {
- $values = $field_item->getValue();
- if (isset($values['value'])) {
- $value = $field_item->view(['label' => 'hidden']);
- $result[$field_key][] = $this->renderer->renderPlain($value);
- }
- }
- }
-
- return $result;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
deleted file mode 100644
index 3579dcb..0000000
--- a/modules/diff/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
+++ /dev/null
@@ -1,89 +0,0 @@
- $field_item) {
- if (!$field_item->isEmpty()) {
- $values = $field_item->getValue();
- // Compare entity ids.
- if ($field_item->entity) {
- if ($this->configuration['compare_entity_reference'] == COMPARE_ENTITY_REFERENCE_LABEL) {
- /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
- $entity = $field_item->entity;
- $result[$field_key][] = $entity->label();
- }
- else {
- $result[$field_key][] = $this->t('Entity ID: :id', [
- ':id' => $values['target_id'],
- ]);
- }
- }
- }
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['compare_entity_reference'] = array(
- '#type' => 'select',
- '#title' => $this->t('Compare'),
- '#options' => array(COMPARE_ENTITY_REFERENCE_ID => t('ID'), COMPARE_ENTITY_REFERENCE_LABEL => t('Label')),
- '#default_value' => $this->configuration['compare_entity_reference'],
- );
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['compare_entity_reference'] = $form_state->getValue('compare_entity_reference');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'compare_entity_reference' => COMPARE_ENTITY_REFERENCE_LABEL,
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/FileFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/FileFieldBuilder.php
deleted file mode 100644
index e9b16f5..0000000
--- a/modules/diff/src/Plugin/diff/Field/FileFieldBuilder.php
+++ /dev/null
@@ -1,149 +0,0 @@
-entityTypeManager->getStorage('file');
-
- // Every item from $field_items is of type FieldItemInterface.
- foreach ($field_items as $field_key => $field_item) {
- if (!$field_item->isEmpty()) {
- $values = $field_item->getValue();
-
- // Add file name to the comparison.
- if (isset($values['target_id'])) {
- /** @var \Drupal\file\Entity\File $file */
- $file = $fileManager->load($values['target_id']);
- $result[$field_key][] = $this->t('File: :image', [
- ':image' => $file->getFilename(),
- ]);
- }
-
- // Add file id to the comparison.
- if ($this->configuration['show_id']) {
- if (isset($values['target_id'])) {
- $result[$field_key][] = $this->t('File ID: :fid', [
- ':fid' => $values['target_id'],
- ]);
- }
- }
-
- // Compare file description fields.
- if ($this->configuration['compare_description_field']) {
- if (isset($values['description'])) {
- $result[$field_key][] = $this->t('Description: @description', [
- '@description' => $values['description'],
- ]);
- }
- }
-
- // Compare Enable Display property.
- if ($this->configuration['compare_display_field']) {
- if (isset($values['display'])) {
- if ($values['display'] == 1) {
- $result[$field_key][] = $this->t('Displayed');
- }
- else {
- $result[$field_key][] = $this->t('Hidden');
- }
- }
- }
-
- // Add the requested separator between resulted strings.
- if ($this->configuration['property_separator']) {
- $separator = $this->configuration['property_separator'] == 'nl' ? "\n" : $this->configuration['property_separator'];
- $result[$field_key] = implode($separator, $result[$field_key]);
- }
- }
-
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['show_id'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Show file ID'),
- '#default_value' => $this->configuration['show_id'],
- );
- $form['compare_description_field'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare description field'),
- '#default_value' => $this->configuration['compare_description_field'],
- '#description' => $this->t('This is only used if the "Enable
Description field" is checked in the instance settings.'),
- );
- $form['compare_display_field'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare display state field'),
- '#default_value' => $this->configuration['compare_display_field'],
- '#description' => $this->t('This is only used if the "Enable
Display field" is checked in the field settings.'),
- );
- $form['property_separator'] = array(
- '#type' => 'select',
- '#title' => $this->t('Property separator'),
- '#default_value' => $this->configuration['property_separator'],
- '#description' => $this->t('Provides the ability to show properties inline or across multiple lines.'),
- '#options' => array(
- ', ' => $this->t('Comma (,)'),
- '; ' => $this->t('Semicolon (;)'),
- ' ' => $this->t('Space'),
- 'nl' => $this->t('New line'),
- ),
- );
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['show_id'] = $form_state->getValue('show_id');
- $this->configuration['compare_description_field'] = $form_state->getValue('compare_description_field');
- $this->configuration['compare_display_field'] = $form_state->getValue('compare_display_field');
- $this->configuration['property_separator'] = $form_state->getValue('property_separator');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'show_id' => 1,
- 'compare_description_field' => 0,
- 'compare_display_field' => 0,
- 'property_separator' => 'nl',
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/ImageFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/ImageFieldBuilder.php
deleted file mode 100644
index 72a049f..0000000
--- a/modules/diff/src/Plugin/diff/Field/ImageFieldBuilder.php
+++ /dev/null
@@ -1,167 +0,0 @@
-entityTypeManager->getStorage('file');
- // Every item from $field_items is of type FieldItemInterface.
- foreach ($field_items as $field_key => $field_item) {
- if (!$field_item->isEmpty()) {
- $values = $field_item->getValue();
-
- // Compare file names.
- if (isset($values['target_id'])) {
- /** @var \Drupal\file\Entity\File $image */
- $image = $fileManager->load($values['target_id']);
- $result[$field_key][] = $this->t('Image: @image', [
- '@image' => $image->getFilename(),
- ]);
- }
-
- // Compare Alt fields.
- if ($this->configuration['compare_alt_field']) {
- if (isset($values['alt'])) {
- $result[$field_key][] = $this->t('Alt: @alt', [
- '@alt' => $values['alt'],
- ]);
- }
- }
-
- // Compare Title fields.
- if ($this->configuration['compare_title_field']) {
- if (!empty($values['title'])) {
- $result[$field_key][] = $this->t('Title: @title', [
- '@title' => $values['title'],
- ]);
- }
- }
-
- // Compare file id.
- if ($this->configuration['show_id']) {
- if (isset($values['target_id'])) {
- $result[$field_key][] = $this->t('File ID: @fid', [
- '@fid' => $values['target_id'],
- ]);
- }
- }
-
- $separator = $this->configuration['property_separator'] == 'nl' ? "\n" : $this->configuration['property_separator'];
- $result[$field_key] = implode($separator, $result[$field_key]);
-
- // EXPERIMENTAL: Attach thumbnail image data.
- if ($this->configuration['show_thumbnail']) {
- if (isset($values['target_id'])) {
- $storage = $this->entityTypeManager->getStorage('entity_form_display');
- $display = $storage->load($field_items->getFieldDefinition()->getTargetEntityTypeId() . '.' . $field_items->getEntity()->bundle() . '.default');
- if ($image_field = $display->getComponent($field_item->getFieldDefinition()->getName())) {
- $image = $fileManager->load($values['target_id']);
-
- $image_style[$field_key]['#thumbnail'] = array(
- '#theme' => 'image_style',
- '#uri' => $image->getFileUri(),
- '#style_name' => $image_field['settings']['preview_image_style'],
- );
- $result = array_merge($result, $image_style);
- }
- }
- }
- }
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['show_id'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Show image ID'),
- '#default_value' => $this->configuration['show_id'],
- );
- $form['compare_alt_field'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare
Alt field'),
- '#default_value' => $this->configuration['compare_alt_field'],
- '#description' => $this->t('This is only used if the "Enable
Alt field" is checked in the instance settings.'),
- );
- $form['compare_title_field'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare
Title field'),
- '#default_value' => $this->configuration['compare_title_field'],
- '#description' => $this->t('This is only used if the "Enable
Title field" is checked in the instance settings.'),
- );
- $form['property_separator'] = array(
- '#type' => 'select',
- '#title' => $this->t('Property separator'),
- '#default_value' => $this->configuration['property_separator'],
- '#description' => $this->t('Provides the ability to show properties inline or across multiple lines.'),
- '#options' => array(
- ', ' => $this->t('Comma (,)'),
- '; ' => $this->t('Semicolon (;)'),
- ' ' => $this->t('Space'),
- 'nl' => $this->t('New line'),
- ),
- );
- $form['show_thumbnail'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Show image thumbnail'),
- '#default_value' => $this->configuration['show_thumbnail'],
- '#description' => $this->t('Displays the image field as thumbnail.'),
- ];
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['show_id'] = $form_state->getValue('show_id');
- $this->configuration['compare_alt_field'] = $form_state->getValue('compare_alt_field');
- $this->configuration['compare_title_field'] = $form_state->getValue('compare_title_field');
- $this->configuration['property_separator'] = $form_state->getValue('property_separator');
- $this->configuration['show_thumbnail'] = $form_state->getValue('show_thumbnail');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'show_id' => 0,
- 'compare_alt_field' => 1,
- 'compare_title_field' => 1,
- 'property_separator' => 'nl',
- 'show_thumbnail' => 1,
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/LinkFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/LinkFieldBuilder.php
deleted file mode 100644
index 373bd84..0000000
--- a/modules/diff/src/Plugin/diff/Field/LinkFieldBuilder.php
+++ /dev/null
@@ -1,91 +0,0 @@
- $field_item) {
- if (!$field_item->isEmpty()) {
- $values = $field_item->getValue();
- // Compare the link title if that plugin options is selected.
- if ($this->configuration['compare_title']) {
- if (isset($values['title'])) {
- $result[$field_key][] = $values['title'];
- }
- }
- // Compare the uri if that plugin options is selected.
- if ($this->configuration['compare_uri']) {
- if (isset($values['uri'])) {
- $result[$field_key][] = $values['uri'];
- }
- }
- }
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['compare_title'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare link title'),
- '#default_value' => $this->configuration['compare_title'],
- );
- $form['compare_uri'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare URI'),
- '#default_value' => $this->configuration['compare_uri'],
- );
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['compare_title'] = $form_state->getValue('compare_title');
- $this->configuration['compare_uri'] = $form_state->getValue('compare_uri');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'compare_title' => 0,
- 'compare_uri' => 1,
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/ListFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/ListFieldBuilder.php
deleted file mode 100644
index 6ff07b8..0000000
--- a/modules/diff/src/Plugin/diff/Field/ListFieldBuilder.php
+++ /dev/null
@@ -1,96 +0,0 @@
- $field_item) {
- // Build the array for comparison only if the field is not empty.
- if (!$field_item->isEmpty()) {
- $possible_options = $field_item->getPossibleOptions();
- $values = $field_item->getValue();
- if ($this->configuration['compare']) {
- switch ($this->configuration['compare']) {
- case 'both':
- $result[$field_key][] = $possible_options[$values['value']] . ' (' . $values['value'] . ')';
- break;
-
- case 'label':
- $result[$field_key][] = $possible_options[$values['value']];
- break;
-
- default:
- $result[$field_key][] = $values['value'];
- break;
- }
- }
- }
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['compare'] = array(
- '#type' => 'radios',
- '#title' => $this->t('Comparison method'),
- '#options' => array(
- 'label' => $this->t('Label'),
- 'key' => $this->t('Key'),
- 'both' => $this->t('Label (key)'),
- ),
- '#default_value' => $this->configuration['compare'],
- );
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['compare'] = $form_state->getValue('compare');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'compare' => 'key',
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/TextFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/TextFieldBuilder.php
deleted file mode 100644
index aed3efb..0000000
--- a/modules/diff/src/Plugin/diff/Field/TextFieldBuilder.php
+++ /dev/null
@@ -1,103 +0,0 @@
- $field_item) {
- $values = $field_item->getValue();
- // Compare text formats.
- if ($this->configuration['compare_format'] == 1) {
- if (isset($values['format'])) {
- $controller = $this->entityTypeManager->getStorage('filter_format');
- $format = $controller->load($values['format']);
- // The format loaded successfully.
- $label = $this->t('Format');
- if ($format != NULL) {
- $result[$field_key][] = $label . ": " . $format->label();
- }
- else {
- $result[$field_key][] = $label . ": " . $this->t('Missing format @format', array('@format' => $values[$field_key]));
- }
- }
- }
- // Compare field values.
- if (isset($values['value'])) {
- $value_only = TRUE;
- // Check if summary or text format are included in the diff.
- if ($this->configuration['compare_format'] == 1) {
- $value_only = FALSE;
- }
- $label = $this->t('Value');
- if ($value_only) {
- // Don't display 'value' label.
- $result[$field_key][] = $values['value'];
- }
- else {
- $result[$field_key][] = $label . ":\n" . $values['value'];
- }
- }
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['compare_format'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare format'),
- '#default_value' => $this->configuration['compare_format'],
- '#description' => $this->t('This is only used if the "Text processing" instance settings are set to
Filtered text (user selects text format) .'),
- );
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['compare_format'] = $form_state->getValue('compare_format');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'compare_format' => 0,
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
deleted file mode 100644
index 8b357f0..0000000
--- a/modules/diff/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
+++ /dev/null
@@ -1,121 +0,0 @@
- $field_item) {
- $values = $field_item->getValue();
- // Compare text formats.
- if ($this->configuration['compare_format'] == 1) {
- if (isset($values['format'])) {
- $controller = $this->entityTypeManager->getStorage('filter_format');
- $format = $controller->load($values['format']);
- // The format loaded successfully.
- $label = $this->t('Format');
- if ($format != NULL) {
- $result[$field_key][] = $label . ": " . $format->name;
- }
- else {
- $result[$field_key][] = $label . ": " . $this->t('Missing format @format', array('@format' => $values[$field_key]));
- }
- }
- }
- // Handle the text summary.
- if ($this->configuration['compare_summary'] == 1) {
- if (isset($values['summary'])) {
- $label = $this->t('Summary');
- if ($values['summary'] == '') {
- $result[$field_key][] = $label . ":\n" . $this->t('Empty');
- }
- else {
- $result[$field_key][] = $label . ":\n" . $values['summary'];
- }
- }
- }
- // Compare field values.
- if (isset($values['value'])) {
- $value_only = TRUE;
- // Check if summary or text format are included in the diff.
- if ($this->configuration['compare_format'] == 1 || $this->configuration['compare_summary'] == 1) {
- $value_only = FALSE;
- }
- $label = $this->t('Value');
- if ($value_only) {
- // Don't display 'value' label.
- $result[$field_key][] = $values['value'];
- }
- else {
- $result[$field_key][] = $label . ":\n" . $values['value'];
- }
- }
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form['compare_format'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare format'),
- '#default_value' => $this->configuration['compare_format'],
- '#description' => $this->t('This is only used if the "Text processing" instance settings are set to
Filtered text (user selects text format) .'),
- );
- $form['compare_summary'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Compare summary separately'),
- '#default_value' => $this->configuration['compare_summary'],
- '#description' => $this->t('This is only used if the "Summary input" option is checked in the instance settings.'),
- );
-
- return parent::buildConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $this->configuration['compare_format'] = $form_state->getValue('compare_format');
- $this->configuration['compare_summary'] = $form_state->getValue('compare_summary');
-
- parent::submitConfigurationForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $default_configuration = array(
- 'compare_format' => 0,
- 'compare_summary' => 0,
- );
- $default_configuration += parent::defaultConfiguration();
-
- return $default_configuration;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php b/modules/diff/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php
deleted file mode 100644
index 6316b0a..0000000
--- a/modules/diff/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php
+++ /dev/null
@@ -1,281 +0,0 @@
-renderer = $renderer;
- $this->entityComparison = $entity_comparison;
- $this->requestStack = $request_stack;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('config.factory'),
- $container->get('entity_type.manager'),
- $container->get('diff.entity_parser'),
- $container->get('date.formatter'),
- $container->get('renderer'),
- $container->get('diff.entity_comparison'),
- $container->get('request_stack')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function build(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, ContentEntityInterface $entity) {
- // Build the revisions data.
- $build = $this->buildRevisionsData($left_revision, $right_revision);
-
- $active_filter = $this->requestStack->getCurrentRequest()->query->get('filter') ?: 'raw';
- $build['controls']['filter'] = [
- '#type' => 'item',
- '#title' => $this->t('Filter'),
- '#wrapper_attributes' => ['class' => 'diff-controls__item'],
- 'options' => $this->buildFilterNavigation($entity, $left_revision, $right_revision, 'split_fields', $active_filter),
- ];
-
- // Build the diff comparison table.
- $diff_header = $this->buildTableHeader($left_revision, $right_revision);
- // Perform comparison only if both entity revisions loaded successfully.
- $fields = $this->entityComparison->compareRevisions($left_revision, $right_revision);
- // Build the diff rows for each field and append the field rows
- // to the table rows.
- $diff_rows = [];
- $raw_active = $active_filter == 'raw';
- foreach ($fields as $field) {
- $field_label_row = '';
- if (!empty($field['#name'])) {
- $field_label_row = [
- 'data' => $field['#name'],
- 'colspan' => 8,
- 'class' => ['field-name'],
- ];
- }
-
- if (!$raw_active) {
- $field_settings = $field['#settings'];
- if (!empty($field_settings['settings']['markdown'])) {
- $field['#data']['#left'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#left']);
- $field['#data']['#right'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#right']);
- }
- // In case the settings are not loaded correctly use drupal_html_to_text
- // to avoid any possible notices when a user clicks on markdown.
- else {
- $field['#data']['#left'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#left']);
- $field['#data']['#right'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#right']);
- }
- }
- // Process the array (split the strings into single line strings)
- // and get line counts per field.
- $this->entityComparison->processStateLine($field);
-
- $field_diff_rows = $this->entityComparison->getRows(
- $field['#data']['#left'],
- $field['#data']['#right']
- );
-
- // EXPERIMENTAL: Deal with magic thumbnail image data.
- if (isset($field['#data']['#left_thumbnail'])) {
- $field_diff_rows['#thumbnail'][1] = [
- 'data' => $field['#data']['#left_thumbnail'],
- 'class' => '',
- ];
- }
- if (isset($field['#data']['#right_thumbnail'])) {
- $field_diff_rows['#thumbnail'][3] = [
- 'data' => $field['#data']['#right_thumbnail'],
- 'class' => '',
- ];
- }
-
- $final_diff = [];
- $row_count_left = NULL;
- $row_count_right = NULL;
-
- foreach ($field_diff_rows as $key => $value) {
- $show_left = FALSE;
- $show_right = FALSE;
- if (isset($field_diff_rows[$key][1]['data'])) {
- $show_left = TRUE;
- $row_count_left++;
- }
- if (isset($field_diff_rows[$key][3]['data'])) {
- $show_right = TRUE;
- $row_count_right++;
- }
- $final_diff[] = [
- 'left-line-number' => [
- 'data' => $show_left ? $row_count_left : NULL,
- 'class' => [
- 'diff-line-number',
- isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['class'] : NULL,
- ],
- ],
- 'left-row-sign' => [
- 'data' => isset($field_diff_rows[$key][0]['data']) ? $field_diff_rows[$key][0]['data'] : NULL,
- 'class' => [
- isset($field_diff_rows[$key][0]['class']) ? $field_diff_rows[$key][0]['class'] : NULL,
- isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['class'] : NULL,
- ],
- ],
- 'left-row-data' => [
- 'data' => isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['data'] : NULL,
- 'class' => isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['class'] : NULL,
- ],
- 'right-line-number' => [
- 'data' => $show_right ? $row_count_right : NULL,
- 'class' => [
- 'diff-line-number',
- isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['class'] : NULL,
- ],
- ],
- 'right-row-sign' => [
- 'data' => isset($field_diff_rows[$key][2]['data']) ? $field_diff_rows[$key][2]['data'] : NULL,
- 'class' => [
- isset($field_diff_rows[$key][2]['class']) ? $field_diff_rows[$key][2]['class'] : NULL,
- isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['class'] : NULL,
- ],
- ],
- 'right-row-data' => [
- 'data' => isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['data'] : NULL,
- 'class' => isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['class'] : NULL,
- ],
- ];
- }
-
- // Add field label to the table only if there are changes to that field.
- if (!empty($final_diff) && !empty($field_label_row)) {
- $diff_rows[] = [$field_label_row];
- }
-
- // Add field diff rows to the table rows.
- $diff_rows = array_merge($diff_rows, $final_diff);
- }
-
- if (!$raw_active) {
- // Remove line numbers.
- foreach ($diff_rows as $i => $row) {
- unset($diff_rows[$i]['left-line-number']);
- unset($diff_rows[$i]['right-line-number']);
- }
- // Reduce the colspan.
- $diff_header[0]['colspan'] = 2;
- }
-
- $build['diff'] = [
- '#type' => 'table',
- '#header' => $diff_header,
- '#rows' => $diff_rows,
- '#weight' => 10,
- '#empty' => $this->t('No visible changes'),
- '#attributes' => [
- 'class' => ['diff'],
- ],
- ];
-
- $build['#attached']['library'][] = 'diff/diff.double_column';
- $build['#attached']['library'][] = 'diff/diff.colors';
- return $build;
- }
-
- /**
- * Build the header for the diff table.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
- * Revision from the left hand side.
- * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
- * Revision from the right hand side.
- *
- * @return array
- * Header for Diff table.
- */
- protected function buildTableHeader(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision) {
- $header = [];
- $header[] = [
- 'data' => ['#markup' => $this->buildRevisionLink($left_revision)],
- 'colspan' => 3,
- ];
- $header[] = [
- 'data' => ['#markup' => $this->buildRevisionLink($right_revision)],
- 'colspan' => 3,
- ];
-
- return $header;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php b/modules/diff/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php
deleted file mode 100644
index 6db2c32..0000000
--- a/modules/diff/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php
+++ /dev/null
@@ -1,267 +0,0 @@
-renderer = $renderer;
- $this->entityComparison = $entity_comparison;
- $this->requestStack = $request_stack;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('config.factory'),
- $container->get('entity_type.manager'),
- $container->get('diff.entity_parser'),
- $container->get('date.formatter'),
- $container->get('renderer'),
- $container->get('diff.entity_comparison'),
- $container->get('request_stack')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function build(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, ContentEntityInterface $entity) {
- // Build the revisions data.
- $build = $this->buildRevisionsData($left_revision, $right_revision);
-
- $active_filter = $this->requestStack->getCurrentRequest()->query->get('filter') ?: 'raw';
- $raw_active = $active_filter == 'raw';
-
- $build['controls']['filter'] = [
- '#type' => 'item',
- '#title' => $this->t('Filter'),
- '#wrapper_attributes' => ['class' => 'diff-controls__item'],
- 'options' => $this->buildFilterNavigation($entity, $left_revision, $right_revision, 'unified_fields', $active_filter),
- ];
-
- // Build the diff comparison table.
- $diff_header = $this->buildTableHeader($right_revision);
- // Perform comparison only if both entity revisions loaded successfully.
- $fields = $this->entityComparison->compareRevisions($left_revision, $right_revision);
- // Build the diff rows for each field and append the field rows
- // to the table rows.
- $diff_rows = [];
- foreach ($fields as $field) {
- $field_label_row = '';
- if (!empty($field['#name'])) {
- $field_label_row = [
- 'data' => $field['#name'],
- 'colspan' => 4,
- 'class' => ['field-name'],
- ];
- }
-
- if (!$raw_active) {
- $field_settings = $field['#settings'];
- if (!empty($field_settings['settings']['markdown'])) {
- $field['#data']['#left'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#left']);
- $field['#data']['#right'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#right']);
- }
- // In case the settings are not loaded correctly use drupal_html_to_text
- // to avoid any possible notices when a user clicks on markdown.
- else {
- $field['#data']['#left'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#left']);
- $field['#data']['#right'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#right']);
- }
- }
-
- // Process the array (split the strings into single line strings)
- // and get line counts per field.
- $this->entityComparison->processStateLine($field);
-
- $field_diff_rows = $this->entityComparison->getRows(
- $field['#data']['#left'],
- $field['#data']['#right']
- );
-
- $final_diff = [];
- $row_count_left = NULL;
- $row_count_right = NULL;
- foreach ($field_diff_rows as $key => $value) {
- $show = FALSE;
- if (isset($field_diff_rows[$key][1]['data'])) {
- if ($field_diff_rows[$key][1] == $field_diff_rows[$key][3]) {
- $show = TRUE;
- $row_count_right++;
- }
- $row_count_left++;
- $final_diff[] = [
- 'left-line-number' => [
- 'data' => $row_count_left,
- 'class' => ['diff-line-number', $field_diff_rows[$key][1]['class']],
- ],
- 'right-line-number' => [
- 'data' => $show ? $row_count_right : NULL,
- 'class' => ['diff-line-number', $field_diff_rows[$key][1]['class']],
- ],
- 'row-sign' => [
- 'data' => isset($field_diff_rows[$key][0]['data']) ? $field_diff_rows[$key][0]['data'] : NULL,
- 'class' => [isset($field_diff_rows[$key][0]['class']) ? $field_diff_rows[$key][0]['class'] : NULL, $field_diff_rows[$key][1]['class']],
- ],
- 'row-data' => [
- 'data' => $field_diff_rows[$key][1]['data'],
- 'colspan' => 2,
- 'class' => $field_diff_rows[$key][1]['class'],
- ],
- ];
- }
- if ($field_diff_rows[$key][1] != $field_diff_rows[$key][3]) {
- if (isset($field_diff_rows[$key][3]['data'])) {
- $row_count_right++;
- $final_diff[] = [
- 'left-line-number' => [
- 'data' => NULL,
- 'class' => ['diff-line-number', $field_diff_rows[$key][3]['class']],
- ],
- 'right-line-number' => [
- 'data' => $row_count_right,
- 'class' => ['diff-line-number', $field_diff_rows[$key][3]['class']],
- ],
- 'row-sign' => [
- 'data' => isset($field_diff_rows[$key][2]['data']) ? $field_diff_rows[$key][2]['data'] : NULL,
- 'class' => [isset($field_diff_rows[$key][2]['class']) ? $field_diff_rows[$key][2]['class'] : NULL, $field_diff_rows[$key][3]['class']],
- ],
- 'row-data' => [
- 'data' => $field_diff_rows[$key][3]['data'],
- 'colspan' => 2,
- 'class' => $field_diff_rows[$key][3]['class'],
- ],
- ];
- }
- }
- }
-
- // Add field label to the table only if there are changes to that field.
- if (!empty($final_diff) && !empty($field_label_row)) {
- $diff_rows[] = [$field_label_row];
- }
-
- // Add field diff rows to the table rows.
- $diff_rows = array_merge($diff_rows, $final_diff);
- }
-
- if (!$raw_active) {
- // Remove line numbers.
- foreach ($diff_rows as $i => $row) {
- unset($diff_rows[$i]['left-line-number']);
- unset($diff_rows[$i]['right-line-number']);
- }
-
- // Reduce the colspan.
- $diff_header[0]['colspan'] = 2;
- $diff_rows[0][0]['colspan'] = 2;
- }
- $build['diff'] = [
- '#type' => 'table',
- '#header' => $diff_header,
- '#rows' => $diff_rows,
- '#weight' => 10,
- '#empty' => $this->t('No visible changes'),
- '#attributes' => [
- 'class' => ['diff'],
- ],
- ];
-
- $build['#attached']['library'][] = 'diff/diff.single_column';
- $build['#attached']['library'][] = 'diff/diff.colors';
- return $build;
- }
-
- /**
- * Build the header for the diff table.
- *
- * @param \Drupal\Core\Entity\EntityInterface $right_revision
- * Revision from the right hand side.
- *
- * @return array
- * Header for Diff table.
- */
- protected function buildTableHeader(EntityInterface $right_revision) {
- $header = [];
- $header[] = [
- 'data' => ['#markup' => $this->buildRevisionLink($right_revision)],
- 'colspan' => 4,
- ];
-
- return $header;
- }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Layout/VisualInlineDiffLayout.php b/modules/diff/src/Plugin/diff/Layout/VisualInlineDiffLayout.php
deleted file mode 100644
index 124cc8b..0000000
--- a/modules/diff/src/Plugin/diff/Layout/VisualInlineDiffLayout.php
+++ /dev/null
@@ -1,200 +0,0 @@
-renderer = $renderer;
- $this->entityComparison = $entity_comparison;
- $storage = PhpStorageFactory::get('html_purifier_serializer');
- if (!$storage->exists('cache.php')) {
- $storage->save('cache.php', 'dummy');
- }
- $html_diff->getConfig()->setPurifierCacheLocation(dirname($storage->getFullPath('cache.php')));
- $this->htmlDiff = $html_diff;
- $this->requestStack = $request_stack;
- $this->entityDisplayRepository = $entity_display_repository;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('config.factory'),
- $container->get('entity_type.manager'),
- $container->get('diff.entity_parser'),
- $container->get('date.formatter'),
- $container->get('renderer'),
- $container->get('diff.entity_comparison'),
- $container->get('diff.html_diff'),
- $container->get('request_stack'),
- $container->get('entity_display.repository')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function build(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, ContentEntityInterface $entity) {
- // Build the revisions data.
- $build = $this->buildRevisionsData($left_revision, $right_revision);
-
- $this->entityTypeManager->getStorage($entity->getEntityTypeId())->resetCache([$entity->id()]);
- // Build the view modes filter.
- $options = [];
- // Get all view modes for entity type.
- $view_modes = $this->entityDisplayRepository->getViewModeOptionsByBundle($entity->getEntityTypeId(), $entity->bundle());
- foreach ($view_modes as $view_mode => $view_mode_info) {
- // Skip view modes that are not used in the front end.
- if (in_array($view_mode, ['rss', 'search_index'])) {
- continue;
- }
- $options[$view_mode] = [
- 'title' => $view_mode_info,
- 'url' => PluginRevisionController::diffRoute($entity,
- $left_revision->getRevisionId(),
- $right_revision->getRevisionId(),
- 'visual_inline',
- ['view_mode' => $view_mode]
- ),
- ];
- }
-
- $active_option = array_keys($options);
- $active_view_mode = $this->requestStack->getCurrentRequest()->query->get('view_mode') ?: reset($active_option);
-
- $filter = $options[$active_view_mode];
- unset($options[$active_view_mode]);
- array_unshift($options, $filter);
-
- $build['controls']['view_mode'] = [
- '#type' => 'item',
- '#title' => $this->t('View mode'),
- '#wrapper_attributes' => ['class' => 'diff-controls__item'],
- 'filter' => [
- '#type' => 'operations',
- '#links' => $options,
- ],
- ];
-
- $view_builder = $this->entityTypeManager->getViewBuilder($entity->getEntityTypeId());
- // Trigger exclusion of interactive items like on preview.
- $left_revision->in_preview = TRUE;
- $right_revision->in_preview = TRUE;
- $left_view = $view_builder->view($left_revision, $active_view_mode);
- $right_view = $view_builder->view($right_revision, $active_view_mode);
-
- // Avoid render cache from being built.
- unset($left_view['#cache']);
- unset($right_view['#cache']);
-
- $html_1 = $this->renderer->render($left_view);
- $html_2 = $this->renderer->render($right_view);
-
- $this->htmlDiff->setOldHtml($html_1);
- $this->htmlDiff->setNewHtml($html_2);
- $this->htmlDiff->build();
-
- $build['diff'] = [
- '#markup' => $this->htmlDiff->getDifference(),
- '#weight' => 10,
- ];
-
- $build['#attached']['library'][] = 'diff/diff.visual_inline';
- return $build;
- }
-
-}
diff --git a/modules/diff/src/Plugin/views/field/DiffFrom.php b/modules/diff/src/Plugin/views/field/DiffFrom.php
deleted file mode 100644
index 8af0ecc..0000000
--- a/modules/diff/src/Plugin/views/field/DiffFrom.php
+++ /dev/null
@@ -1,97 +0,0 @@
-t('Compare');
- parent::viewsForm($form, $form_state);
- }
-
- /**
- * Returns the diff_to field ID.
- *
- * @return string|null
- * The diff_to field ID, or null if the field was not found on the view.
- */
- protected function getToFieldId() {
- foreach ($this->view->field as $id => $field) {
- if ($field instanceof DiffTo) {
- return $id;
- }
- }
- }
-
- /**
- * Submit handler for the bulk form.
- *
- * @param array $form
- * An associative array containing the structure of the form.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The current state of the form.
- *
- * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
- * Thrown when the user tried to access an action without access to it.
- */
- public function viewsFormSubmit(array &$form, FormStateInterface $form_state) {
- if ($form_state->get('step') == 'views_form_views_form') {
- $diff_from = $form_state->getValue($this->options['id']);
- $diff_from_entity = $this->loadEntityFromDiffFormKey($diff_from);
-
- $diff_to = $form_state->getValue($this->getToFieldId());
- $diff_to_entity = $this->loadEntityFromDiffFormKey($diff_to);
-
- $options = array(
- 'query' => $this->getDestinationArray(),
- );
- $entity_type_id = $diff_from_entity->getEntityTypeId();
-
- $filter = \Drupal::service('plugin.manager.diff.layout')->getDefaultLayout();
- if ($diff_from_entity instanceof NodeInterface && $diff_to_entity instanceof NodeInterface) {
- $form_state->setRedirect('diff.revisions_diff', [
- $entity_type_id => $diff_from_entity->id(),
- 'left_revision' => $diff_from_entity->getRevisionId(),
- 'right_revision' => $diff_to_entity->getRevisionId(),
- 'filter' => $filter,
- ], $options);
- }
- elseif ($diff_from_entity instanceof RevisionableInterface && $diff_to_entity instanceof RevisionableInterface) {
- $route_name = 'entity.' . $entity_type_id . '.revisions_diff';
- $form_state->setRedirect($route_name, [
- $entity_type_id => $diff_from_entity->id(),
- 'left_revision' => $diff_from_entity->getRevisionId(),
- 'right_revision' => $diff_to_entity->getRevisionId(),
- 'filter' => $filter,
- ], $options);
- }
- }
- }
-
-}
diff --git a/modules/diff/src/Plugin/views/field/DiffPluginBase.php b/modules/diff/src/Plugin/views/field/DiffPluginBase.php
deleted file mode 100644
index 7ce978a..0000000
--- a/modules/diff/src/Plugin/views/field/DiffPluginBase.php
+++ /dev/null
@@ -1,166 +0,0 @@
-entityTypeManager = $entity_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function query() {
- $this->ensureMyTable();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getValue(ResultRow $row, $field = NULL) {
- return '';
- }
-
- /**
- * {@inheritdoc}
- */
- public function viewsForm(array &$form, FormStateInterface $form_state) {
- if (!empty($this->view->result)) {
- $form[$this->options['id']]['#tree'] = TRUE;
- foreach ($this->view->result as $row_index => $row) {
- $entity = $row->_entity;
- $form[$this->options['id']][$row_index] = [
- '#type' => 'radio',
- '#parents' => [$this->options['id']],
- '#title' => $this->t('Compare this item'),
- '#title_display' => 'invisible',
- '#return_value' => $this->calculateEntityDiffFormKey($entity),
- ];
- }
- }
- }
-
- /**
- * Calculates a diff form key.
- *
- * This generates a key that is used as the checkbox return value when
- * submitting a diff form. This key allows the entity for the row to be loaded
- * totally independently of the executed view row.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * The entity to calculate a diff form key for.
- *
- * @return string
- * The diff form key representing the entity's id, language and revision (if
- * applicable) as one string.
- *
- * @see self::loadEntityFromDiffFormKey()
- */
- protected function calculateEntityDiffFormKey(EntityInterface $entity) {
- $key_parts = [$entity->language()->getId(), $entity->id()];
-
- if ($entity instanceof RevisionableInterface) {
- $key_parts[] = $entity->getRevisionId();
- }
-
- // An entity ID could be an arbitrary string (although they are typically
- // numeric). JSON then Base64 encoding ensures the diff_form_key is
- // safe to use in HTML, and that the key parts can be retrieved.
- $key = Json::encode($key_parts);
- return base64_encode($key);
- }
-
- /**
- * Loads an entity based on a diff form key.
- *
- * @param string $diff_form_key
- * The diff form key representing the entity's ID, language and revision (if
- * applicable) as one string.
- *
- * @return \Drupal\Core\Entity\EntityInterface
- * The entity loaded in the state (language, optionally revision) specified
- * as part of the diff form key.
- *
- * @throws \UnexpectedValueException
- * If no entity can be found for the given diff form key.
- */
- protected function loadEntityFromDiffFormKey($diff_form_key) {
- $key = base64_decode($diff_form_key);
- $key_parts = Json::decode($key);
- $revision_id = NULL;
-
- // If there are 3 items, vid will be last.
- if (count($key_parts) === 3) {
- $revision_id = array_pop($key_parts);
- }
-
- // The first two items will always be langcode and ID.
- $id = array_pop($key_parts);
- $langcode = array_pop($key_parts);
-
- // Load the entity or a specific revision depending on the given key.
- $storage = $this->entityTypeManager->getStorage($this->getEntityType());
- $entity = $revision_id ? $storage->loadRevision($revision_id) : $storage->load($id);
-
- if (empty($entity)) {
- throw new \UnexpectedValueException('Entity not found: ' . $diff_form_key);
- }
-
- if ($entity instanceof TranslatableInterface) {
- $entity = $entity->getTranslation($langcode);
- }
-
- return $entity;
- }
-
-}
diff --git a/modules/diff/src/Plugin/views/field/DiffTo.php b/modules/diff/src/Plugin/views/field/DiffTo.php
deleted file mode 100644
index 3e6b959..0000000
--- a/modules/diff/src/Plugin/views/field/DiffTo.php
+++ /dev/null
@@ -1,22 +0,0 @@
-getDiffRoute($entity_type)) {
- $collection->add('entity.' . $entity_type->id() . '.revisions_diff', $route);
- }
- return $collection;
- }
-
- /**
- * Constructs the diff route.
- *
- * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
- * The entity type.
- *
- * @return \Symfony\Component\Routing\Route|null
- * The diff route.
- */
- protected function getDiffRoute(EntityTypeInterface $entity_type) {
- if ($entity_type->hasLinkTemplate('revisions-diff')) {
- $route = new Route($entity_type->getLinkTemplate('revisions-diff'));
- $route->addDefaults([
- '_controller' => '\Drupal\diff\Controller\PluginRevisionController::compareEntityRevisions',
- 'filter' => 'split_fields',
- ]);
- $route->addRequirements([
- '_entity_access' => $entity_type->id() . '.view',
- ]);
- $route->setOption('parameters', [
- $entity_type->id() => ['type' => 'entity:' . $entity_type->id()],
- 'left_revision' => ['type' => 'entity_revision:' . $entity_type->id()],
- 'right_revision' => ['type' => 'entity_revision:' . $entity_type->id()],
- ]);
- return $route;
- }
- }
-
-}
diff --git a/modules/diff/src/Routing/RouteSubscriber.php b/modules/diff/src/Routing/RouteSubscriber.php
deleted file mode 100644
index 16e6287..0000000
--- a/modules/diff/src/Routing/RouteSubscriber.php
+++ /dev/null
@@ -1,29 +0,0 @@
-get('entity.node.version_history');
- if ($route) {
- $route->addDefaults(
- array(
- '_controller' => '\Drupal\diff\Controller\NodeRevisionController::revisionOverview',
- )
- );
- }
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffAdminFormsTest.php b/modules/diff/src/Tests/DiffAdminFormsTest.php
deleted file mode 100644
index 03e60d5..0000000
--- a/modules/diff/src/Tests/DiffAdminFormsTest.php
+++ /dev/null
@@ -1,228 +0,0 @@
-drupalLogin($this->rootUser);
- }
-
- /**
- * Run all independent tests.
- */
- public function testAll() {
- $this->doTestSettingsUi();
- $this->doTestSettingsTab();
- $this->doTestRequirements();
- $this->doTestConfigurableFieldsTab();
- $this->doTestPluginWeight();
- }
-
- /**
- * Tests the descriptions in the Settings UI.
- */
- public function doTestSettingsUi() {
- // Enable the help block.
- $this->drupalPlaceBlock('help_block', ['region' => 'help']);
-
- $this->drupalGet('admin/config/content/diff/general');
- // Check the settings introduction text.
- $this->assertText('Configurations for the revision comparison functionality and diff layout plugins.');
- // Check the layout plugins descriptions.
- $this->assertText('Field based layout, displays revision comparison side by side.');
- $this->assertText('Field based layout, displays revision comparison line by line.');
- }
-
- /**
- * Tests the Settings tab.
- */
- public function doTestSettingsTab() {
- $edit = [
- 'radio_behavior' => 'linear',
- 'context_lines_leading' => 10,
- 'context_lines_trailing' => 5,
- ];
- $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
- $this->assertText('The configuration options have been saved.');
- }
-
- /**
- * Tests the module requirements.
- */
- public function doTestRequirements() {
- module_load_install('diff');
- $requirements = diff_requirements('runtime');
- $this->assertEqual($requirements['html_diff_advanced']['title'], 'Diff');
-
- $has_htmlDiffAdvanced = class_exists('\HtmlDiffAdvanced');
- if (!$has_htmlDiffAdvanced) {
- // The plugin is disabled dependencies are missing.
- $this->assertEqual($requirements['html_diff_advanced']['value'], 'Visual inline layout');
- }
- else {
- // The plugin is enabled by default if dependencies are met.
- $this->assertEqual($requirements['html_diff_advanced']['value'], 'Installed correctly');
- }
- }
-
- /**
- * Tests the Configurable Fields tab.
- */
- public function doTestConfigurableFieldsTab() {
- $this->drupalGet('admin/config/content/diff/fields');
-
- // Test changing type without changing settings.
- $edit = [
- 'fields[node.body][plugin][type]' => 'text_summary_field_diff_builder',
- ];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertFieldByName('fields[node.body][plugin][type]', 'text_summary_field_diff_builder');
- $edit = [
- 'fields[node.body][plugin][type]' => 'text_field_diff_builder',
- ];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertFieldByName('fields[node.body][plugin][type]', 'text_field_diff_builder');
-
- $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
- $this->assertText('Plugin settings: Text');
- $edit = [
- 'fields[node.body][settings_edit_form][settings][show_header]' => TRUE,
- 'fields[node.body][settings_edit_form][settings][compare_format]' => FALSE,
- 'fields[node.body][settings_edit_form][settings][markdown]' => 'filter_xss_all',
- ];
- $this->drupalPostAjaxForm(NULL, $edit, 'node.body_plugin_settings_update');
- $this->drupalPostForm(NULL, [], t('Save'));
- $this->assertText('Your settings have been saved.');
-
- // Check the values were saved.
- $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
- $this->assertFieldByName('fields[node.body][settings_edit_form][settings][markdown]', 'filter_xss_all');
-
- // Edit another field.
- $this->drupalPostAjaxForm(NULL, [], 'node.title_settings_edit');
- $edit = [
- 'fields[node.title][settings_edit_form][settings][markdown]' => 'filter_xss_all',
- ];
- $this->drupalPostAjaxForm(NULL, $edit, 'node.title_plugin_settings_update');
- $this->drupalPostForm(NULL, [], t('Save'));
-
- // Check both fields and their config values.
- $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
- $this->assertFieldByName('fields[node.body][settings_edit_form][settings][markdown]', 'filter_xss_all');
- $this->drupalPostAjaxForm(NULL, [], 'node.title_settings_edit');
- $this->assertFieldByName('fields[node.title][settings_edit_form][settings][markdown]', 'filter_xss_all');
-
- // Save field settings without changing anything and assert the config.
- $this->drupalPostForm(NULL, [], t('Save'));
- $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
- $this->assertFieldByName('fields[node.body][settings_edit_form][settings][markdown]', 'filter_xss_all');
- $this->drupalPostAjaxForm(NULL, [], 'node.title_settings_edit');
- $this->assertFieldByName('fields[node.title][settings_edit_form][settings][markdown]', 'filter_xss_all');
-
- $edit = [
- 'fields[node.sticky][plugin][type]' => 'hidden',
- ];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertFieldByName('fields[node.sticky][plugin][type]', 'hidden');
- }
-
- /**
- * Tests the Compare Revisions vertical tab.
- */
- public function doTestPluginWeight() {
- // Create a node with a revision.
- $edit = [
- 'title[0][value]' => 'great_title',
- 'body[0][value]' => '
great_body
',
- ];
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $this->clickLink('Edit');
- $edit = [
- 'title[0][value]' => 'greater_title',
- 'body[0][value]' => '
greater_body
',
- ];
- $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
-
- // Assert the diff display uses the classic layout.
- $node = $this->getNodeByTitle('greater_title');
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertLink('Unified fields');
- $this->assertLink('Split fields');
- $this->assertLink('Raw');
- $this->assertLink('Strip tags');
- $text = $this->xpath('//tbody/tr[4]/td[3]');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), '
great_body
');
-
- // Change the settings of the layouts, disable the single column.
- $edit = [
- 'layout_plugins[split_fields][weight]' => '11',
- 'layout_plugins[unified_fields][enabled]' => FALSE,
- ];
- $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
-
- // Assert the diff display uses the markdown layout.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertResponse(200);
- $this->assertNoLink('Unified fields');
- $this->assertLink('Split fields');
- $this->clickLink('Split fields');
- $this->assertLink('Raw');
- $this->assertLink('Strip tags');
- $this->clickLink('Strip tags');
- $text = $this->xpath('//tbody/tr[4]/td[2]');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), 'great_body');
-
- // Change the settings of the layouts, enable single column.
- $edit = [
- 'layout_plugins[unified_fields][enabled]' => TRUE,
- 'layout_plugins[split_fields][enabled]' => FALSE,
- ];
- $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
-
- // Test the validation of form.
- $edit = [
- 'layout_plugins[unified_fields][enabled]' => FALSE,
- 'layout_plugins[split_fields][enabled]' => FALSE,
- ];
- $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
- $this->assertText('At least one layout plugin needs to be enabled.');
-
- // Assert the diff display uses the single column layout.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertResponse(200);
- $this->assertLink('Unified fields');
- $this->assertNoLink('Split fields');
- $this->assertLink('Raw');
- $this->assertLink('Strip tags');
- $text = $this->xpath('//tbody/tr[5]/td[4]');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), '
great_body
');
- $this->clickLink('Strip tags');
- $text = $this->xpath('//tbody/tr[5]/td[2]');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), 'great_body');
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffLocaleTest.php b/modules/diff/src/Tests/DiffLocaleTest.php
deleted file mode 100644
index 15bd871..0000000
--- a/modules/diff/src/Tests/DiffLocaleTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-drupalLogin($this->rootUser);
-
- // Add French language.
- $edit = array(
- 'predefined_langcode' => 'fr',
- );
- $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-
- // Enable content translation on articles.
- $this->drupalGet('admin/config/regional/content-language');
- $edit = array(
- 'entity_types[node]' => TRUE,
- 'settings[node][article][translatable]' => TRUE,
- 'settings[node][article][settings][language][language_alterable]' => TRUE,
- );
- $this->drupalPostForm(NULL, $edit, t('Save configuration'));
- }
-
- /**
- * Run all independent tests.
- */
- public function testAll() {
- $this->doTestTranslationRevisions();
- $this->doTestUndefinedTranslationFilter();
- $this->doTestTranslationFilter();
- }
-
- /**
- * Test Diff functionality for the revisions of a translated node.
- */
- protected function doTestTranslationRevisions() {
-
- // Create an article and its translation. Assert aliases.
- $edit = array(
- 'title[0][value]' => 'English node',
- 'langcode[0][value]' => 'en',
- );
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $english_node = $this->drupalGetNodeByTitle('English node');
-
- $this->drupalGet('node/' . $english_node->id() . '/translations');
- $this->clickLink(t('Add'));
- $edit = array(
- 'title[0][value]' => 'French node',
- 'revision' => FALSE,
- );
- $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
- $this->rebuildContainer();
- $english_node = $this->drupalGetNodeByTitle('English node');
- $french_node = $english_node->getTranslation('fr');
-
- // Create a new revision on both languages.
- $edit = array(
- 'title[0][value]' => 'Updated title',
- 'revision' => TRUE,
- );
- $this->drupalPostForm('node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
- $edit = array(
- 'title[0][value]' => 'Le titre',
- 'revision' => TRUE,
- );
- $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
-
- // View differences between revisions. Check that they don't mix up.
- $this->drupalGet('node/' . $english_node->id() . '/revisions');
- $this->drupalGet('node/' . $english_node->id() . '/revisions/view/1/2/split_fields');
- $this->assertText('Title');
- $this->assertText('English node');
- $this->assertText('Updated title');
- $this->drupalGet('fr/node/' . $english_node->id() . '/revisions');
- $this->drupalGet('fr/node/' . $english_node->id() . '/revisions/view/1/3/split_fields');
- $this->assertText('Title');
- $this->assertNoText('English node');
- $this->assertNoText('Updated title');
- $this->assertText('French node');
- $this->assertText('Le titre');
- }
-
- /**
- * Tests the translation filtering when navigating trough revisions.
- */
- protected function doTestTranslationFilter() {
- // Create a node in English.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'english_revision_0',
- ]);
- $revision1 = $node->getRevisionId();
-
- // Translate to french.
- $node->addTranslation('fr', ['title' => 'french_revision_0']);
- $node->save();
-
- // Create a revision in English.
- $english_node = $node->getTranslation('en');
- $english_node->setTitle('english_revision_1');
- $english_node->setNewRevision(TRUE);
- $english_node->save();
- $revision2 = $node->getRevisionId();
-
- // Create a revision in French.
- $french_node = $node->getTranslation('fr');
- $french_node->setTitle('french_revision_1');
- $french_node->setNewRevision(TRUE);
- $french_node->save();
-
- // Create a new revision in English.
- $english_node = $node->getTranslation('en');
- $english_node->setTitle('english_revision_2');
- $english_node->setNewRevision(TRUE);
- $english_node->save();
-
- // Create a new revision in French.
- $french_node = $node->getTranslation('fr');
- $french_node->setTitle('french_revision_2');
- $french_node->setNewRevision(TRUE);
- $french_node->save();
-
- // Compare first two revisions.
- $this->drupalGet('node/' . $node->id() . '/revisions/view/' . $revision1 . '/' . $revision2 . '/split_fields');
- $diffs = $this->xpath('//span[@class="diffchange"]');
- $this->assertEqual($diffs[0], 'english_revision_0');
- $this->assertEqual($diffs[1], 'english_revision_1');
-
- // Check next difference.
- $this->clickLink('Next change');
- $diffs = $this->xpath('//span[@class="diffchange"]');
- $this->assertEqual($diffs[0], 'english_revision_1');
- $this->assertEqual($diffs[1], 'english_revision_2');
-
- // There shouldn't be other differences in the current language.
- $this->assertNoLink('Next change');
- }
-
- /**
- * Tests the undefined translation filtering when navigating trough revisions.
- */
- protected function doTestUndefinedTranslationFilter() {
- // Create a node in with undefined langcode.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'undefined_language_revision_0',
- 'langcode' => 'und',
- ]);
- $revision1 = $node->getRevisionId();
-
- // Create 3 new revisions of the node.
- $node->setTitle('undefined_language_revision_1');
- $node->setNewRevision(TRUE);
- $node->save();
- $revision2 = $node->getRevisionId();
-
- $node->setTitle('undefined_language_revision_2');
- $node->setNewRevision(TRUE);
- $node->save();
-
- $node->setTitle('undefined_language_revision_3');
- $node->setNewRevision(TRUE);
- $node->save();
-
- // Check the amount of revisions displayed.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $element = $this->xpath('//*[@id="edit-node-revisions-table"]/tbody/tr');
- $this->assertEqual(count($element), 4);
-
- // Compare the first two revisions.
- $this->drupalGet('node/' . $node->id() . '/revisions/view/' . $revision1 . '/' . $revision2 . '/split_fields');
- $diffs = $this->xpath('//span[@class="diffchange"]');
- $this->assertEqual($diffs[0], 'undefined_language_revision_0');
- $this->assertEqual($diffs[1], 'undefined_language_revision_1');
-
- // Compare the next two revisions.
- $this->clickLink('Next change');
- $diffs = $this->xpath('//span[@class="diffchange"]');
- $this->assertEqual($diffs[0], 'undefined_language_revision_1');
- $this->assertEqual($diffs[1], 'undefined_language_revision_2');
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginEntityTest.php b/modules/diff/src/Tests/DiffPluginEntityTest.php
deleted file mode 100644
index c9eb4ec..0000000
--- a/modules/diff/src/Tests/DiffPluginEntityTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-fileSystem = \Drupal::service('file_system');
-
- // FieldUiTestTrait checks the breadcrumb when adding a field, so we need
- // to show the breadcrumb block.
- $this->drupalPlaceBlock('system_breadcrumb_block');
- }
-
- /**
- * Tests the EntityReference plugin.
- *
- * @see \Drupal\diff\Plugin\diff\Field\EntityReferenceFieldBuilder
- */
- public function testEntityReferencePlugin() {
- // Add an entity reference field to the article content type.
- $bundle_path = 'admin/structure/types/manage/article';
- $field_name = 'reference';
- $storage_edit = $field_edit = array();
- $storage_edit['settings[target_type]'] = 'node';
- $field_edit['settings[handler_settings][target_bundles][article]'] = TRUE;
- $this->fieldUIAddNewField($bundle_path, $field_name, 'Reference', 'entity_reference', $storage_edit, $field_edit);
-
- // Create three article nodes.
- $node1 = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Article A',
- ]);
- $node2 = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Article B',
- ]);
- $node3 = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Article C',
- ]);
-
- // Reference article B in article A.
- $edit = array(
- 'field_reference[0][target_id]' => 'Article B (' . $node2->id() . ')',
- 'revision' => TRUE,
- );
- $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
-
- // Update article A so it points to article C instead of B.
- $edit = array(
- 'field_reference[0][target_id]' => 'Article C (' . $node3->id() . ')',
- 'revision' => TRUE,
- );
- $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
- $this->assertText('Reference');
- $this->assertText('Article B');
- $this->assertText('Article C');
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginFileTest.php b/modules/diff/src/Tests/DiffPluginFileTest.php
deleted file mode 100644
index 1f41f5b..0000000
--- a/modules/diff/src/Tests/DiffPluginFileTest.php
+++ /dev/null
@@ -1,288 +0,0 @@
-fileSystem = \Drupal::service('file_system');
-
- // FieldUiTestTrait checks the breadcrumb when adding a field, so we need
- // to show the breadcrumb block.
- $this->drupalPlaceBlock('system_breadcrumb_block');
- }
-
- /**
- * Tests the File plugin.
- *
- * @see \Drupal\diff\Plugin\diff\Field\FileFieldBuilder
- */
- public function testFilePlugin() {
- // Add file field to the article content type.
- $file_field_name = 'field_file';
- $field_storage = FieldStorageConfig::create(array(
- 'field_name' => $file_field_name,
- 'entity_type' => 'node',
- 'type' => 'file',
- ));
- $field_storage->save();
- FieldConfig::create([
- 'entity_type' => 'node',
- 'field_storage' => $field_storage,
- 'bundle' => 'article',
- 'label' => 'File',
- ])->save();
-
- // Make the field visible in the form and desfault display.
- $this->viewDisplay->load('node.article.default')
- ->setComponent('test_field')
- ->setComponent($file_field_name)
- ->save();
- $this->formDisplay->load('node.article.default')
- ->setComponent('test_field', ['type' => 'entity_reference_autocomplete'])
- ->setComponent($file_field_name, ['type' => 'file_generic'])
- ->save();
-
- // Create an article.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article',
- ]);
- $revision1 = $node->getRevisionId();
-
- // Upload a file to the article.
- $test_files = $this->drupalGetTestFiles('text');
- $edit['files[field_file_0]'] = $this->fileSystem->realpath($test_files['0']->uri);
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Upload');
- $edit['revision'] = TRUE;
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle('Test article', TRUE);
- $revision2 = $node->getRevisionId();
-
- // Replace the file by a different one.
- $this->drupalPostForm('node/' . $node->id() . '/edit', [], 'Remove');
- $this->drupalPostForm(NULL, ['revision' => FALSE], t('Save and keep published'));
- $edit['files[field_file_0]'] = $this->fileSystem->realpath($test_files['1']->uri);
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Upload');
- $edit['revision'] = TRUE;
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle('Test article', TRUE);
- $revision3 = $node->getRevisionId();
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $edit = [
- 'radios_left' => $revision1,
- 'radios_right' => $revision3,
- ];
- $this->drupalPostForm(NULL, $edit, t('Compare selected revisions'));
- $this->assertText('File');
- $this->assertText('File: text-1.txt');
- $this->assertText('File ID: 4');
-
- // Use the unified fields layout.
- $this->clickLink('Unified fields');
- $this->assertResponse(200);
- $this->assertText('File');
- $this->assertText('File: text-1.txt');
- $this->assertText('File ID: 4');
- }
-
- /**
- * Tests the Image plugin.
- *
- * @see \Drupal\diff\Plugin\diff\Field\ImageFieldBuilder
- */
- public function testImagePlugin() {
- // Add image field to the article content type.
- $image_field_name = 'field_image';
- FieldStorageConfig::create([
- 'field_name' => $image_field_name,
- 'entity_type' => 'node',
- 'type' => 'image',
- 'settings' => [],
- 'cardinality' => 1,
- ])->save();
-
- $field_config = FieldConfig::create([
- 'field_name' => $image_field_name,
- 'label' => 'Image',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'required' => FALSE,
- 'settings' => ['alt_field' => 1],
- ]);
- $field_config->save();
-
- $this->formDisplay->load('node.article.default')
- ->setComponent($image_field_name, [
- 'type' => 'image_image',
- 'settings' => [],
- ])
- ->save();
-
- $this->viewDisplay->load('node.article.default')
- ->setComponent($image_field_name, [
- 'type' => 'image',
- 'settings' => [],
- ])
- ->save();
-
- // Create an article.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article',
- ]);
- $revision1 = $node->getRevisionId();
-
- // Upload an image to the article.
- $test_files = $this->drupalGetTestFiles('image');
- $edit = ['files[field_image_0]' => $this->fileSystem->realpath($test_files['1']->uri)];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $edit = [
- 'field_image[0][alt]' => 'Image alt',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle('Test article', TRUE);
- $revision2 = $node->getRevisionId();
-
- // Replace the image by a different one.
- $this->drupalPostForm('node/' . $node->id() . '/edit', [], 'Remove');
- $this->drupalPostForm(NULL, ['revision' => FALSE], t('Save and keep published'));
- $edit = ['files[field_image_0]' => $this->fileSystem->realpath($test_files['1']->uri)];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $edit = [
- 'field_image[0][alt]' => 'Image alt updated',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle('Test article', TRUE);
- $revision3 = $node->getRevisionId();
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $edit = [
- 'radios_left' => $revision1,
- 'radios_right' => $revision3,
- ];
- $this->drupalPostForm(NULL, $edit, t('Compare selected revisions'));
- $this->assertText('Image');
- $this->assertText('Image: image-test-transparent-indexed.gif');
- // Image title must be absent since it is not set in previous revisions.
- $this->assertNoText('Title');
-
- // Enable Title field in instance settings.
- $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image', [
- 'settings[title_field]' => 1,
- ], 'Save settings');
-
- // Add image title and alt text.
- $edit = [
- 'field_image[0][alt]' => 'Image alt updated new',
- 'revision' => TRUE,
- 'field_image[0][title]' => 'Image title updated',
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
- $rows = $this->xpath('//tbody/tr');
- // Image title and alternative text must be shown.
- $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[2]->td[2]->asXML())), 'Alt: Image alt updated');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[2]->td[5]->asXML())), 'Alt: Image alt updated new');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[3]->td[2]->asXML())), '');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[3]->td[5]->asXML())), 'Title: Image title updated');
-
- // Show File ID.
- $this->drupalGet('admin/config/content/diff/fields');
- $this->drupalPostAjaxForm(NULL, [], 'node.field_image_settings_edit');
- $edit = [
- 'fields[node.field_image][settings_edit_form][settings][show_id]' => TRUE,
- ];
- $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
- $this->drupalPostForm(NULL, [], t('Save'));
- $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
- // Alt and title must be hidden.
- $this->assertText('File ID: 2');
-
- // Disable alt image fields.
- $this->drupalGet('admin/config/content/diff/fields');
- $this->drupalPostAjaxForm(NULL, [], 'node.field_image_settings_edit');
- $edit = [
- 'fields[node.field_image][settings_edit_form][settings][compare_alt_field]' => FALSE,
- ];
- $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
- $this->drupalPostForm(NULL, [], t('Save'));
- $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
- // Alt and title must be hidden.
- $this->assertNoText('Alt: Image alt updated');
- $this->assertNoText('Alt: Image alt updated new');
- $this->assertText('Title: Image title updated');
-
- // Disable title image fields, reenable alt.
- $this->drupalGet('admin/config/content/diff/fields');
- $this->drupalPostAjaxForm(NULL, [], 'node.field_image_settings_edit');
- $edit = [
- 'fields[node.field_image][settings_edit_form][settings][compare_alt_field]' => TRUE,
- 'fields[node.field_image][settings_edit_form][settings][compare_title_field]' => FALSE,
- ];
- $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
- $this->drupalPostForm(NULL, [], t('Save'));
- $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
- $this->assertText('Alt: Image alt updated');
- $this->assertText('Alt: Image alt updated new');
- $this->assertNoText('Title: Image title updated');
- // Assert the thumbnail is displayed.
- $img1_url = file_create_url(\Drupal::token()->replace("public://styles/thumbnail/public/[date:custom:Y]-[date:custom:m]/" . $test_files['1']->name));
- $image_url = file_url_transform_relative($img1_url);
- $this->assertRaw($image_url);
-
- // Disable thumbnail image field.
- $this->drupalPostAjaxForm('admin/config/content/diff/fields', [], 'node.field_image_settings_edit');
- $edit = [
- 'fields[node.field_image][settings_edit_form][settings][show_thumbnail]' => FALSE,
- ];
- $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
- $this->drupalPostForm(NULL, [], t('Save'));
- $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
-
- // Assert the thumbnail is not displayed.
- $img1_url = file_create_url(\Drupal::token()->replace("public://styles/thumbnail/public/[date:custom:Y]-[date:custom:m]/" . $test_files['1']->name));
- $image_url = file_url_transform_relative($img1_url);
- $this->assertNoRaw($image_url);
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginTest.php b/modules/diff/src/Tests/DiffPluginTest.php
deleted file mode 100644
index 67c683b..0000000
--- a/modules/diff/src/Tests/DiffPluginTest.php
+++ /dev/null
@@ -1,232 +0,0 @@
- $field_name,
- 'entity_type' => 'node',
- 'type' => $field_type,
- ]);
- $field_storage->save();
- FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => 'article',
- 'label' => $label,
- ])->save();
- $this->formDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => $widget_type])
- ->save();
- $this->viewDisplay->load('node.article.default')
- ->setComponent($field_name)
- ->save();
- }
-
- /**
- * Runs all independent tests.
- */
- public function testAll() {
- $this->doTestFieldWithNoPlugin();
- $this->doTestFieldNoAccess();
- $this->doTestApplicablePlugin();
- $this->doTestTrimmingField();
- }
-
- /**
- * Tests the changed field without plugins.
- */
- public function doTestFieldWithNoPlugin() {
- // Create an article.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- ]);
-
- // Update the article and add a new revision, the "changed" field should be
- // updated which does not have plugins provided by diff.
- $edit = array(
- 'revision' => TRUE,
- );
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check the difference between the last two revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-
- // "changed" field is not displayed since there is no plugin for it. This
- // should not break the revisions comparison display.
- $this->assertResponse(200);
- $this->assertLink(t('Split fields'));
- }
-
- /**
- * Tests the access check for a field while comparing revisions.
- */
- public function doTestFieldNoAccess() {
- // Add a text and a text field to article.
- $this->addArticleTextField('field_diff_deny_access', 'field_diff_deny_access', 'string', 'string_textfield');
-
- // Create an article.
- $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article access',
- 'field_diff_deny_access' => 'Foo',
- ]);
-
- // Create a revision of the article.
- $node = $this->getNodeByTitle('Test article access');
- $node->setTitle('Test article no access');
- $node->set('field_diff_deny_access', 'Fighters');
- $node->setNewRevision(TRUE);
- $node->save();
-
- // Check the "Text Field No Access" field is not displayed.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertResponse(200);
- $this->assertNoText('field_diff_deny_access');
- $rows = $this->xpath('//tbody/tr');
- $this->assertEqual(count($rows), 2);
- }
-
- /**
- * Tests plugin applicability and weight relevance.
- *
- * @covers \Drupal\diff_test\Plugin\diff\Field\TestHeavierTextPlugin
- * @covers \Drupal\diff_test\Plugin\diff\Field\TestLighterTextPlugin
- */
- public function doTestApplicablePlugin() {
- // Add three text fields to the article.
- $this->addArticleTextField('test_field', 'Test Applicable', 'text', 'text_textfield');
- $this->addArticleTextField('test_field_lighter', 'Test Lighter Applicable', 'text', 'text_textfield');
- $this->addArticleTextField('test_field_non_applicable', 'Test Not Applicable', 'text', 'text_textfield');
-
- // Create an article, setting values on fields.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article',
- 'test_field' => 'first_nice_applicable',
- 'test_field_lighter' => 'second_nice_applicable',
- 'test_field_non_applicable' => 'not_applicable',
- ]);
-
- // Edit the article and update these fields, creating a new revision.
- $edit = [
- 'test_field[0][value]' => 'first_nicer_applicable',
- 'test_field_lighter[0][value]' => 'second_nicer_applicable',
- 'test_field_non_applicable[0][value]' => 'nicer_not_applicable',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-
- // Check diff for an applicable field of testTextPlugin.
- $this->assertText('Test Applicable');
- $this->assertText('first_nice_heavier_test_plugin');
- $this->assertText('first_nicer_heavier_test_plugin');
-
- // Check diff for an applicable field of testTextPlugin and
- // testLighterTextPlugin. The plugin selected for this field should be the
- // lightest one.
- $this->assertText('Test Lighter Applicable');
- $this->assertText('second_nice_lighter_test_plugin');
- $this->assertText('second_nicer_lighter_test_plugin');
-
- // Check diff for a non applicable field of both test plugins.
- $this->assertText('Test Not Applicable');
- $this->assertText('not_applicable');
- $this->assertText('nicer_not_applicable');
- }
-
- /**
- * Tests field content trimming.
- */
- public function doTestTrimmingField() {
- // Create a node.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'test_trim',
- 'body' => '
body
',
- ]);
- // Save a second revision.
- $node->save();
-
- // Create a revision adding a new empty line to the body.
- $node = $this->drupalGetNodeByTitle('test_trim');
- $edit = [
- 'revision' => TRUE,
- 'body[0][value]' => '
body
-',
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Assert the revision summary.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->assertText('Changes on: Body');
-
- // Assert the revision comparison.
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertNoText('No visible changes.');
- $rows = $this->xpath('//tbody/tr');
- $diff_row = $rows[1]->td;
- $this->assertEqual(count($rows), 3);
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[2]->asXML())), '
body
');
-
- // Create a new revision and update the body.
- $edit = [
- 'revision' => TRUE,
- 'body[0][value]' => '
body
-
-
body_new
-',
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertNoText('No visible changes.');
- // Assert that empty rows also show a line number.
- $rows = $this->xpath('//tbody/tr');
- $this->assertEqual(count($rows), 5);
- $diff_row = $rows[4]->td;
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), '4');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[0]->asXML())), '2');
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginTestBase.php b/modules/diff/src/Tests/DiffPluginTestBase.php
deleted file mode 100644
index 1f84fa8..0000000
--- a/modules/diff/src/Tests/DiffPluginTestBase.php
+++ /dev/null
@@ -1,49 +0,0 @@
-formDisplay = \Drupal::entityTypeManager()->getStorage('entity_form_display');
- $this->viewDisplay = \Drupal::entityTypeManager()->getStorage('entity_view_display');
-
- $this->drupalLogin($this->rootUser);
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginVariousTest.php b/modules/diff/src/Tests/DiffPluginVariousTest.php
deleted file mode 100644
index fdbe2bb..0000000
--- a/modules/diff/src/Tests/DiffPluginVariousTest.php
+++ /dev/null
@@ -1,426 +0,0 @@
-doTestCommentPlugin();
- $this->doTestCorePlugin();
- $this->doTestCorePluginTimestampField();
- $this->doTestLinkPlugin();
- $this->doTestListPlugin();
- $this->doTestTextPlugin();
- $this->doTestTextWithSummaryPlugin();
- }
-
- /**
- * Adds a text field.
- *
- * @param string $field_name
- * The machine field name.
- * @param string $label
- * The field label.
- * @param string $field_type
- * The field type.
- * @param string $widget_type
- * The widget type.
- */
- protected function addArticleTextField($field_name, $label, $field_type, $widget_type) {
- // Create a field.
- $field_storage = FieldStorageConfig::create([
- 'field_name' => $field_name,
- 'entity_type' => 'node',
- 'type' => $field_type,
- ]);
- $field_storage->save();
- FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => 'article',
- 'label' => $label,
- ])->save();
- $this->formDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => $widget_type])
- ->save();
- $this->viewDisplay->load('node.article.default')
- ->setComponent($field_name)
- ->save();
- }
-
- /**
- * Tests the comment plugin.
- *
- * @covers \Drupal\diff\Plugin\diff\Field\CommentFieldBuilder
- */
- public function doTestCommentPlugin() {
- // Add the comment field to articles.
- $this->addDefaultCommentField('node', 'article');
-
- // Create an article with comments enabled..
- $title = 'Sample article';
- $edit = array(
- 'title[0][value]' => $title,
- 'body[0][value]' => '
Revision 1
',
- 'comment[0][status]' => CommentItemInterface::OPEN,
- );
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $node = $this->drupalGetNodeByTitle($title);
-
- // Edit the article and close its comments.
- $edit = array(
- 'comment[0][status]' => CommentItemInterface::CLOSED,
- 'revision' => TRUE,
- );
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check the difference between the last two revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
- $this->assertText('Comments');
- $this->assertText('Comments for this entity are open.');
- $this->assertText('Comments for this entity are closed.');
- }
-
- /**
- * Tests the Core plugin.
- *
- * @covers \Drupal\diff\Plugin\diff\Field\CoreFieldBuilder
- */
- public function doTestCorePlugin() {
- // Add an email field (supported by the Diff core plugin) to the Article
- // content type.
- $field_name = 'field_email';
- $field_storage = FieldStorageConfig::create([
- 'field_name' => $field_name,
- 'entity_type' => 'node',
- 'type' => 'email',
- ]);
- $field_storage->save();
- FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => 'article',
- 'label' => 'Email',
- ])->save();
-
- // Add the email field to the article form.
- $this->formDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => 'email_default'])
- ->save();
-
- // Add the email field to the default display.
- $this->viewDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => 'basic_string'])
- ->save();
-
- // Create an article with an email.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'field_email' => 'foo@example.com',
- ]);
-
- // Edit the article and change the email.
- $edit = array(
- 'field_email[0][value]' => 'bar@example.com',
- 'revision' => TRUE,
- );
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check the difference between the last two revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
- $this->assertText('Email');
- $this->assertText('foo@example.com');
- $this->assertText('bar@example.com');
- }
-
- /**
- * Tests the Core plugin with a timestamp field.
- *
- * @covers \Drupal\diff\Plugin\diff\Field\CoreFieldBuilder
- */
- public function doTestCorePluginTimestampField() {
- // Add a timestamp field (supported by the Diff core plugin) to the Article
- // content type.
- $field_name = 'field_timestamp';
- $field_storage = FieldStorageConfig::create([
- 'field_name' => $field_name,
- 'entity_type' => 'node',
- 'type' => 'timestamp',
- ]);
- $field_storage->save();
- FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => 'article',
- 'label' => 'Timestamp test',
- ])->save();
-
- // Add the timestamp field to the article form.
- $this->formDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => 'datetime_timestamp'])
- ->save();
-
- // Add the timestamp field to the default display.
- $this->viewDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => 'timestamp'])
- ->save();
-
- $old_timestamp = '321321321';
- $new_timestamp = '123123123';
-
- // Create an article with an timestamp.
- $this->drupalCreateNode([
- 'title' => 'timestamp_test',
- 'type' => 'article',
- 'field_timestamp' => $old_timestamp,
- ]);
-
- // Create a new revision with an updated timestamp.
- $node = $this->drupalGetNodeByTitle('timestamp_test');
- $node->field_timestamp = $new_timestamp;
- $node->setNewRevision(TRUE);
- $node->save();
-
- // Compare the revisions.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-
- // Assert that the timestamp field does not show a unix time format.
- $this->assertText('Timestamp test');
- $date_formatter = \Drupal::service('date.formatter');
- $this->assertText($date_formatter->format($old_timestamp));
- $this->assertText($date_formatter->format($new_timestamp));
- }
-
- /**
- * Tests the Link plugin.
- *
- * @covers \Drupal\diff\Plugin\diff\Field\LinkFieldBuilder
- */
- public function doTestLinkPlugin() {
- // Add a link field to the article content type.
- $field_name = 'field_link';
- $field_storage = FieldStorageConfig::create([
- 'field_name' => $field_name,
- 'entity_type' => 'node',
- 'type' => 'link',
- ]);
- $field_storage->save();
- FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => 'article',
- 'label' => 'Link',
- 'settings' => array(
- 'title' => DRUPAL_OPTIONAL,
- 'link_type' => LinkItemInterface::LINK_GENERIC,
- ),
- ])->save();
- $this->formDisplay->load('node.article.default')
- ->setComponent($field_name, [
- 'type' => 'link_default',
- 'settings' => [
- 'placeholder_url' => 'http://example.com',
- ],
- ])
- ->save();
- $this->viewDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => 'link'])
- ->save();
-
- // Enable the comparison of the link's title field.
- $config = \Drupal::configFactory()->getEditable('diff.plugins');
- $settings['compare_title'] = TRUE;
- $config->set('fields.node.field_link.type', 'link_field_diff_builder');
- $config->set('fields.node.field_link.settings', $settings);
- $config->save();
-
- // Create an article, setting values on the link field.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article',
- 'field_link' => [
- 'title' => 'Google',
- 'uri' => 'http://www.google.com',
- ],
- ]);
-
- // Update the link field.
- $edit = [
- 'field_link[0][title]' => 'Guguel',
- 'field_link[0][uri]' => 'http://www.google.es',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertText('Link');
- $this->assertText('Google');
- $this->assertText('http://www.google.com');
- $this->assertText('Guguel');
- $this->assertText('http://www.google.es');
- }
-
- /**
- * Tests the List plugin.
- *
- * @covers \Drupal\diff\Plugin\diff\Field\ListFieldBuilder
- */
- public function doTestListPlugin() {
- // Add a list field to the article content type.
- $field_name = 'field_list';
- $field_storage = FieldStorageConfig::create([
- 'field_name' => $field_name,
- 'entity_type' => 'node',
- 'type' => 'list_string',
- 'cardinality' => 1,
- 'settings' => [
- 'allowed_values' => [
- 'value_a' => 'Value A',
- 'value_b' => 'Value B',
- ],
- ],
- ]);
- $field_storage->save();
-
- FieldConfig::create([
- 'field_name' => $field_name,
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'required' => FALSE,
- 'label' => 'List',
- ])->save();
-
- $this->formDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => 'options_select'])
- ->save();
- $this->viewDisplay->load('node.article.default')
- ->setComponent($field_name, ['type' => 'list_default'])
- ->save();
-
- // Create an article, setting values on the lit field.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article',
- 'field_list' => 'value_a',
- ]);
-
- // Update the list field.
- $edit = [
- 'field_list' => 'value_b',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertText('List');
- $this->assertText('value_a');
- $this->assertText('value_b');
- }
-
- /**
- * Tests the Text plugin.
- *
- * @covers \Drupal\diff\Plugin\diff\Field\TextFieldBuilder
- */
- public function doTestTextPlugin() {
- // Add a text and a text long field to the Article content type.
- $this->addArticleTextField('field_text', 'Text Field', 'string', 'string_textfield');
- $this->addArticleTextField('field_text_long', 'Text Long Field', 'string_long', 'string_textarea');
-
- // Create an article, setting values on both fields.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article',
- 'field_text' => 'Foo',
- 'field_text_long' => 'Fighters',
- ]);
-
- // Edit the article and update these fields, creating a new revision.
- $edit = [
- 'field_text[0][value]' => 'Bar',
- 'field_text_long[0][value]' => 'Fly',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertText('Text Field');
- $this->assertText('Text Long Field');
- $this->assertText('Foo');
- $this->assertText('Fighters');
- $this->assertText('Bar');
- $this->assertText('Fly');
- }
-
- /**
- * Tests the TextWithSummary plugin.
- *
- * @covers \Drupal\diff\Plugin\diff\Field\TextWithSummaryFieldBuilder
- */
- public function doTestTextWithSummaryPlugin() {
- // Enable the comparison of the summary.
- $config = \Drupal::configFactory()->getEditable('diff.plugins');
- $settings['compare_summary'] = TRUE;
- $config->set('fields.node.body.type', 'text_summary_field_diff_builder');
- $config->set('fields.node.body.settings', $settings);
- $config->save();
-
- // Create an article, setting the body field.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Test article',
- 'body' => [
- 'value' => 'Foo value',
- 'summary' => 'Foo summary',
- ],
- ]);
-
- // Edit the article and update these fields, creating a new revision.
- $edit = [
- 'body[0][value]' => 'Bar value',
- 'body[0][summary]' => 'Bar summary',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check differences between revisions.
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertText('Body');
- $this->assertText('Foo value');
- $this->assertText('Foo summary');
- $this->assertText('Bar value');
- $this->assertText('Bar summary');
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffRevisionTest.php b/modules/diff/src/Tests/DiffRevisionTest.php
deleted file mode 100644
index 4155402..0000000
--- a/modules/diff/src/Tests/DiffRevisionTest.php
+++ /dev/null
@@ -1,454 +0,0 @@
-doTestRevisionDiffOverview();
- $this->doTestOverviewPager();
- $this->doTestRevisionOverviewErrorMessages();
- $this->doTestEntityReference();
- }
-
- /**
- * Tests the revision diff overview.
- */
- protected function doTestRevisionDiffOverview() {
- $this->drupalPlaceBlock('system_breadcrumb_block');
- // Login as admin with the required permission.
- $this->loginAsAdmin(['delete any article content']);
-
- // Create an article.
- $title = 'test_title_a';
- $edit = array(
- 'title[0][value]' => $title,
- 'body[0][value]' => '
Revision 1
-
first_unique_text
-
second_unique_text
',
- );
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $node = $this->drupalGetNodeByTitle($title);
- $created = $node->getCreatedTime();
- $this->drupalGet('node/' . $node->id());
-
- // Make sure the revision tab doesn't exist.
- $this->assertNoLink('Revisions');
-
- // Create a second revision, with a revision comment.
- $this->drupalGet('node/add/article');
- $edit = array(
- 'body[0][value]' => '
Revision 2
-
first_unique_text
-
second_unique_text
',
- 'revision' => TRUE,
- 'revision_log[0][value]' => 'Revision 2 comment',
- );
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $this->drupalGet('node/' . $node->id());
-
- // Check the revisions overview.
- $this->clickLink(t('Revisions'));
- $rows = $this->xpath('//tbody/tr');
- // Make sure only two revisions available.
- $this->assertEqual(count($rows), 2);
- // Assert the revision summary.
- $this->assertUniqueText('Revision 2 comment');
- $this->assertText('Initial revision.');
-
- // Compare the revisions in standard mode.
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
- $this->clickLink('Split fields');
- // Assert breadcrumbs are properly displayed.
- $this->assertRaw('
'Home',
- "node/" . $node->id() => $node->label(),
- "node/" . $node->id() . "/revisions" => 'Revisions',
- ];
- $this->assertBreadcrumb(NULL, $trail);
- // Extract the changes.
- $this->assertText('Body');
- $rows = $this->xpath('//tbody/tr');
- $head = $this->xpath('//thead/tr');
- $diff_row = $rows[1]->td;
- // Assert the revision comment.
- $this->assertRaw('diff-revision__item-message">Revision 2 comment');
- // Assert changes made to the body, text 1 changed to 2.
- $this->assertEqual((string) ($diff_row[0]), '1');
- $this->assertEqual((string) ($diff_row[1]), '-');
- $this->assertEqual((string) (($diff_row[2]->span)), '1');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[2]->asXML())), 'Revision 1
');
- $this->assertEqual((string) ($diff_row[3]), '1');
- $this->assertEqual((string) ($diff_row[4]), '+');
- $this->assertEqual((string) (($diff_row[5]->span)), '2');
- $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[5]->asXML()))), 'Revision 2
');
-
- // Compare the revisions in markdown mode.
- $this->clickLink('Strip tags');
- $rows = $this->xpath('//tbody/tr');
- // Assert breadcrumbs are properly displayed.
- $this->assertRaw(' 'Home',
- "node/" . $node->id() => $node->label(),
- "node/" . $node->id() . "/revisions" => 'Revisions',
- ];
- $this->assertBreadcrumb(NULL, $trail);
- // Extract the changes.
- $diff_row = $rows[1]->td;
- // Assert changes made to the body, text 1 changed to 2.
- $this->assertEqual((string) ($diff_row[0]), '-');
- $this->assertEqual((string) (($diff_row[1]->span)), '1');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[1]->asXML())), 'Revision 1');
- $this->assertEqual((string) (($diff_row[2])), '+');
- $this->assertEqual((string) (($diff_row[3]->span)), '2');
- $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[3]->asXML()))), 'Revision 2');
-
- // Compare the revisions in single column mode.
- $this->clickLink('Unified fields');
- // Assert breadcrumbs are properly displayed.
- $this->assertRaw(' 'Home',
- "node/" . $node->id() => $node->label(),
- "node/" . $node->id() . "/revisions" => 'Revisions',
- ];
- $this->assertBreadcrumb(NULL, $trail);
- // Extract the changes.
- $rows = $this->xpath('//tbody/tr');
- $diff_row = $rows[1]->td;
- // Assert changes made to the body, text 1 changed to 2.
- $this->assertEqual((string) ($diff_row[0]), '1');
- $this->assertEqual((string) ($diff_row[1]), '');
- $this->assertEqual((string) ($diff_row[2]), '-');
- $this->assertEqual((string) (($diff_row[3]->span)), '1');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), 'Revision 1
');
- $diff_row = $rows[2]->td;
- $this->assertEqual((string) ($diff_row[0]), '');
- $this->assertEqual((string) ($diff_row[1]), '1');
- $this->assertEqual((string) (($diff_row[2])), '+');
- $this->assertEqual((string) (($diff_row[3]->span)), '2');
- $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[3]->asXML()))), 'Revision 2
');
- $this->assertUniqueText('first_unique_text');
- $this->assertUniqueText('second_unique_text');
- $diff_row = $rows[3]->td;
- $this->assertEqual((string) ($diff_row[0]), '2');
- $this->assertEqual((string) ($diff_row[1]), '2');
- $diff_row = $rows[4]->td;
- $this->assertEqual((string) ($diff_row[0]), '3');
- $this->assertEqual((string) ($diff_row[1]), '3');
-
- $this->clickLink('Strip tags');
- // Extract the changes.
- $rows = $this->xpath('//tbody/tr');
- $diff_row = $rows[1]->td;
-
- // Assert changes made to the body, with strip_tags filter and make sure
- // there are no line numbers.
- $this->assertEqual((string) ($diff_row[0]), '-');
- $this->assertEqual((string) (($diff_row[1]->span)), '1');
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[1]->asXML())), 'Revision 1');
- $diff_row = $rows[2]->td;
- $this->assertEqual((string) (($diff_row[0])), '+');
- $this->assertEqual((string) (($diff_row[1]->span)), '2');
- $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[1]->asXML()))), 'Revision 2');
-
- $this->drupalGet('node/' . $node->id());
- $this->clickLink(t('Revisions'));
- // Revert the revision, confirm.
- $this->clickLink(t('Revert'));
- $this->drupalPostForm(NULL, NULL, t('Revert'));
- $this->assertText('Article ' . $title . ' has been reverted to the revision from');
-
- // Make sure three revisions are available.
- $rows = $this->xpath('//tbody/tr');
- $this->assertEqual(count($rows), 3);
- // Make sure the reverted comment is there.
- $this->assertText('Copy of the revision from');
-
- // Delete the first revision (last entry in table).
- $this->clickLink(t('Delete'), 0);
- $this->drupalPostForm(NULL, NULL, t('Delete'));
- $this->assertText('of Article ' . $title . ' has been deleted.');
-
- // Make sure two revisions are available.
- $rows = $this->xpath('//tbody/tr');
- $this->assertEqual(count($rows), 2);
-
- // Delete one revision so that we are left with only 1 revision.
- $this->clickLink(t('Delete'), 0);
- $this->drupalPostForm(NULL, NULL, t('Delete'));
- $this->assertText('of Article ' . $title . ' has been deleted.');
-
- // Make sure we only have 1 revision now.
- $rows = $this->xpath('//tbody/tr');
- $this->assertEqual(count($rows), 1);
-
- // Assert that there are no radio buttons for revision selection.
- $this->assertNoFieldByXPath('//input[@type="radio"]');
- // Assert that there is no submit button.
- $this->assertNoFieldByXPath('//input[@type="submit"]');
-
- // Create two new revisions of node.
- $edit = [
- 'title[0][value]' => 'new test title',
- 'body[0][value]' => 'new body
',
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
-
- $edit = [
- 'title[0][value]' => 'newer test title',
- 'body[0][value]' => 'newer body
',
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
-
- $this->clickLink(t('Revisions'));
- // Assert the revision summary.
- $this->assertNoUniqueText('Changes on: Title, Body');
- $this->assertText('Copy of the revision from');
- $edit = [
- 'radios_left' => 3,
- 'radios_right' => 4,
- ];
- $this->drupalPostForm(NULL, $edit, t('Compare selected revisions'));
- $this->clickLink('Strip tags');
- // Check markdown layout is used when navigating between revisions.
- $rows = $this->xpath('//tbody/tr');
- $diff_row = $rows[3]->td;
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), 'new body');
- $this->clickLink('Next change');
- // The filter should be the same as the previous screen.
- $rows = $this->xpath('//tbody/tr');
- $diff_row = $rows[3]->td;
- $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), 'newer body');
-
- // Get the node, create a new revision that is not the current one.
- $node = $this->getNodeByTitle('newer test title');
- $node->setNewRevision(TRUE);
- $node->isDefaultRevision(FALSE);
- $node->save();
- $this->drupalGet('node/' . $node->id() . '/revisions');
-
- // Check that the last revision is not the current one.
- $this->assertLink(t('Set as current revision'));
- $text = $this->xpath('//tbody/tr[2]/td[4]/em');
- $this->assertEqual($text[0], 'Current revision');
-
- // Set the last revision as current.
- $this->clickLink('Set as current revision');
- $this->drupalPostForm(NULL, [], t('Revert'));
-
- // Check the last revision is set as current.
- $text = $this->xpath('//tbody/tr[1]/td[4]/em');
- $this->assertEqual($text[0], 'Current revision');
- $this->assertNoLink(t('Set as current revision'));
- }
-
- /**
- * Tests pager on diff overview.
- */
- protected function doTestOverviewPager() {
- $config = \Drupal::configFactory()->getEditable('diff.settings');
- $config->set('general_settings.revision_pager_limit', 10)->save();
-
- $this->loginAsAdmin(['view article revisions']);
-
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- ]);
- // Create 11 more revisions in order to trigger paging on the revisions
- // overview screen.
- for ($i = 0; $i < 11; $i++) {
- $node->setNewRevision(TRUE);
- $node->save();
- }
-
- // Check the number of elements on the first page.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $element = $this->xpath('//*[@id="edit-node-revisions-table"]/tbody/tr');
- $this->assertEqual(count($element), 10);
- // Check that the pager exists.
- $this->assertRaw('page=1');
-
- $this->clickLinkPartialName('Next page');
- // Check the number of elements on the second page.
- $element = $this->xpath('//*[@id="edit-node-revisions-table"]/tbody/tr');
- $this->assertEqual(count($element), 2);
- $this->assertRaw('page=0');
- $this->clickLinkPartialName('Previous page');
- }
-
- /**
- * Tests the revisions overview error messages.
- *
- * @todo Move to DiffLocaleTest?
- */
- protected function doTestRevisionOverviewErrorMessages() {
- // Enable some languages for this test.
- $language = ConfigurableLanguage::createFromLangcode('de');
- $language->save();
-
- // Login as admin with the required permissions.
- $this->loginAsAdmin([
- 'administer node form display',
- 'administer languages',
- 'administer content translation',
- 'create content translations',
- 'translate any entity',
- ]);
-
- // Make article content translatable.
- $edit = [
- 'entity_types[node]' => TRUE,
- 'settings[node][article][translatable]' => TRUE,
- 'settings[node][article][settings][language][language_alterable]' => TRUE,
- ];
- $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
-
- // Create an article.
- $title = 'test_title_b';
- $edit = [
- 'title[0][value]' => $title,
- 'body[0][value]' => 'Revision 1
',
- ];
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $node = $this->drupalGetNodeByTitle($title);
- $revision1 = $node->getRevisionId();
-
- // Create a revision, changing the node language to German.
- $edit = [
- 'langcode[0][value]' => 'de',
- 'body[0][value]' => 'Revision 2
',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Check the revisions overview, ensure only one revisions is available.
- $this->clickLink(t('Revisions'));
- $rows = $this->xpath('//tbody/tr');
- $this->assertEqual(count($rows), 1);
-
- // Compare the revisions and assert the first error message.
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
- $this->assertText('Multiple revisions are needed for comparison.');
-
- // Create another revision, changing the node language back to English.
- $edit = [
- 'langcode[0][value]' => 'en',
- 'body[0][value]' => 'Revision 3
',
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle($title, TRUE);
- $revision3 = $node->getRevisionId();
-
- // Check the revisions overview, ensure two revisions are available.
- $this->clickLink(t('Revisions'));
- $rows = $this->xpath('//tbody/tr');
- $this->assertEqual(count($rows), 2);
- $this->assertNoFieldChecked('edit-node-revisions-table-0-select-column-one');
- $this->assertFieldChecked('edit-node-revisions-table-0-select-column-two');
- $this->assertNoFieldChecked('edit-node-revisions-table-1-select-column-one');
- $this->assertNoFieldChecked('edit-node-revisions-table-1-select-column-two');
-
- // Compare the revisions and assert the second error message.
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
- $this->assertText('Select two revisions to compare.');
-
- // Check the same revisions twice and compare.
- $edit = [
- 'radios_left' => $revision3,
- 'radios_right' => $revision3,
- ];
- $this->drupalPostForm('/node/' . $node->id() . '/revisions', $edit, 'Compare selected revisions');
- // Assert the third error message.
- $this->assertText('Select different revisions to compare.');
-
- // Check different revisions and compare. This time should work correctly.
- $edit = [
- 'radios_left' => $revision3,
- 'radios_right' => $revision1,
- ];
- $this->drupalPostForm('/node/' . $node->id() . '/revisions', $edit, 'Compare selected revisions');
- $this->assertLinkByHref('node/' . $node->id() . '/revisions/view/' . $revision1 . '/' . $revision3);
- }
-
- /**
- * Tests Reference to Deleted Entities.
- */
- protected function doTestEntityReference() {
- // Login as admin with the required permissions.
- $this->loginAsAdmin([
- 'administer node fields',
- ]);
-
- // Adding Entity Reference to Article Content Type.
- $this->drupalPostForm('admin/structure/types/manage/article/fields/add-field', [
- 'new_storage_type' => 'field_ui:entity_reference:node',
- 'label' => 'Content reference test',
- 'field_name' => 'content',
- ], t('Save and continue'));
-
- // Create an first article.
- $title = 'test_title_c';
- $edit = [
- 'title[0][value]' => $title,
- 'body[0][value]' => 'First article
',
- ];
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $node_one = $this->drupalGetNodeByTitle($title);
-
- // Create second article.
- $title = 'test_title_d';
- $edit = [
- 'title[0][value]' => $title,
- 'body[0][value]' => 'Second article
',
- ];
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $node_two = $this->drupalGetNodeByTitle($title);
-
- // Create revision and add entity reference from second node to first.
- $edit = [
- 'body[0][value]' => 'First Revision
',
- 'field_content[0][target_id]' => $node_two->getTitle(),
- 'revision' => TRUE,
- ];
- $this->drupalPostForm('node/' . $node_one->id() . '/edit', $edit, t('Save and keep published'));
-
- // Delete referenced node.
- $node_two->delete();
-
- // Access revision of first node.
- $this->drupalGet('/node/' . $node_one->id());
- $this->clickLink(t('Revisions'));
- $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
- // Revision section should appear.
- $this->assertResponse(200);
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffTestBase.php b/modules/diff/src/Tests/DiffTestBase.php
deleted file mode 100644
index 7a86e3e..0000000
--- a/modules/diff/src/Tests/DiffTestBase.php
+++ /dev/null
@@ -1,89 +0,0 @@
-drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
-
- // Place the blocks that Diff module uses.
- $this->drupalPlaceBlock('local_tasks_block');
- $this->drupalPlaceBlock('local_actions_block');
-
- // Make sure HTML Diff is disabled.
- $config = \Drupal::configFactory()->getEditable('diff.settings');
- $config->set('general_settings.layout_plugins.visual_inline.enabled', FALSE)->save();
- }
-
- /**
- * Creates an user with admin permissions and log in.
- *
- * @param array $additional_permissions
- * Additional permissions that will be granted to admin user.
- * @param bool $reset_permissions
- * Flag to determine if default admin permissions will be replaced by
- * $additional_permissions.
- *
- * @return \Drupal\user\Entity\User|false
- * Newly created and logged in user object.
- */
- protected function loginAsAdmin(array $additional_permissions = [], $reset_permissions = FALSE) {
- $permissions = $this->adminPermissions;
-
- if ($reset_permissions) {
- $permissions = $additional_permissions;
- }
- elseif (!empty($additional_permissions)) {
- $permissions = array_merge($permissions, $additional_permissions);
- }
-
- $this->adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
- return $this->adminUser;
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffViewModeTest.php b/modules/diff/src/Tests/DiffViewModeTest.php
deleted file mode 100644
index e07555a..0000000
--- a/modules/diff/src/Tests/DiffViewModeTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-drupalLogin($this->rootUser);
-
- // Create a node.
- $node = $this->drupalCreateNode([
- 'type' => 'article',
- 'title' => 'Sample node',
- 'body' => [
- 'value' => 'Foo',
- ],
- ]);
-
- // Edit the article and change the email.
- $edit = array(
- 'body[0][value]' => 'Fighters',
- 'revision' => TRUE,
- );
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
- // Set the Body field to hidden in the diff view mode.
- $edit = [
- 'fields[body][region]' => 'hidden',
- ];
- $this->drupalPostForm('admin/structure/types/manage/article/display', $edit, t('Save'));
- $edit = [
- 'fields[body][region]' => 'hidden',
- ];
- $this->drupalPostForm('admin/structure/types/manage/article/display/teaser', $edit, t('Save'));
-
- // Check the difference between the last two revisions.
- $this->drupalGet('node/' . $node->id() . '/revisions');
- $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
- $this->assertNoText('Body');
- $this->assertNoText('Foo');
- $this->assertNoText('Fighters');
- }
-
-}
diff --git a/modules/diff/src/Tests/DiffViewsTest.php b/modules/diff/src/Tests/DiffViewsTest.php
deleted file mode 100644
index 5461f68..0000000
--- a/modules/diff/src/Tests/DiffViewsTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-getEditable('diff.settings');
- $config->set('general_settings.layout_plugins.visual_inline.enabled', FALSE)->save();
-
- $node_type = NodeType::create([
- 'type' => 'article',
- 'label' => 'Article',
- ]);
- $node_type->save();
- $node = Node::create([
- 'type' => 'article',
- 'title' => 'Test article: giraffe',
- ]);
- $node->save();
- $revision1 = $node->getRevisionId();
-
- $node->setNewRevision(TRUE);
- $node->setTitle('Test article: llama');
- $node->save();
- $revision2 = $node->getRevisionId();
-
- $this->drupalGet("node/{$node->id()}/diff-views");
- $this->assertResponse(403);
-
- $user = $this->createUser(['view all revisions']);
- $this->drupalLogin($user);
-
- $this->drupalGet("node/{$node->id()}/diff-views");
- $this->assertResponse(200);
-
- $from_first = (string) $this->cssSelect('#edit-diff-from--3')[0]->attributes()['value'];
- $to_second = (string) $this->cssSelect('#edit-diff-to--2')[0]->attributes()['value'];
-
- $edit = [
- 'diff_from' => $from_first,
- 'diff_to' => $to_second,
- ];
- $this->drupalPostForm(NULL, $edit, t('Compare'));
- $expected_url = Url::fromRoute(
- 'diff.revisions_diff',
- // Route parameters.
- [
- 'node' => $node->id(),
- 'left_revision' => $revision1,
- 'right_revision' => $revision2,
- 'filter' => 'split_fields',
- ],
- // Additional route options.
- [
- 'query' => [
- 'destination' => Url::fromUri("internal:/node/{$node->id()}/diff-views")->toString(),
- ],
- ]
- );
- $this->assertUrl($expected_url);
- $this->assertRaw('Test article: giraffe ');
- $this->assertRaw('Test article: llama ');
- }
-
-}
diff --git a/modules/diff/src/VisualDiffThemeNegotiator.php b/modules/diff/src/VisualDiffThemeNegotiator.php
deleted file mode 100644
index e5678c4..0000000
--- a/modules/diff/src/VisualDiffThemeNegotiator.php
+++ /dev/null
@@ -1,74 +0,0 @@
-configFactory = $config_factory;
- }
-
- /**
- * {@inheritdoc}
- */
- public function applies(RouteMatchInterface $routeMatch) {
- if ($routeMatch->getParameter('filter') !== 'visual_inline') {
- return FALSE;
- }
-
- if (!$this->isDiffRoute($routeMatch)) {
- return FALSE;
- }
-
- if ($this->configFactory->get('diff.settings')->get('general_settings.visual_inline_theme') !== 'default') {
- return FALSE;
- }
-
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function determineActiveTheme(RouteMatchInterface $route_match) {
- return $this->configFactory->get('system.theme')->get('default');
- }
-
- /**
- * Checks if route names for node or other entity are corresponding.
- *
- * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
- * Route match object.
- *
- * @return bool
- * Return TRUE if route name is ok.
- */
- protected function isDiffRoute(RouteMatchInterface $route_match) {
- $regex_pattern = '/^entity\..*\.revisions_diff$/';
- return $route_match->getRouteName() === 'diff.revisions_diff' ||
- preg_match($regex_pattern, $route_match->getRouteName());
- }
-
-}
diff --git a/modules/diff/tests/modules/diff_test/config/install/filter.format.basic_html.yml b/modules/diff/tests/modules/diff_test/config/install/filter.format.basic_html.yml
deleted file mode 100644
index 4d187b7..0000000
--- a/modules/diff/tests/modules/diff_test/config/install/filter.format.basic_html.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-format: basic_html
-name: 'Basic HTML'
-status: true
-weight: 0
-roles:
- - authenticated
-filters:
- filter_html:
- id: filter_html
- provider: filter
- status: true
- weight: -10
- settings:
- allowed_html: '
test entity 1 ', $output);
- $this->assertContains('test entity 2 ', $output);
- }
-
-}
diff --git a/modules/diff/tests/src/Unit/VisualDiffThemeNegotiatorTest.php b/modules/diff/tests/src/Unit/VisualDiffThemeNegotiatorTest.php
deleted file mode 100644
index f7a6de8..0000000
--- a/modules/diff/tests/src/Unit/VisualDiffThemeNegotiatorTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-configFactory = $this->prophesize(ConfigFactoryInterface::class);
- $this->themeNegotiator = new VisualDiffThemeNegotiator($this->configFactory->reveal());
- }
-
- /**
- * @covers ::determineActiveTheme
- */
- public function testDetermineActiveTheme() {
- $config = $this->prophesize(ImmutableConfig::class);
- $config->get('default')->willReturn('the_default_theme');
- $this->configFactory->get('system.theme')->willReturn($config->reveal());
-
- $route_match = $this->prophesize(RouteMatchInterface::class);
- $result = $this->themeNegotiator->determineActiveTheme($route_match->reveal());
- $this->assertSame('the_default_theme', $result);
- }
-
- /**
- * Tests if the theme negotiator applies under correct conditions.
- *
- * @param string $filter_parameter
- * The filter parameter.
- * @param string $route_name
- * The route name.
- * @param string $config_value
- * The configuration value of the element taken from the form values.
- * @param bool $expected
- * The expected result.
- *
- * @covers ::applies
- * @covers ::isDiffRoute
- *
- * @dataProvider providerTestApplies
- */
- public function testApplies($filter_parameter, $route_name, $config_value, $expected) {
- $route_match = $this->prophesize(RouteMatchInterface::class);
- $route_match->getParameter('filter')->willReturn($filter_parameter);
-
- if ($route_name) {
- $route_match->getRouteName()->willReturn($route_name);
- }
- else {
- $route_match->getRouteName()->shouldNotBeCalled();
- }
-
- if ($config_value) {
- $diff_config = $this->prophesize(ImmutableConfig::class);
- $diff_config->get('general_settings.visual_inline_theme')->willReturn($config_value);
- $this->configFactory->get('diff.settings')->willReturn($diff_config->reveal());
- }
- else {
- $this->configFactory->get('diff.settings')->shouldNotBeCalled();
- }
-
- $this->assertSame($expected, $this->themeNegotiator->applies($route_match->reveal()));
- }
-
- /**
- * Provides test data to ::testApplies().
- */
- public function providerTestApplies() {
- $data = [];
- $data[] = [
- 'unexpected_filter_parameter',
- NULL,
- NULL,
- FALSE,
- ];
- $data[] = [
- 'visual_inline',
- 'unexpected_route_name',
- NULL,
- FALSE,
- ];
- $data[] = [
- 'visual_inline',
- 'diff.revisions_diff',
- 'unexpected_config_value',
- FALSE,
- ];
- $data[] = [
- 'visual_inline',
- 'diff.revisions_diff',
- 'default',
- TRUE,
- ];
- $data[] = [
- 'visual_inline',
- 'entity.foo.revisions_diff',
- 'default',
- TRUE,
- ];
- return $data;
- }
-
-}
diff --git a/modules/masquerade/LICENSE.txt b/modules/masquerade/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/masquerade/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/masquerade/README.txt b/modules/masquerade/README.txt
deleted file mode 100644
index d2b6550..0000000
--- a/modules/masquerade/README.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-
--- SUMMARY --
-
-The Masquerade module allows users to temporarily switch to another user
-account. It keeps a record of the original user account, so users can easily
-switch back to the previous account.
-
-For a full description of the module, visit the project page:
- http://drupal.org/project/masquerade
-
-To submit bug reports and feature suggestions, or to track changes:
- http://drupal.org/project/issues/masquerade
-
-
--- REQUIREMENTS --
-
-None.
-
-
--- INSTALLATION --
-
-* Install as usual, see
- http://drupal.org/documentation/install/modules-themes/modules-8
-
-* Grant the "Masquerade as another user" permission to the desired roles.
-
-
--- SECURITY --
-
-* Masquerade's built-in access control mechanism has been designed to be simple,
- smart, and secure by default:
-
- - Users without the masquerade permission are not allowed to masquerade.
- - Uid 1 may masquerade as anyone. No one can masquerade as uid 1.
- - If you have the identical permissions as the target user (or additional
- permissions), you are allowed to masquerade.
- - Otherwise, access to masquerade as the target user is denied.
-
- This means that Masquerade's built-in access control does not allow any kind
- of privilege escalation. It is safe to grant the masquerade permission to
- user roles. Users are never able to exceed their privileges by masquerading
- as someone else.
-
-* More fine-grained access control (e.g., role-per-role, per-user, blacklist)
- may be supplied by separate add-on modules for Masquerade.
-
-
--- FEATURES AND INTEGRATION --
-
-* The Masquerade module provides and aims for a deep integration with the
- built-in user interface of Drupal core and popular contributed administration
- interface modules:
-
- - Contextual links (core)
- - Toolbar (core)
- - Administration menu (http://drupal.org/project/admin_menu)
-
-* Aside from its user permission, the Masquerade module aims for a smart and
- intuitive integration that does not require any configuration. Its design and
- architecture tries to meet the expectations of these user stories:
-
- - This is helpful. Even though I don't know whether I'll actually need it.
- - This is secure. 100% test coverage for the limited functionality it provides.
- - This isn't bloat. Super small, dead simple, focused on the >80% task.
- - This is friendly. Available when I need it, close to "zero-conf", and has
- absolutely no other UI implications.
-
-* Masquerading as Anonymous user is intentionally not supported. Likewise, more
- granular user permissions and other custom plumbing needs to be implemented in
- separate modules instead.
-
-
--- CONTACT --
-
-Current maintainers:
-* Daniel F. Kudwien (sun) - http://drupal.org/user/54136
-* Andrey Postnikov (andypost) - http://drupal.org/user/118908
-
diff --git a/modules/masquerade/composer.json b/modules/masquerade/composer.json
deleted file mode 100644
index b4be91a..0000000
--- a/modules/masquerade/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "name": "drupal/masquerade",
- "description": "Allows privileged users to masquerade as another user.",
- "type": "drupal-module"
-}
diff --git a/modules/masquerade/masquerade.api.php b/modules/masquerade/masquerade.api.php
deleted file mode 100644
index 998f301..0000000
--- a/modules/masquerade/masquerade.api.php
+++ /dev/null
@@ -1,47 +0,0 @@
-id() == 1) {
- return FALSE;
- }
- // Example: If the target username is 'demo', always grant access for everone.
- if ($target_account->label() == 'demo') {
- return TRUE;
- }
- // In other cases do not alter access.
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/masquerade/masquerade.info.yml b/modules/masquerade/masquerade.info.yml
deleted file mode 100644
index b955c2e..0000000
--- a/modules/masquerade/masquerade.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Masquerade
-type: module
-description: 'Allows privileged users to masquerade as another user.'
-# core: 8.x
-dependencies:
- - user
-tags:
- - admin
-
-# Information added by Drupal.org packaging script on 2016-12-05
-version: '8.x-2.0-beta1'
-core: '8.x'
-project: 'masquerade'
-datestamp: 1480963692
diff --git a/modules/masquerade/masquerade.install b/modules/masquerade/masquerade.install
deleted file mode 100644
index eb61d14..0000000
--- a/modules/masquerade/masquerade.install
+++ /dev/null
@@ -1,16 +0,0 @@
-schema();
- if ($schema->tableExists('masquerade')) {
- $schema->dropTable('masquerade');
- }
-}
diff --git a/modules/masquerade/masquerade.links.menu.yml b/modules/masquerade/masquerade.links.menu.yml
deleted file mode 100644
index 65a48d0..0000000
--- a/modules/masquerade/masquerade.links.menu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-masquerade.unmasquerade:
- title: 'Unmasquerade'
- menu_name: account
- description: 'Switch back to your user account.'
- route_name: masquerade.unmasquerade
- weight: -50
diff --git a/modules/masquerade/masquerade.module b/modules/masquerade/masquerade.module
deleted file mode 100644
index 1d79acf..0000000
--- a/modules/masquerade/masquerade.module
+++ /dev/null
@@ -1,275 +0,0 @@
-' . t('About') . '';
- $output .= '' . t('The Masquerade module allows users to temporarily switch to another user account. It records the original user account, so users can easily switch back.') . '
';
- $output .= '' . t('Uses') . ' ';
- $output .= '';
- $output .= '' . t('Granting masquerade access') . ' ';
- $output .= '' . t('Users with the Masquerade as any user permission are able to masquerade as someone else. Users may only masquerade if they have the same or more permissions as the user they want to switch to. Users are never able to escalate their privileges by masquerading as someone else.', [
- ':permission_link' => Url::fromRoute('user.admin_permissions', [], ['fragment' => 'module-masquerade'])->toString(),
- ]) . ' ';
- $output .= '' . t('Masquerading as another user') . ' ';
- $output .= '' . t('There are multiple ways to masquerade as another user:');
- $output .= '';
- $output .= '' . t('On the administrative user listing , choose the Masquerade operation of a certain user account.', [
- ':admin-people-url' => Url::fromRoute('entity.user.collection')->toString(),
- ]) . ' ';
- $output .= '' . t('Masquerade can be used directly from menus provided by the %toolbar module.', [
- '%toolbar' => t('Toolbar')
- ]) . ' ';
- $output .= ' ';
- $output .= ' ';
- $output .= '' . t('Switching back') . ' ';
- $output .= '' . t('To stop masquerading as another user, click the Unmasquerade link in the user account links menu.') . ' ';
- $output .= ' ';
- return $output;
- }
-}
-
-/**
- * Implements hook_toolbar().
- *
- * @todo Nest this with the "View profile", "Edit profile", and "Log out"
- * links under the username tab.
- */
-function masquerade_toolbar() {
- $items = array();
- if (\Drupal::service('masquerade')->isMasquerading()) {
- $items['masquerade_switch_back'] = array(
- '#type' => 'toolbar_item',
- 'tab' => array(
- '#type' => 'link',
- '#title' => t('Unmasquerade'),
- '#url' => Url::fromRoute('masquerade.unmasquerade'),
- ),
- // Hopefully shows immediately after the username tab.
- '#weight' => 101,
- );
- }
- return $items;
-}
-
-/**
- * Returns whether the current user is allowed to masquerade as a certain target user.
- *
- * @param \Drupal\user\UserInterface $target_account
- * The user account object to masquerade as.
- *
- * @return bool
- * TRUE if allowed, FALSE otherwise.
- *
- * @see hook_masquerade_access()
- */
-function masquerade_target_user_access(UserInterface $target_account) {
- $user = \Drupal::currentUser();
-
- // Deny access if the current user is masquerading already or tries to
- // masquerade as himself.
- if (\Drupal::service('masquerade')->isMasquerading() || $user->id() == $target_account->id()) {
- return FALSE;
- }
-
- // Invoke hook_masquerade_access() implementations.
- $access = NULL;
- foreach (\Drupal::moduleHandler()->getImplementations('masquerade_access') as $module) {
- $function = $module . '_masquerade_access';
- $result = $function($user, $target_account);
- // If an implementation explicitly denies access, then there is nothing else
- // to check.
- if ($result === FALSE) {
- $access = FALSE;
- break;
- }
- elseif ($result === TRUE) {
- $access = TRUE;
- }
- }
- // If no module granted access, then access is denied.
- if (!isset($access) || !$access) {
- return FALSE;
- }
- return TRUE;
-}
-
-/**
- * Implements hook_masquerade_access().
- *
- * This default implementation only returns TRUE and never FALSE, since
- * alternative access implementations could not work otherwise.
- */
-function masquerade_masquerade_access($user, UserInterface $target_account) {
- // Uid 1 may masquerade as anyone.
- if ($user->id() == 1) {
- return TRUE;
- }
- // Uid 1 gets special treatment with its own permission.
- if ($target_account->id() == 1) {
- if ($user->hasPermission('masquerade as super user')) {
- return TRUE;
- }
- else {
- return;
- }
- }
- // The current user must be allowed to masquerade.
- if ($user->hasPermission('masquerade as any user')) {
- return TRUE;
- }
- // Permissions may be granted on a per-role basis.
- $target_account_roles = $target_account->getRoles();
- foreach ($target_account_roles as $role_id) {
- if ($user->hasPermission('masquerade as ' . $role_id)) {
- if ($role_id === UserInterface::AUTHENTICATED_ROLE) {
- // Make sure that this is the only role user has to prevent collision
- // with 'masquerade as any user' permission.
- if (count($target_account_roles) == 1) {
- return TRUE;
- }
- }
- else {
- return TRUE;
- }
- }
- }
-}
-
-/**
- * Implements hook_entity_extra_field_info().
- */
-function masquerade_entity_extra_field_info() {
- $fields['user']['user']['display']['masquerade'] = array(
- 'label' => t('Masquerade'),
- 'description' => t('Masquerade as user link.'),
- 'weight' => 50,
- );
- return $fields;
-}
-
-/**
- * Implements hook_ENTITY_TYPE_view().
- */
-function masquerade_user_view(array &$build, UserInterface $account, EntityViewDisplayInterface $display, $view_mode) {
- if ($display->getComponent('masquerade')) {
- // Use post render to allow caching.
- $build['masquerade'] = [
- '#lazy_builder' => [
- 'masquerade_render_cache_link', [
- $account->id(),
- ],
- ],
- '#create_placeholder' => TRUE,
- ];
- }
-}
-
-/**
- * #post_render_cache callback; replaces placeholder with masquerade link.
- *
- * @param int $account_id
- * The account ID.
- *
- * @return array
- * A renderable array containing the comment form.
- *
- * @todo Move to service.
- */
-function masquerade_render_cache_link($account_id) {
- /** @var \Drupal\user\UserInterface $account */
- $account = User::load($account_id);
- $markup = '';
- if (masquerade_target_user_access($account)) {
- // @todo Attaching a CSS class to this would be nice.
- $markup = [
- '#type' => 'link',
- '#title' => t('Masquerade as @name', ['@name' => $account->getDisplayName()]),
- '#url' => $account->toUrl('masquerade'),
- ];
- $markup = \Drupal::service('renderer')->render($markup);
- }
- $element['#markup'] = $markup;
- return $element;
-}
-
-/**
- * Implements hook_entity_type_alter().
- *
- * Adds useful link template to user entity.
- */
-function masquerade_entity_type_alter(array &$entity_types) {
- /** @var \Drupal\Core\Entity\EntityTypeInterface[] $entity_types */
- $entity_types['user']->setLinkTemplate('masquerade', '/user/{user}/masquerade');
-}
-
-/**
- * Implements hook_entity_operation().
- */
-function masquerade_entity_operation(EntityInterface $entity) {
- $operations = array();
- if ($entity->getEntityTypeId() === 'user') {
- if (masquerade_target_user_access($entity)) {
- $operations['masquerade'] = array(
- 'title' => t('Masquerade as'),
- 'weight' => 100,
- 'url' => $entity->toUrl('masquerade'),
- );
- }
- }
- return $operations;
-}
-
-/**
- * Validates whether the current user can masquerade as a given target user.
- *
- * Use this function to generate user-friendly error messages to show in the
- * user interface.
- *
- * @param \Drupal\user\UserInterface $target_account
- * The user account object to masquerade as.
- *
- * @return string|null
- * A string containing a validation error message, or NULL if the current user
- * can masquerade as $target_account.
- */
-function masquerade_switch_user_validate(UserInterface $target_account) {
- $user = \Drupal::currentUser();
-
- if (\Drupal::service('masquerade')->isMasquerading()) {
- return t('You are masquerading already. Please switch back to your account to masquerade as another user.', array(
- '@unmasquerade-url' => Url::fromRoute('masquerade.unmasquerade')->toString(),
- ));
- }
- if ($target_account->id() == $user->id()) {
- return t('You cannot masquerade as yourself. Please choose a different user to masquerade as.');
- }
- if (\Drupal::config('system.maintenance')->get('enabled') && !$target_account->hasPermission('access site in maintenance mode')) {
- return t('@user is not permitted to %permission. Disable maintenance mode to masquerade as @user.', array(
- '%user' => $target_account->getDisplayName(),
- '%permission' => t('Use the site in maintenance mode'),
- ':maintenance-url' => Url::fromRoute('system.site_maintenance_mode')->toString(),
- ));
- }
- if (!masquerade_target_user_access($target_account)) {
- return t('You are not allowed to masquerade as %name.', array(
- '%name' => $target_account->getDisplayName(),
- ));
- }
-}
diff --git a/modules/masquerade/masquerade.permissions.yml b/modules/masquerade/masquerade.permissions.yml
deleted file mode 100644
index 0774364..0000000
--- a/modules/masquerade/masquerade.permissions.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-masquerade as any user:
- title: 'Masquerade as any user except super user'
- restrict access: true
-
-masquerade as super user:
- title: 'Masquerade as super user (UID 1)'
- restrict access: true
-
-permission_callbacks:
- - Drupal\masquerade\MasqueradePermissions::permissions
diff --git a/modules/masquerade/masquerade.routing.yml b/modules/masquerade/masquerade.routing.yml
deleted file mode 100644
index 8fe39ee..0000000
--- a/modules/masquerade/masquerade.routing.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-masquerade.block:
- path: '/masquerade'
- defaults:
- _form: '\Drupal\masquerade\Form\MasqueradeForm'
- _title: 'Masquerade'
- options:
- no_cache: TRUE
- requirements:
- _masquerade_switch_access: 'TRUE'
-
-entity.user.masquerade:
- path: '/user/{user}/masquerade'
- defaults:
- _controller: '\Drupal\masquerade\Controller\SwitchController::switchTo'
- _title: 'Masquerade'
- requirements:
- _csrf_token: 'TRUE'
-
-masquerade.unmasquerade:
- path: '/unmasquerade'
- defaults:
- _controller: '\Drupal\masquerade\Controller\SwitchController::switchBack'
- _title: 'Unmasquerade'
- requirements:
- _user_is_masquerading: 'TRUE'
- _csrf_token: 'TRUE'
diff --git a/modules/masquerade/masquerade.services.yml b/modules/masquerade/masquerade.services.yml
deleted file mode 100644
index b54cedf..0000000
--- a/modules/masquerade/masquerade.services.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-services:
- masquerade:
- class: Drupal\masquerade\Masquerade
- arguments: ['@current_user', '@entity_type.manager', '@module_handler', '@session_manager', '@logger.channel.masquerade', '@user.permissions']
- logger.channel.masquerade:
- parent: logger.channel_base
- arguments: ['masquerade']
- access_check.masquerade.switch:
- class: Drupal\masquerade\Access\SwitchAccessCheck
- arguments: ['@masquerade']
- tags:
- - { name: access_check, applies_to: _masquerade_switch_access }
- access_check.masquerade.unmasquerade:
- class: Drupal\masquerade\Access\UnmasqueradeAccessCheck
- arguments: ['@masquerade']
- tags:
- - { name: access_check, applies_to: _user_is_masquerading }
- cache_context.session.is_masquerading:
- class: Drupal\masquerade\Cache\MasqueradeCacheContext
- arguments: ['@request_stack']
- tags:
- - { name: cache.context }
diff --git a/modules/masquerade/src/Access/SwitchAccessCheck.php b/modules/masquerade/src/Access/SwitchAccessCheck.php
deleted file mode 100644
index 76316e5..0000000
--- a/modules/masquerade/src/Access/SwitchAccessCheck.php
+++ /dev/null
@@ -1,58 +0,0 @@
-masquerade = $masquerade;
- }
-
- /**
- * Check to see if user has any permissions to masquerade.
- *
- * @param \Drupal\Core\Session\AccountInterface $account
- * Run access checks for this account.
- *
- * @return \Drupal\Core\Access\AccessResultInterface
- * The access result.
- */
- public function access(AccountInterface $account) {
- if ($this->masquerade->isMasquerading()) {
- // Do now allow to masquerade when already masquerading.
- $result = AccessResult::forbidden();
- }
- elseif ($account->id() == 1) {
- // Uid 1 may masquerade as anyone.
- $result = AccessResult::allowed();
- }
- else {
- // Ability to masquerade defined by permissions.
- $permissions = $this->masquerade->getPermissions();
- $result = AccessResult::allowedIfHasPermissions($account, $permissions, 'OR');
- }
- return $result->addCacheContexts(['session.is_masquerading']);
- }
-
-}
diff --git a/modules/masquerade/src/Access/UnmasqueradeAccessCheck.php b/modules/masquerade/src/Access/UnmasqueradeAccessCheck.php
deleted file mode 100644
index d9613c5..0000000
--- a/modules/masquerade/src/Access/UnmasqueradeAccessCheck.php
+++ /dev/null
@@ -1,42 +0,0 @@
-masquerade = $masquerade;
- }
-
- /**
- * Check to see if user is masquerading.
- *
- * @return \Drupal\Core\Access\AccessResultInterface
- * The access result.
- */
- public function access() {
- return AccessResult::allowedIf($this->masquerade->isMasquerading())
- ->addCacheContexts(['session.is_masquerading']);
- }
-
-}
diff --git a/modules/masquerade/src/Cache/MasqueradeCacheContext.php b/modules/masquerade/src/Cache/MasqueradeCacheContext.php
deleted file mode 100644
index 8159f01..0000000
--- a/modules/masquerade/src/Cache/MasqueradeCacheContext.php
+++ /dev/null
@@ -1,38 +0,0 @@
-currentUser = $current_user;
- $this->masquerade = $masquerade;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('current_user'),
- $container->get('masquerade')
- );
- }
-
- /**
- * Masquerades the current user as a given user.
- *
- * Access to masquerade as the target user account has to checked by all callers
- * via masquerade_target_user_access() already.
- *
- * @param \Drupal\user\UserInterface $user
- * The user account object to masquerade as.
- *
- * @return \Symfony\Component\HttpFoundation\RedirectResponse
- * Redirect to previous page.
- *
- * @see this::getRedirectResponse()
- */
- public function switchTo(UserInterface $user) {
- // Store current user for messages.
- $account = $this->currentUser;
- $error = masquerade_switch_user_validate($user);
- if (empty($error)) {
- if ($this->masquerade->switchTo($user)) {
- drupal_set_message($this->t('You are now masquerading as @user.', array(
- '@user' => $account->getDisplayName(),
- )));
- }
- }
- else {
- drupal_set_message($error, 'error');
- }
- return $this->getRedirectResponse();
- }
-
- /**
- * Allows a user who is currently masquerading to become a new user.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * The request object.
- *
- * @return \Symfony\Component\HttpFoundation\RedirectResponse
- * Redirect response to previous page.
- *
- * @see this::getRedirectResponse()
- */
- public function switchBack(Request $request) {
- // Store current user name for messages.
- $account_name = $this->currentUser->getDisplayName();
- if ($this->masquerade->switchBack()) {
- drupal_set_message($this->t('You are no longer masquerading as @user.', array(
- '@user' => $account_name,
- )));
- }
- else {
- drupal_set_message($this->t('Error trying unmasquerading as @user.', array(
- '@user' => $account_name,
- )), 'error');
- }
- return $this->getRedirectResponse($request);
- }
-
- /**
- * Returns redirect response to previous page.
- *
- * @param \Symfony\Component\HttpFoundation\Request|null $request
- * (Optional) The request object.
- *
- * @return \Symfony\Component\HttpFoundation\RedirectResponse
- * The redirect.
- *
- * @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
- */
- protected function getRedirectResponse($request = NULL) {
- if (!isset($request)) {
- $request = \Drupal::request();
- }
- $destination = \Drupal::destination();
- if ($destination_path = $destination->get()) {
- // Try destination first.
- $url = Url::createFromRequest(Request::create($destination_path));
- }
- elseif ($redirect_path = $request->server->get('HTTP_REFERER')) {
- // Parse referer to get route name if any.
- $url = Url::createFromRequest(Request::create($redirect_path));
- }
- else {
- // Fallback to front page if no referrer.
- $url = Url::fromRoute('');
- }
- // Check access for redirected url.
- if (!$url->access($this->currentUser)) {
- // Fallback to front page redirect.
- $url = Url::fromRoute('');
- }
- $url = $url->setAbsolute()->toString();
- if ($destination_path) {
- // Override destination because it will take over response.
- $request->query->set('destination', $url);
- $destination->set($url);
- }
- return new RedirectResponse($url);
- }
-
-}
diff --git a/modules/masquerade/src/Form/MasqueradeForm.php b/modules/masquerade/src/Form/MasqueradeForm.php
deleted file mode 100644
index a2b4ed3..0000000
--- a/modules/masquerade/src/Form/MasqueradeForm.php
+++ /dev/null
@@ -1,113 +0,0 @@
-entityManager = $entity_manager;
- $this->masquerade = $masquerade;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('entity.manager'),
- $container->get('masquerade')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'masquerade_block_form';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $form['autocomplete'] = array(
- '#type' => 'container',
- '#attributes' => array('class' => array('container-inline')),
- );
- $form['autocomplete']['masquerade_as'] = array(
- '#type' => 'entity_autocomplete',
- '#target_type' => 'user',
- '#selection_settings' => ['include_anonymous' => FALSE, 'match_operator' => 'STARTS_WITH'],
- '#title' => $this->t('Username'),
- '#title_display' => 'invisible',
- '#required' => TRUE,
- '#placeholder' => $this->t('Masquerade as…'),
- '#size' => '18',
- );
- $form['autocomplete']['actions'] = array('#type' => 'actions');
- $form['autocomplete']['actions']['submit'] = array(
- '#type' => 'submit',
- '#value' => $this->t('Switch'),
- );
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- $user_id = $form_state->getValue('masquerade_as');
- if (empty($user_id)) {
- $form_state->setErrorByName('masquerade_as', $this->t('The user does not exist. Please enter a valid username.'));
- return;
- }
- $target_account = $this->entityManager
- ->getStorage('user')
- ->load($user_id);
- if ($error = masquerade_switch_user_validate($target_account)) {
- $form_state->setErrorByName('masquerade_as', $error);
- }
- else {
- $form_state->setValue('masquerade_target_account', $target_account);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->masquerade->switchTo($form_state->getValue('masquerade_target_account'));
- }
-
-}
diff --git a/modules/masquerade/src/Masquerade.php b/modules/masquerade/src/Masquerade.php
deleted file mode 100644
index a718037..0000000
--- a/modules/masquerade/src/Masquerade.php
+++ /dev/null
@@ -1,195 +0,0 @@
-currentUser = $current_user;
- $this->entityTypeManager = $entity_type_manager;
- $this->moduleHandler = $module_handler;
- $this->sessionManager = $session_manager;
- $this->logger = $logger;
- $this->permissionHandler = $permission_handler;
- }
-
- /**
- * Returns whether the current user is masquerading.
- *
- * @return bool
- */
- public function isMasquerading() {
- // @todo Check to use some session related service.
- return !empty($_SESSION['masquerading']);
- }
-
- /**
- * Masquerades the current user as a given user.
- *
- * @param \Drupal\user\UserInterface $target_account
- * The user account object to masquerade as.
- *
- * @return bool
- * TRUE when masqueraded, FALSE otherwise.
- */
- public function switchTo(UserInterface $target_account) {
- $account = $this->currentUser->getAccount();
-
- // Call logout hooks when switching from original user.
- $this->moduleHandler->invokeAll('user_logout', [$account]);
-
- // Regenerate the session ID to prevent against session fixation attacks.
- $this->sessionManager->regenerate();
-
- $_SESSION['masquerading'] = $account->id();
-
- // Supposed "safe" user switch method:
- // https://www.drupal.org/node/218104
- //$accountSwitcher = Drupal::service('account_switcher');
- //$accountSwitcher->switchTo(new UserSession(array('uid' => $account->id())));
- $this->currentUser->setAccount($target_account);
- \Drupal::service('session')->set('uid', $target_account->id());
-
- // Call all login hooks when switching to masquerading user.
- $this->moduleHandler->invokeAll('user_login', [$target_account]);
-
- $this->logger->info('User %username masqueraded as %target_username.', array(
- '%username' => $account->getDisplayName(),
- '%target_username' => $target_account->getDisplayName(),
- 'link' => $this->l($this->t('view'), $target_account->toUrl()),
- ));
- return TRUE;
- }
-
- /**
- * Switching back to previous user.
- *
- * @return bool
- * TRUE when switched back, FALSE otherwise.
- */
- public function switchBack() {
- if (empty($_SESSION['masquerading'])) {
- return FALSE;
- }
- $new_user = $this->entityTypeManager
- ->getStorage('user')
- ->load($_SESSION['masquerading']);
-
- // Ensure the flag is cleared.
- unset($_SESSION['masquerading']);
- if (!$new_user) {
- return FALSE;
- }
-
- $account = $this->currentUser->getAccount();
- // Call logout hooks when switching from masquerading user.
- $this->moduleHandler->invokeAll('user_logout', [$account]);
- // Regenerate the session ID to prevent against session fixation attacks.
- // @todo Maybe session service migrate.
- $this->sessionManager->regenerate();
-
- $this->currentUser->setAccount($new_user);
- \Drupal::service('session')->set('uid', $new_user->id());
-
- // Call all login hooks when switching back to original user.
- $this->moduleHandler->invokeAll('user_login', [$new_user]);
-
- $this->logger->info('User %username stopped masquerading as %old_username.', array(
- '%username' => $new_user->getDisplayName(),
- '%old_username' => $account->getDisplayName(),
- 'link' => $this->l($this->t('view'), $new_user->toUrl()),
- ));
- return TRUE;
- }
-
- /**
- * Returns module provided permissions.
- *
- * @return array
- * Array of permission names.
- */
- public function getPermissions() {
- $permissions = [];
- foreach ($this->permissionHandler->getPermissions() as $name => $permission) {
- if ($permission['provider'] === 'masquerade') {
- // Filter only module's permissions.
- $permissions[] = $name;
- }
- }
- return $permissions;
- }
-
-}
diff --git a/modules/masquerade/src/MasqueradePermissions.php b/modules/masquerade/src/MasqueradePermissions.php
deleted file mode 100644
index 2732319..0000000
--- a/modules/masquerade/src/MasqueradePermissions.php
+++ /dev/null
@@ -1,53 +0,0 @@
-getUserRoles();
- foreach ($roles as $rid => $role) {
- $permissions['masquerade as ' . $role->id()] = [
- 'title' => $this->t('Masquerade as @role', ['@role' => $role->label()]),
- 'restrict access' => TRUE
- ];
- }
-
- return $permissions;
- }
-
- /**
- * Returns role entities allowed to masquerade as.
- *
- * @return \Drupal\user\RoleInterface[]
- * An associative array with the role id as the key and the role object as
- * value.
- */
- protected function getUserRoles() {
- $roles = Role::loadMultiple();
- // Do not allow masquerade as anonymous user, use private browsing.
- unset($roles[RoleInterface::ANONYMOUS_ID]);
- return $roles;
- }
-
-}
diff --git a/modules/masquerade/src/Plugin/Block/MasqueradeBlock.php b/modules/masquerade/src/Plugin/Block/MasqueradeBlock.php
deleted file mode 100644
index 4f2c68c..0000000
--- a/modules/masquerade/src/Plugin/Block/MasqueradeBlock.php
+++ /dev/null
@@ -1,99 +0,0 @@
-formBuilder = $form_builder;
- $this->masquerade = $masquerade;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('form_builder'),
- $container->get('masquerade')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- protected function blockAccess(AccountInterface $account) {
- if ($this->masquerade->isMasquerading()) {
- return AccessResult::forbidden()->addCacheContexts(['session.is_masquerading']);
- }
- // Display block for all users that has any of masquerade permissions.
- return AccessResult::allowedIfHasPermissions($account, $this->masquerade->getPermissions(), 'OR')
- ->addCacheContexts(['session.is_masquerading']);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCacheContexts() {
- return Cache::mergeContexts(parent::getCacheContexts(), ['session.is_masquerading']);
- }
-
- /**
- * {@inheritdoc}
- */
- public function build() {
- return $this->formBuilder->getForm('Drupal\masquerade\Form\MasqueradeForm');
- }
-
-}
diff --git a/modules/masquerade/src/Tests/MasqueradeAccessTest.php b/modules/masquerade/src/Tests/MasqueradeAccessTest.php
deleted file mode 100644
index 739e92e..0000000
--- a/modules/masquerade/src/Tests/MasqueradeAccessTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-drupalLogin($this->rootUser);
- $this->assertCanMasqueradeAs($this->admin_user);
-
- $this->drupalLogin($this->admin_user);
- // Permission 'masquerade as super user' granted by default.
- $this->assertCanMasqueradeAs($this->rootUser);
- // Permission 'masquerade as any user' granted by default.
- $this->assertCanMasqueradeAs($this->moderator_user);
- $this->assertCanMasqueradeAs($this->editor_user);
- $this->assertCanMasqueradeAs($this->masquerade_user);
- $this->assertCanMasqueradeAs($this->auth_user);
-
- // Test 'masquerade as any user' permission except UID 1.
- $this->drupalLogin($this->moderator_user);
- $this->assertCanNotMasqueradeAs($this->rootUser);
- $this->assertCanMasqueradeAs($this->admin_user);
- $this->assertCanMasqueradeAs($this->editor_user);
- $this->assertCanMasqueradeAs($this->masquerade_user);
- $this->assertCanMasqueradeAs($this->auth_user);
-
- // Test 'masquerade as @role' permission.
- $this->drupalLogin($this->editor_user);
- $this->assertCanNotMasqueradeAs($this->rootUser);
- $this->assertCanNotMasqueradeAs($this->admin_user);
- $this->assertCanNotMasqueradeAs($this->moderator_user);
- $this->assertCanMasqueradeAs($this->masquerade_user);
- $this->assertCanMasqueradeAs($this->auth_user);
-
- // Test 'masquerade as authenticated' permission.
- $this->drupalLogin($this->masquerade_user);
- $this->assertCanNotMasqueradeAs($this->rootUser);
- $this->assertCanNotMasqueradeAs($this->admin_user);
- $this->assertCanNotMasqueradeAs($this->moderator_user);
- $this->assertCanNotMasqueradeAs($this->editor_user);
- $this->assertCanMasqueradeAs($this->auth_user);
-
- // Verify that a user cannot masquerade as himself.
- $edit = [
- 'masquerade_as' => $this->masquerade_user->getAccountName(),
- ];
- $this->drupalPostForm('masquerade', $edit, t('Switch'));
- $this->assertRaw(t('You cannot masquerade as yourself. Please choose a different user to masquerade as.'));
- $this->assertNoText(t('Unmasquerade'));
-
- // Basic 'masquerade' permission check.
- $this->drupalLogin($this->auth_user);
- $this->drupalGet('masquerade');
- $this->assertResponse(403);
- }
-
- /**
- * Asserts that the logged-in user can masquerade as a given target user.
- *
- * @param \Drupal\user\UserInterface $target_account
- * The user to masquerade to.
- */
- protected function assertCanMasqueradeAs($target_account) {
- $edit = [
- 'masquerade_as' => $target_account->getAccountName(),
- ];
- $this->drupalPostForm('masquerade', $edit, t('Switch'));
- $this->assertNoRaw(t('You are not allowed to masquerade as %name.', [
- '%name' => $target_account->getDisplayName(),
- ]));
- $this->clickLink(t('Unmasquerade'));
- }
-
- /**
- * Asserts that the logged-in user can not masquerade as a given target user.
- *
- * @param \Drupal\user\UserInterface $target_account
- * The user to masquerade to.
- */
- protected function assertCanNotMasqueradeAs($target_account) {
- $edit = [
- 'masquerade_as' => $target_account->getAccountName(),
- ];
- $this->drupalPostForm('masquerade', $edit, t('Switch'));
- $this->assertRaw(t('You are not allowed to masquerade as %name.', [
- '%name' => $target_account->getDisplayName(),
- ]));
- $this->assertNoText(t('Unmasquerade'));
- }
-
-}
diff --git a/modules/masquerade/src/Tests/MasqueradeCacheTest.php b/modules/masquerade/src/Tests/MasqueradeCacheTest.php
deleted file mode 100644
index 6d6d7c8..0000000
--- a/modules/masquerade/src/Tests/MasqueradeCacheTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-drupalCreateUser([
- 'masquerade as any user',
- 'access content',
- ], 'umberto');
- $nelle = $this->drupalCreateUser([
- 'masquerade as any user',
- 'access content',
- ], 'nelle');
-
- // Add the Masquerade block to the sidebar.
- $masquerade_block = $this->drupalPlaceBlock('masquerade');
-
- // Login as Umberto.
- $this->drupalLogin($umberto);
- $this->drupalGet('');
- $this->assertBlockAppears($masquerade_block);
-
- // Masquerade as Nelle.
- $edit = ['masquerade_as' => $nelle->getAccountName()];
- $this->drupalPostForm(NULL, $edit, t('Switch'));
- $this->drupalGet('');
- $this->assertNoBlockAppears($masquerade_block);
-
- // Logout, and log in as Nelle.
- $this->drupalLogout();
- $this->drupalLogin($nelle);
- $this->drupalGet('');
- $this->assertBlockAppears($masquerade_block);
- }
-
-}
diff --git a/modules/masquerade/src/Tests/MasqueradeTest.php b/modules/masquerade/src/Tests/MasqueradeTest.php
deleted file mode 100644
index af29618..0000000
--- a/modules/masquerade/src/Tests/MasqueradeTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-drupalLogin($this->admin_user);
-
- // Verify that a token is required.
- $this->drupalGet('user/0/masquerade');
- $this->assertResponse(403);
- $this->drupalGet('user/' . $this->auth_user->id() . '/masquerade');
- $this->assertResponse(403);
-
- // Verify that the admin user is able to masquerade.
- $this->assertSessionByUid($this->admin_user->id(), FALSE);
- $this->masqueradeAs($this->auth_user);
- $this->assertSessionByUid($this->auth_user->id(), $this->admin_user->id());
- $this->assertNoSessionByUid($this->admin_user->id());
-
- // Verify that a token is required to unmasquerade.
- $this->drupalGet('unmasquerade');
- $this->assertResponse(403);
-
- // Verify that the web user cannot masquerade.
- $this->drupalGet('user/' . $this->admin_user->id() . '/masquerade', [
- 'query' => [
- 'token' => $this->drupalGetToken('user/' . $this->admin_user->id() . '/masquerade'),
- ],
- ]);
- $this->assertResponse(403);
-
- // Verify that the user can unmasquerade.
- $this->unmasquerade($this->auth_user);
- $this->assertNoSessionByUid($this->auth_user->id());
- $this->assertSessionByUid($this->admin_user->id(), FALSE);
- }
-
-}
-
diff --git a/modules/masquerade/src/Tests/MasqueradeWebTestBase.php b/modules/masquerade/src/Tests/MasqueradeWebTestBase.php
deleted file mode 100644
index 7f55415..0000000
--- a/modules/masquerade/src/Tests/MasqueradeWebTestBase.php
+++ /dev/null
@@ -1,270 +0,0 @@
-session_id is reset to NULL upon every internal browser
- * request.
- * @see http://drupal.org/node/1555862
- */
-abstract class MasqueradeWebTestBase extends WebTestBase {
-
- /**
- * Modules to install.
- *
- * @var array
- */
- public static $modules = ['masquerade', 'user', 'block'];
-
- /**
- * Various users for the tests.
- *
- * @var \Drupal\user\UserInterface
- */
- protected $admin_user, $auth_user, $editor_user, $masquerade_user, $moderator_user;
-
- /**
- * Various roles for the tests.
- *
- * @var \Drupal\user\RoleInterface
- */
- protected $admin_role, $editor_role, $masquerade_role, $moderator_role;
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- parent::setUp();
-
- // Create and configure User module's admin role.
- $this->admin_role = Role::create([
- 'id' => 'administrator',
- 'label' => 'Administrator',
- ]);
- // Users in this role get all permissions assigned by default.
- $this->admin_role->set('is_admin', TRUE)->save();
-
- // Create a 'masquerade' role to masquerade as users without roles.
- $this->masquerade_role = Role::create([
- 'id' => 'masquerade',
- 'label' => 'Masquerade',
- ]);
- $this->masquerade_role
- // Allow only authenticated (without any other roles).
- ->grantPermission('masquerade as authenticated')
- ->save();
-
- // Create an additional 'editor' role to masquerade as basic users.
- $this->editor_role = Role::create([
- 'id' => 'editor',
- 'label' => 'Editor',
- ]);
- $this->editor_role
- ->grantPermission('masquerade as masquerade')
- ->grantPermission('masquerade as authenticated')
- ->save();
-
- // Create an additional 'moderator' role to check 'masquerade as any user'.
- $this->moderator_role = Role::create([
- 'id' => 'moderator',
- 'label' => 'Moderator',
- ]);
- $this->moderator_role
- ->grantPermission('masquerade as any user')
- ->save();
-
- // Create test users with varying privilege levels.
-
- // Administrative user with User module's admin role *only*.
- $this->admin_user = $this->drupalCreateUser();
- $this->admin_user->setUsername('admin_user');
- $this->admin_user->addRole($this->admin_role->id());
- $this->admin_user->save();
-
- // Moderator user.
- $this->moderator_user = $this->drupalCreateUser();
- $this->moderator_user->setUsername('moderator_user');
- $this->moderator_user->addRole($this->moderator_role->id());
- $this->moderator_user->save();
-
- // Editor user.
- $this->editor_user = $this->drupalCreateUser();
- $this->editor_user->setUsername('editor_user');
- $this->editor_user->addRole($this->editor_role->id());
- $this->editor_user->save();
-
- // Masquerade user.
- $this->masquerade_user = $this->drupalCreateUser();
- $this->masquerade_user->setUsername('masquerade_user');
- $this->masquerade_user->addRole($this->masquerade_role->id());
- $this->masquerade_user->save();
-
- // Authenticated user.
- $this->auth_user = $this->drupalCreateUser();
-
- // Place block to allow unmasquerade link accessible.
- $this->drupalPlaceBlock('system_menu_block:account');
- }
-
- /**
- * Masquerades as another user.
- *
- * @param \Drupal\user\UserInterface $account
- * The user account to masquerade as.
- */
- protected function masqueradeAs(UserInterface $account) {
- $this->drupalGet('user/' . $account->id());
- $this->clickLink(t('Masquerade as @name', ['@name' => $account->getDisplayName()]));
- // @todo Fix when crsfTokenSeed is avalable.
-// $this->drupalGet('user/' . $account->id() . '/masquerade', array(
-// 'query' => array(
-// 'token' => $this->drupalGetToken('user/' . $account->id() . '/masquerade'),
-// ),
-// ));
- $this->assertResponse(200);
- $this->assertText('You are now masquerading as ' . $account->label());
-
- // Update the logged in user account.
- // @see WebTestBase::drupalLogin()
- if (isset($this->session_id)) {
- $this->loggedInUser = $account;
- $this->loggedInUser->session_id = $this->session_id;
- }
- }
-
- /**
- * Unmasquerades the current user.
- *
- * @param \Drupal\user\UserInterface $account
- * The user account to unmasquerade from.
- */
- protected function unmasquerade(UserInterface $account) {
- $this->drupalGet('/user/' . $account->id());
- $this->clickLink('Unmasquerade');
- // @todo Fix when crsfTokenSeed is avalable.
-// $this->drupalGet('unmasquerade', array(
-// 'query' => array(
-// 'token' => $this->drupalGetToken('unmasquerade'),
-// ),
-// ));
- $this->assertResponse(200);
- $this->assertText('You are no longer masquerading as ' . $account->label());
-
- // Update the logged in user account.
- // @see WebTestBase::drupalLogin()
- if (isset($this->session_id)) {
- $this->loggedInUser = $account;
- $this->loggedInUser->session_id = $this->session_id;
- }
- }
-
- /**
- * Asserts that there is a session for a given user ID.
- *
- * @param int $uid
- * The user ID for which to find a session record.
- * @param int|false $expected_masquerading_uid
- * (optional) The expected value of the 'masquerading' session data. Pass
- * FALSE to assert that the session data is not set.
- *
- * @return \stdClass
- * The session record from {sessions}, if any.
- */
- protected function assertSessionByUid($uid, $expected_masquerading_uid = NULL) {
- $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', array(
- ':uid' => $uid,
- ))->fetchAll();
- if (empty($result)) {
- $this->fail(format_string('No session found for uid @uid', array('@uid' => $uid)));
- }
- elseif (count($result) > 1) {
- // If there is more than one session, then that must be unexpected.
- $this->fail("Found more than 1 session for uid $uid.");
- }
- else {
- $this->pass("Found session for uid $uid.");
- $session = reset($result);
-
- // Decode the session data.
- if (!empty($session->session)) {
- // Careful: PHP does not provide a utility function that decodes session
- // data only. session_decode() merges the input into the global
- // $_SESSION (but only if it is an array).
- // @see http://php.net/manual/function.session-decode.php
- $old_session = isset($_SESSION) ? $_SESSION : NULL;
- // Furthermore, if this test is executed on the command line, then
- // Drupal denies to start a session. PHP throws a notice if the session
- // is attempted to be started more than once.
- // @see drupal_session_start()
- @session_start();
- // In any case, ensure that it is empty.
- $_SESSION = array();
-
- if (!session_decode($session->session)) {
- $this->fail(format_string('Failed to decode session data: @data', array('@data' => $session->session)));
- }
- $session->session = isset($_SESSION) ? $_SESSION : array();
-
- // Restore the original global session.
- $_SESSION = NULL;
- if (isset($old_session)) {
- $_SESSION = $old_session;
- }
- }
- else {
- $session = new \stdClass();
- $session->session = array();
- }
-
- if (isset($expected_masquerading_uid)) {
- if ($expected_masquerading_uid !== FALSE) {
- $this->assertEqual($session->session['masquerading'], $expected_masquerading_uid, format_string('$_SESSION[\'masquerading\'] equals @uid.', array(
- '@uid' => $expected_masquerading_uid,
- )));
- }
- else {
- $this->assert(!isset($session->session['masquerading']), '$_SESSION[\'masquerading\'] is not set.');
- }
- }
- return $session;
- }
- }
-
- /**
- * Asserts that no session exists for a given uid.
- *
- * @param int $uid
- * The user ID to assert.
- */
- protected function assertNoSessionByUid($uid) {
- $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', array(
- ':uid' => $uid,
- ))->fetchAll();
- $this->assert(empty($result), "No session for uid $uid found.");
- }
-
- /**
- * Stop-gap fix.
- *
- * @see http://drupal.org/node/1555862
- */
- protected function drupalGetToken($value = '') {
- // Use the same code as \Drupal\Core\Access\CsrfTokenGenerator::get().
- $private_key = $this->container->get('private_key')->get();
- /** @var \Drupal\Core\Session\MetadataBag $session_metadata */
- $session_metadata = $this->container->get('session_manager.metadata_bag');
- // @TODO Try to get seed from testing site, broken now.
- $seed = $session_metadata->getCsrfTokenSeed();
- return Crypt::hmacBase64($value, $seed . $private_key . Settings::getHashSalt());
- }
-
-}
-
diff --git a/modules/pathauto/LICENSE.txt b/modules/pathauto/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/pathauto/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/pathauto/README.md b/modules/pathauto/README.md
deleted file mode 100644
index d21f135..0000000
--- a/modules/pathauto/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-#Pathauto
-
-If you are developing for this module, have a look at pathauto.api.php.
-
-##Description
-
-The Pathauto module provides support functions for other modules to
-automatically generate aliases based on appropriate criteria, with a
-central settings path for site administrators.
-
-Implementations are provided for core entity types: content, taxonomy terms,
-and users (including blogs and forum pages).
-
-Pathauto also provides a way to delete large numbers of aliases. This feature
-is available at Administer > Configuration > Search and metadata > URL aliases >
-Delete aliases.
-
-##Benefits
-
-Besides making the page address more reflective of its content than
-"node/138", it's important to know that modern search engines give
-heavy weight to search terms which appear in a page's URL. By
-automatically using keywords based directly on the page content in the URL,
-relevant search engine hits for your page can be significantly
-enhanced.
-
-##Notices
-
-Pathauto just adds URL aliases to content, users, and taxonomy terms.
-Because it's an alias, the standard Drupal URL (for example node/123 or
-taxonomy/term/1) will still function as normal. If you have external links
-to your site pointing to standard Drupal URLs, or hardcoded links in a module,
-template, content or menu which point to standard Drupal URLs it will bypass
-the alias set by Pathauto.
-
-There are reasons you might not want two URLs for the same content on your
-site. If this applies to you, please note that you will need to update any
-hard coded links in your content or blocks.
-
-If you use the "system path" (i.e. node/10) for menu items and settings like
-that, Drupal will replace it with the url_alias.
-
-For external links, you might want to consider the Path Redirect or
-Global Redirect modules, which allow you to set forwarding either per item or
-across the site to your aliased URLs.
-
-###URLs (not) Getting Replaced With Aliases:
-Please bear in mind that only URLs passed through Drupal's Drupal's URL and
-Link APIs will be replaced with their aliases during page output. If
-a module or your template contains hardcoded links, such as
-'href="node/$node->nid"', those won't get replaced with their corresponding
-aliases.
-
-## Disabling Pathauto for a specific content type (or taxonomy)
-
-When the pattern for a content type is left blank, the default pattern will be
-used. But if the default pattern is also blank, Pathauto will be disabled
-for that content type.
-
-## Installing Pathauto
-1. Install the module as normal, note that there are two dependencies.
-2. Configure the module at admin/config/search/path/patterns - add a new pattern by creating by clicking "Add Pathauto pattern".
-3. Fill out "Path pattern" with fx [node:title], choose which content types this applies to, give it a label (the name) and save it.
-4. When you save new content from now on, it should automatically be assigned an alternative URL
-
-##Credits:
-
-The original module combined the functionality of Mike Ryan's autopath with
-Tommy Sundstrom's path_automatic.
-
-Significant enhancements were contributed by jdmquin @ www.bcdems.net.
-
-Matt England added the tracker support (tracker support has been removed in
-recent changes).
-
-Other suggestions and patches contributed by the Drupal community.
-
-Current maintainers:
-
-- Dave Reid - http://www.davereid.net
-- Greg Knaddison - http://www.knaddison.com
-- Mike Ryan - http://mikeryan.name
-- Frederik 'Freso' S. Olesen - http://freso.dk
diff --git a/modules/pathauto/config/install/pathauto.settings.yml b/modules/pathauto/config/install/pathauto.settings.yml
deleted file mode 100644
index 74a75cd..0000000
--- a/modules/pathauto/config/install/pathauto.settings.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-enabled_entity_types:
- - user
-punctuation:
- hyphen: 1
-verbose : FALSE
-separator : '-'
-max_length : 100
-max_component_length: 100
-transliterate : TRUE
-reduce_ascii : FALSE
-case : TRUE
-ignore_words : 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with'
-update_action : 2
diff --git a/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml b/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
deleted file mode 100644
index 07709b7..0000000
--- a/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-id: pathauto_update_alias_node
-label: 'Update URL alias'
-status: true
-langcode: en
-type: node
-plugin: pathauto_update_alias
-dependencies:
- module:
- - node
diff --git a/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml b/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
deleted file mode 100644
index 891cbf2..0000000
--- a/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-id: pathauto_update_alias_user
-label: 'Update URL alias'
-status: true
-langcode: en
-type: user
-plugin: pathauto_update_alias
-dependencies:
- module:
- - user
diff --git a/modules/pathauto/config/schema/pathauto.schema.yml b/modules/pathauto/config/schema/pathauto.schema.yml
deleted file mode 100644
index ca04411..0000000
--- a/modules/pathauto/config/schema/pathauto.schema.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-pathauto.settings:
- type: config_object
- mapping:
- enabled_entity_types:
- label: Enabled entity types
- type: sequence
- sequence:
- type: string
- punctuation:
- type: sequence
- sequence:
- type: integer
- verbose:
- type: boolean
- separator:
- type: string
- max_length:
- type: integer
- max_component_length:
- type: integer
- transliterate:
- type: boolean
- reduce_ascii:
- type: boolean
- ignore_words:
- type: string
- case:
- type: boolean
- ignore_words:
- type: string
- update_action:
- type: integer
-
-action.configuration.pathauto_update_alias:
- type: action_configuration_default
- label: 'Update URL alias'
diff --git a/modules/pathauto/config/schema/pathauto_pattern.schema.yml b/modules/pathauto/config/schema/pathauto_pattern.schema.yml
deleted file mode 100644
index 14a1ae7..0000000
--- a/modules/pathauto/config/schema/pathauto_pattern.schema.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-pathauto.pattern.*:
- type: config_entity
- label: 'Pathauto pattern config'
- mapping:
- id:
- type: string
- label: 'ID'
- label:
- type: label
- label: 'Label'
- uuid:
- type: string
- type:
- type: string
- label: 'Pattern type'
- pattern:
- type: string
- label: 'Pattern'
- selection_criteria:
- type: sequence
- label: 'Selection criteria'
- sequence:
- type: condition.plugin.[id]
- label: 'Selection condition'
- selection_logic:
- type: string
- label: 'Selection logic'
- weight:
- type: integer
- label: 'Weight'
- relationships:
- type: sequence
- label: 'Context definitions'
- sequence:
- - type: mapping
- label: 'Relationship'
- mapping:
- label:
- type: label
- label: 'Label'
diff --git a/modules/pathauto/pathauto.api.php b/modules/pathauto/pathauto.api.php
deleted file mode 100644
index fc9272f..0000000
--- a/modules/pathauto/pathauto.api.php
+++ /dev/null
@@ -1,160 +0,0 @@
-query("SELECT 1 FROM {mytable} WHERE path = :path", [':path' => $alias])->fetchField();
-}
-
-/**
- * Alter the pattern to be used before an alias is generated by Pathauto.
- *
- * This hook will only be called if a default pattern is configured (on
- * admin/config/search/path/patterns).
- *
- * @param string $pattern
- * The alias pattern for Pathauto to pass to token_replace() to generate the
- * URL alias.
- * @param array $context
- * An associative array of additional options, with the following elements:
- * - 'module': The module or entity type being aliased.
- * - 'op': A string with the operation being performed on the object being
- * aliased. Can be either 'insert', 'update', 'return', or 'bulkupdate'.
- * - 'source': A string of the source path for the alias (e.g. 'node/1').
- * - 'data': An array of keyed objects to pass to token_replace().
- * - 'type': The sub-type or bundle of the object being aliased.
- * - 'language': A string of the language code for the alias (e.g. 'en').
- * This can be altered by reference.
- */
-function hook_pathauto_pattern_alter(&$pattern, array $context) {
- // Switch out any [node:created:*] tokens with [node:updated:*] on update.
- if ($context['module'] == 'node' && ($context['op'] == 'update')) {
- $pattern = preg_replace('/\[node:created(\:[^]]*)?\]/', '[node:updated$1]', $pattern);
- }
-}
-
-/**
- * Alter Pathauto-generated aliases before saving.
- *
- * @param string $alias
- * The automatic alias after token replacement and strings cleaned.
- * @param array $context
- * An associative array of additional options, with the following elements:
- * - 'module': The module or entity type being aliased.
- * - 'op': A string with the operation being performed on the object being
- * aliased. Can be either 'insert', 'update', 'return', or 'bulkupdate'.
- * - 'source': A string of the source path for the alias (e.g. 'node/1').
- * This can be altered by reference.
- * - 'data': An array of keyed objects to pass to token_replace().
- * - 'type': The sub-type or bundle of the object being aliased.
- * - 'language': A string of the language code for the alias (e.g. 'en').
- * This can be altered by reference.
- * - 'pattern': A string of the pattern used for aliasing the object.
- */
-function hook_pathauto_alias_alter(&$alias, array &$context) {
- // Add a suffix so that all aliases get saved as 'content/my-title.html'
- $alias .= '.html';
-
- // Force all aliases to be saved as language neutral.
- $context['language'] = Language::LANGCODE_NOT_SPECIFIED;
-}
-
-/**
- * Alter the list of punctuation characters for Pathauto control.
- *
- * @param $punctuation
- * An array of punctuation to be controlled by Pathauto during replacement
- * keyed by punctuation name. Each punctuation record should be an array
- * with the following key/value pairs:
- * - value: The raw value of the punctuation mark.
- * - name: The human-readable name of the punctuation mark. This must be
- * translated using t() already.
- */
-function hook_pathauto_punctuation_chars_alter(array &$punctuation) {
- // Add the trademark symbol.
- $punctuation['trademark'] = array('value' => '™', 'name' => t('Trademark symbol'));
-
- // Remove the dollar sign.
- unset($punctuation['dollar']);
-}
diff --git a/modules/pathauto/pathauto.info.yml b/modules/pathauto/pathauto.info.yml
deleted file mode 100644
index d34ea43..0000000
--- a/modules/pathauto/pathauto.info.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name : 'Pathauto'
-description : 'Provides a mechanism for modules to automatically generate aliases for the content they manage.'
-# core: 8.x
-type: module
-
-dependencies:
-- ctools:ctools
-- drupal:path
-- token:token
-
-configure: entity.pathauto_pattern.collection
-
-recommends:
-- redirect:redirect
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'pathauto'
-datestamp: 1493468049
diff --git a/modules/pathauto/pathauto.install b/modules/pathauto/pathauto.install
deleted file mode 100644
index f8de322..0000000
--- a/modules/pathauto/pathauto.install
+++ /dev/null
@@ -1,301 +0,0 @@
-schema();
- if (!$database_schema->tableExists($alias_storage::TABLE)) {
- $schema_definition = $alias_storage->schemaDefinition();
- $database_schema->createTable($alias_storage::TABLE, $schema_definition);
- }
- }
-}
-
-/**
- * Updates pathauto widgets to use the path widget ID.
- */
-function pathauto_update_8001() {
-
- // Replace values in the 'entity.definitions.installed' keyvalue collection.
- $collection = \Drupal::service('keyvalue')->get('entity.definitions.installed');
- foreach ($collection->getAll() as $key => $definitions) {
- if (!is_array($definitions) || empty($definitions['path'])) {
- continue;
- }
-
- // Retrieve and change path base field definition.
- $path_definition = $definitions['path'];
- if (($options = $path_definition->getDisplayOptions('form')) && $options['type'] = 'pathauto') {
- $options['type'] = 'path';
- $path_definition->setDisplayOptions('form', $options);
- // Save the new value.
- $collection->set($key, $definitions);
- }
-
- }
-
- foreach (EntityFormDisplay::loadMultiple() as $form_display) {
- if ($component = $form_display->getComponent('path')) {
- if (isset($component['type']) && $component['type'] == 'pathauto') {
- $component['type'] = 'path';
- $form_display->setComponent('path', $component);
- $form_display->save();
- }
- }
- }
-}
-
-/**
- * Converts patterns from configuration objects to configuration entities.
- */
-function pathauto_update_8100() {
- \Drupal::service('module_installer')->install(['ctools']);
-
- $messages = array();
- /** @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_bundle_info */
- $entity_bundle_info = \Drupal::service('entity_type.bundle.info');
- $entity_type_manager = \Drupal::entityTypeManager();
- $language_manager = \Drupal::languageManager();
- $entity_type_manager->clearCachedDefinitions();
- \Drupal::service('plugin.manager.alias_type')->clearCachedDefinitions();
- $entity_types = $entity_type_manager->getDefinitions();
-
- // 1. Load all patterns.
- $config = \Drupal::configFactory()->getEditable('pathauto.pattern');
- $patterns = $config->get('patterns');
-
- // 2. Create a configuration entity per pattern.
- foreach ($patterns as $entity_type => $entity_patterns) {
- if (!array_key_exists($entity_type, $entity_types)) {
- // We found an unknown entity type. Report it.
- $messages[] = t('Entity of type @type was not processed. It defines the following patterns: @patterns', array(
- '@type' => $entity_type,
- '@patterns' => print_r($entity_patterns, TRUE),
- ));
- continue;
- }
- $entity_label = $entity_types[$entity_type]->getLabel();
-
- if (!empty($entity_patterns['default'])) {
- // This is a pattern for an entity type, such as "node".
- $pattern = PathautoPattern::create([
- 'id' => $entity_type,
- 'label' => $entity_label,
- 'type' => 'canonical_entities:' . $entity_type,
- 'pattern' => $entity_patterns['default'],
- 'weight' => 0,
- ]);
- $pattern->save();
- }
-
- // Loop over bundles and create patterns if they have a value.
- // Bundle keys may have a language suffix for language-dependant patterns.
- if (isset($entity_patterns['bundles'])) {
- $bundle_info = $entity_bundle_info->getBundleInfo($entity_type);
- foreach ($entity_patterns['bundles'] as $bundle => $bundle_patterns) {
- if (empty($bundle_patterns['default'])) {
- // This bundle does not define a pattern. Move on to the next one.
- continue;
- }
-
- if (isset($bundle_info[$bundle])) {
- // This is a pattern for a bundle, such as "node_article".
- $pattern = PathautoPattern::create([
- 'id' => $entity_type . '_' . $bundle,
- 'label' => $entity_label . ' ' . $bundle_info[$bundle]['label'],
- 'type' => 'canonical_entities:' . $entity_type,
- 'pattern' => $bundle_patterns['default'],
- 'weight' => -5,
- ]);
-
- // Add the bundle condition.
- $pattern->addSelectionCondition([
- 'id' => 'entity_bundle:' . $entity_type,
- 'bundles' => array($bundle => $bundle),
- 'negate' => FALSE,
- 'context_mapping' => [ $entity_type => $entity_type ],
- ]);
-
- $pattern->save();
- }
- else {
- // This is either a language dependent pattern such as "article_es" or
- // an unknown bundle or langcode. Let's figure it out.
- $matches = NULL;
- $langcode = NULL;
- $extracted_bundle = NULL;
- $language = NULL;
- preg_match('/^(.*)_([a-z-]*)$/', $bundle, $matches);
- if (count($matches) == 3) {
- list(, $extracted_bundle, $langcode) = $matches;
- $language = $language_manager->getLanguage($langcode);
- }
- // Validate bundle, langcode and language.
- if (!isset($bundle_info[$extracted_bundle]) || ($langcode == NULL) || ($language == NULL)) {
- $messages[] = t('Unrecognized entity bundle @entity:@bundle was not processed. It defines the following patterns: @patterns', array(
- '@entity' => $entity_type,
- '@bundle' => $bundle,
- '@patterns' => print_r($entity_patterns, TRUE),
- ));
- continue;
- }
-
- // This is a pattern for a bundle and a language, such as "node_article_es".
- $pattern = PathautoPattern::create([
- 'id' => $entity_type . '_' . $extracted_bundle . '_' . str_replace('-', '_', $langcode),
- 'label' => $entity_label . ' ' . $bundle_info[$extracted_bundle]['label'] . ' ' . $language->getName(),
- 'type' => 'canonical_entities:' . $entity_type,
- 'pattern' => $bundle_patterns['default'],
- 'weight' => -10,
- ]);
-
- // Add the bundle condition.
- $pattern->addSelectionCondition([
- 'id' => 'entity_bundle:' . $entity_type,
- 'bundles' => array($extracted_bundle => $extracted_bundle),
- 'negate' => FALSE,
- 'context_mapping' => [ $entity_type => $entity_type ],
- ]);
-
- // Add the language condition.
- $language_mapping = $entity_type . ':' . $entity_type_manager->getDefinition($entity_type)->getKey('langcode') . ':language';
- $pattern->addSelectionCondition([
- 'id' => 'language',
- 'langcodes' => [ $langcode => $langcode ],
- 'negate' => FALSE,
- 'context_mapping' => [
- 'language' => $language_mapping,
- ]
- ]);
-
- // Add the context relationship for this language.
- $pattern->addRelationship($language_mapping, 'Language');
-
- $pattern->save();
- }
- }
- }
- }
-
- // 3. Delete the old configuration object that stores patterns.
- $config->delete();
-
- // 4. Print out messages.
- if (!empty($messages)) {
- return implode('', $messages);
- }
-}
-
-/**
- * Update relationship storage.
- */
-function pathauto_update_8101() {
- foreach (\Drupal::configFactory()->listAll('pathauto.pattern.') as $pattern_config_name) {
- $pattern_config = \Drupal::configFactory()->getEditable($pattern_config_name);
-
- $relationships = [];
- foreach ((array) $pattern_config->get('context_definitions') as $context_definition) {
- $relationships[$context_definition['id']] = ['label' => $context_definition['label']];
- }
-
- $pattern_config->clear('context_definitions');
- $pattern_config->set('relationships', $relationships);
- $pattern_config->save();
- }
-}
-
-/**
- * Update node type conditions from entity_bundle to node_type.
- */
-function pathauto_update_8102() {
- // Load all pattern configuration entities.
- foreach (\Drupal::configFactory()->listAll('pathauto.pattern.') as $pattern_config_name) {
- $pattern_config = \Drupal::configFactory()->getEditable($pattern_config_name);
-
- // Loop patterns and swap the entity_bundle:node plugin by the node_type
- // plugin.
- if ($pattern_config->get('type') == 'canonical_entities:node') {
- $selection_criteria = $pattern_config->get('selection_criteria');
- foreach ($selection_criteria as $uuid => $condition) {
- if ($condition['id'] == 'entity_bundle:node') {
- $selection_criteria[$uuid]['id'] = 'node_type';
- $pattern_config->set('selection_criteria', $selection_criteria);
- $pattern_config->save();
- break;
- }
- }
- }
- }
-}
-
-/**
- * Fix invalid default value for ignore_words.
- */
-function pathauto_update_8103() {
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('pathauto.settings');
- $ignore_words = $config->get('ignore_words');
- if ($ignore_words === ', in, is,that, the , this, with, ') {
- $config->set('ignore_words', 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with')->save(TRUE);
- }
-}
-
-/**
- * Resave patterns so that lookup keys are updated.
- */
-function pathauto_update_8104() {
- \Drupal::entityTypeManager()->clearCachedDefinitions();
- // Load all pattern configuration entities and save them, so that the new
- // status lookup keys are saved.
- foreach (\Drupal::configFactory()->listAll('pathauto.pattern.') as $pattern_config_name) {
- $pattern_config = \Drupal::configFactory()->getEditable($pattern_config_name);
- $pattern_config->save();
- }
-}
-
-/**
- * Ensure the url_alias table exists.
- */
-function pathauto_update_8105() {
- _pathauto_ensure_url_alias_table_exists();
-}
-
-/**
- * Update default configuration for enabled entity types.
- */
-function pathauto_update_8106() {
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('pathauto.settings');
- $config->set('enabled_entity_types', ['user']);
- $config->save();
-}
diff --git a/modules/pathauto/pathauto.js b/modules/pathauto/pathauto.js
deleted file mode 100644
index d4e068f..0000000
--- a/modules/pathauto/pathauto.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function ($) {
- 'use strict';
- Drupal.behaviors.pathFieldsetSummaries = {
- attach: function (context) {
- $('fieldset.path-form', context).drupalSetSummary(function (context) {
- var path = $('.form-item-path-alias input', context).val();
- var automatic = $('.form-item-path-pathauto input', context).attr('checked');
-
- if (automatic) {
- return Drupal.t('Automatic alias');
- }
- else if (path) {
- return Drupal.t('Alias: @alias', {'@alias': path});
- }
- else {
- return Drupal.t('No alias');
- }
- });
- }
- };
-})(jQuery);
diff --git a/modules/pathauto/pathauto.libraries.yml b/modules/pathauto/pathauto.libraries.yml
deleted file mode 100644
index ae978aa..0000000
--- a/modules/pathauto/pathauto.libraries.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-widget:
- version: 1.0
- js:
- pathauto.js: {}
- dependencies:
- - core/jquery
- - core/drupal
- - core/drupalSettings
- - core/drupal.form
diff --git a/modules/pathauto/pathauto.links.action.yml b/modules/pathauto/pathauto.links.action.yml
deleted file mode 100644
index d68b94a..0000000
--- a/modules/pathauto/pathauto.links.action.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-entity.pathauto_pattern.add_form:
- route_name: 'entity.pathauto_pattern.add_form'
- title: 'Add Pathauto pattern'
- appears_on:
- - entity.pathauto_pattern.collection
-
diff --git a/modules/pathauto/pathauto.links.task.yml b/modules/pathauto/pathauto.links.task.yml
deleted file mode 100644
index d6fa0bc..0000000
--- a/modules/pathauto/pathauto.links.task.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-pathauto.patterns.form:
- route_name: entity.pathauto_pattern.collection
- base_route: path.admin_overview
- title: 'Patterns'
- weight: 10
-
-pathauto.settings.form:
- route_name: pathauto.settings.form
- base_route: path.admin_overview
- title: 'Settings'
- weight: 20
-
-pathauto.bulk.update.form:
- route_name: pathauto.bulk.update.form
- base_route: path.admin_overview
- title: 'Bulk generate'
- weight: 30
-
-pathauto.admin.delete:
- route_name: pathauto.admin.delete
- base_route: path.admin_overview
- title: 'Delete aliases'
- weight: 40
diff --git a/modules/pathauto/pathauto.module b/modules/pathauto/pathauto.module
deleted file mode 100644
index d0763fa..0000000
--- a/modules/pathauto/pathauto.module
+++ /dev/null
@@ -1,188 +0,0 @@
- 'pathauto'));
-}
-
-/**
- * Implements hook_help().
- */
-function pathauto_help($route_name, RouteMatchInterface $route_match) {
- switch ($route_name) {
- case 'help.page.pathauto':
- $output = '' . t('About') . ' ';
- $output .= '' . t('The Pathauto module provides a mechanism to automate the creation of path aliases. This makes URLs more readable and helps search engines index content more effectively. For more information, see the online documentation for Pathauto .', [':online' => 'https://www.drupal.org/documentation/modules/pathauto']) . '
';
- $output .= '';
- $output .= '' . t('Uses') . ' ';
- $output .= '' . t('Pathauto is accessed from the tabs it adds to the list of URL aliases .', [':aliases' => Url::fromRoute('path.admin_overview')->toString()]) . ' ';
- $output .= '' . t('Creating Pathauto Patterns') . ' ';
- $output .= '' . t('The "Patterns" page is used to configure automatic path aliasing. New patterns are created here using the Add Pathauto pattern button which presents a form to simplify pattern creation thru the use of available tokens . The patterns page provides a list of all patterns on the site and allows you to edit and reorder them. An alias is generated for the first pattern that applies.', [':pathauto_pattern' => Url::fromRoute('entity.pathauto_pattern.collection')->toString(), ':add_form' => Url::fromRoute('entity.pathauto_pattern.add_form')->toString()]) . ' ';
- $output .= '' . t('Pathauto Settings') . ' ';
- $output .= '' . t('The "Settings" page is used to customize global Pathauto settings for automated pattern creation.', [':settings' => Url::fromRoute('pathauto.settings.form')->toString()]) . ' ';
- $output .= '' . t('The maximum alias length and maximum component length values default to 100 and have a limit of @max from Pathauto. You should enter a value that is the length of the "alias" column of the url_alias database table minus the length of any strings that might get added to the end of the URL. The recommended and default value is 100.', array('@max' => \Drupal::service('pathauto.alias_storage_helper')->getAliasSchemaMaxlength())) . ' ';
- $output .= '' . t('Bulk Generation') . ' ';
- $output .= '' . t('The "Bulk Generate" page allows you to create URL aliases for items that currently have no aliases. This is typically used when installing Pathauto on a site that has existing un-aliased content that needs to be aliased in bulk.', [':pathauto_bulk' => Url::fromRoute('pathauto.bulk.update.form')->toString()]) . ' ';
- $output .= '' . t('Delete Aliases') . ' ';
- $output .= '' . t('The "Delete Aliases" page allows you to remove URL aliases from items that have previously been assigned aliases using pathauto.', [':pathauto_delete' => Url::fromRoute('pathauto.admin.delete')->toString()]) . ' ';
- $output .= ' ';
- return $output;
-
- case 'entity.pathauto_pattern.collection':
- $output = '' . t('This page provides a list of all patterns on the site and allows you to edit and reorder them.') . '
';
- return $output;
-
- case 'entity.pathauto_pattern.add_form':
- $output = '' . t('You need to select a pattern type, then a pattern and filter, and a label. Additional types can be enabled on the Settings page.', [':settings' => Url::fromRoute('pathauto.settings.form')->toString()]) . '
';
- return $output;
-
- case 'pathauto.bulk.update.form':
- $output = '' . t('Bulk generation can be used to generate URL aliases for items that currently have no aliases. This is typically used when installing Pathauto on a site that has existing un-aliased content that needs to be aliased in bulk.') . '
';
- $output .= '' . t('Note that this will only affect items which are configured to have their URL alias automatically set. Items whose URL alias is manually set are not affected.') . '
';
- return $output;
- }
-}
-
-/**
- * Implements hook_entity_insert().
- */
-function pathauto_entity_insert(EntityInterface $entity) {
- \Drupal::service('pathauto.generator')->updateEntityAlias($entity, 'insert');
-}
-
-/**
- * Implements hook_entity_update().
- */
-function pathauto_entity_update(EntityInterface $entity) {
- \Drupal::service('pathauto.generator')->updateEntityAlias($entity, 'update');
-}
-
-/**
- * Implements hook_entity_update().
- */
-function pathauto_entity_delete(EntityInterface $entity) {
- if ($entity->hasLinkTemplate('canonical') && $entity instanceof ContentEntityInterface && $entity->hasField('path')) {
- \Drupal::service('pathauto.alias_storage_helper')->deleteEntityPathAll($entity);
- $entity->path->first()->get('pathauto')->purge();
- }
-}
-
-/**
- * Implements hook_field_info_alter().
- */
-function pathauto_field_info_alter(&$info) {
- $info['path']['class'] = '\Drupal\pathauto\PathautoItem';
-}
-
-/**
- * Implements hook_field_widget_info_alter().
- */
-function pathauto_field_widget_info_alter(&$widgets) {
- $widgets['path']['class'] = 'Drupal\pathauto\PathautoWidget';
-}
-
-/**
- * Implements hook_entity_base_field_info().
- */
-function pathauto_entity_base_field_info(EntityTypeInterface $entity_type) {
- $config = \Drupal::config('pathauto.settings');
- // Verify that the configuration data isn't null (as is the case before the
- // module's initialization, in tests), so that in_array() won't fail.
- if ($enabled_entity_types = $config->get('enabled_entity_types')) {
- if (in_array($entity_type->id(), $enabled_entity_types)) {
- $fields['path'] = BaseFieldDefinition::create('path')
- ->setCustomStorage(TRUE)
- ->setLabel(t('URL alias'))
- ->setTranslatable(TRUE)
- ->setComputed(TRUE)
- ->setDisplayOptions('form', array(
- 'type' => 'path',
- 'weight' => 30,
- ))
- ->setDisplayConfigurable('form', TRUE);
-
- return $fields;
- }
- }
-}
-
-/**
- * Implements hook_entity_base_field_info_alter().
- */
-function pathauto_entity_base_field_info_alter(&$fields, EntityTypeInterface $entity_type) {
- if (isset($fields['path'])) {
- // Path fields need to be computed so that the pathauto state can be
- // accessed even if there is no alias being set.
- $fields['path']->setComputed(TRUE);
- }
-}
-
-/**
- * Validate the pattern field, to ensure it doesn't contain any characters that
- * are invalid in URLs.
- */
-function pathauto_pattern_validate($element, FormStateInterface $form_state) {
-
- if (isset($element['#value'])) {
- $title = empty($element['#title']) ? $element['#parents'][0] : $element['#title'];
- $invalid_characters = ['#', '?', '&'];
- $invalid_characters_used = [];
-
- foreach ($invalid_characters as $invalid_character) {
- if (strpos($element['#value'], $invalid_character) !== FALSE) {
- $invalid_characters_used[] = $invalid_character;
- }
- }
-
- if (!empty($invalid_characters_used)) {
- $form_state->setError($element, t('The %element-title is using the following invalid characters: @invalid-characters.', array('%element-title' => $title, '@invalid-characters' => implode(', ', $invalid_characters_used))));
- }
-
- if (preg_match('/(\s$)+/', $element['#value'])) {
- $form_state->setError($element, t('The %element-title doesn\'t allow the patterns ending with whitespace.', array('%element-title' => $title)));
- }
- }
-
- return $element;
-
-}
diff --git a/modules/pathauto/pathauto.permissions.yml b/modules/pathauto/pathauto.permissions.yml
deleted file mode 100644
index ede9f28..0000000
--- a/modules/pathauto/pathauto.permissions.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-administer pathauto:
- title: 'Administer pathauto'
- description: 'Allows a user to configure patterns for automated aliases and bulk delete URL-aliases.'
-notify of path changes:
- title: 'Notify of Path Changes'
- description: 'Determines whether or not users are notified.'
diff --git a/modules/pathauto/pathauto.routing.yml b/modules/pathauto/pathauto.routing.yml
deleted file mode 100644
index e55063c..0000000
--- a/modules/pathauto/pathauto.routing.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-entity.pathauto_pattern.collection:
- path: '/admin/config/search/path/patterns'
- defaults:
- _entity_list: 'pathauto_pattern'
- _title: 'Patterns'
- requirements:
- _permission: 'administer pathauto'
-
-entity.pathauto_pattern.add_form:
- path: '/admin/config/search/path/patterns/add'
- defaults:
- _entity_form: 'pathauto_pattern.default'
- _title: 'Add Pathauto pattern'
- tempstore_id: 'pathauto.pattern'
- requirements:
- _permission: 'administer pathauto'
-
-pathauto.settings.form:
- path: '/admin/config/search/path/settings'
- defaults:
- _form: '\Drupal\pathauto\Form\PathautoSettingsForm'
- _title: 'Settings'
- requirements:
- _permission: 'administer pathauto'
-
-entity.pathauto_pattern.enable:
- path: '/admin/config/search/path/patterns/{pathauto_pattern}/enable'
- defaults:
- _entity_form: 'pathauto_pattern.enable'
- requirements:
- _entity_access: 'pathauto_pattern.update'
-
-entity.pathauto_pattern.disable:
- path: '/admin/config/search/path/patterns/{pathauto_pattern}/disable'
- defaults:
- _entity_form: 'pathauto_pattern.disable'
- requirements:
- _entity_access: 'pathauto_pattern.update'
-
-pathauto.bulk.update.form:
- path: '/admin/config/search/path/update_bulk'
- defaults:
- _form: '\Drupal\pathauto\Form\PathautoBulkUpdateForm'
- _title: 'Bulk generate'
- requirements:
- _permission: 'administer url aliases'
-
-pathauto.admin.delete:
- path: '/admin/config/search/path/delete_bulk'
- defaults:
- _form: '\Drupal\pathauto\Form\PathautoAdminDelete'
- _title: 'Delete aliases'
- requirements:
- _permission: 'administer url aliases'
diff --git a/modules/pathauto/pathauto.services.yml b/modules/pathauto/pathauto.services.yml
deleted file mode 100644
index 3ce704e..0000000
--- a/modules/pathauto/pathauto.services.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-services:
- pathauto.generator:
- class: Drupal\pathauto\PathautoGenerator
- arguments: ['@config.factory', '@module_handler', '@token', '@pathauto.alias_cleaner', '@pathauto.alias_storage_helper', '@pathauto.alias_uniquifier', '@pathauto.verbose_messenger', '@string_translation', '@token.entity_mapper', '@entity_type.manager']
- pathauto.alias_cleaner:
- class: Drupal\pathauto\AliasCleaner
- arguments: ['@config.factory', '@pathauto.alias_storage_helper', '@language_manager', '@cache.discovery', '@transliteration', '@module_handler']
- pathauto.alias_storage_helper:
- class: Drupal\pathauto\AliasStorageHelper
- arguments: ['@config.factory', '@path.alias_storage', '@database','@pathauto.verbose_messenger', '@string_translation']
- tags:
- - { name: backend_overridable }
- pathauto.alias_uniquifier:
- class: Drupal\pathauto\AliasUniquifier
- arguments: ['@config.factory', '@pathauto.alias_storage_helper','@module_handler', '@router.route_provider', '@path.alias_manager']
- pathauto.verbose_messenger:
- class: Drupal\pathauto\VerboseMessenger
- arguments: ['@config.factory', '@current_user']
- plugin.manager.alias_type:
- class: Drupal\pathauto\AliasTypeManager
- parent: default_plugin_manager
- pathauto.settings_cache_tag:
- class: Drupal\pathauto\EventSubscriber\PathautoSettingsCacheTag
- arguments: ['@entity_field.manager', '@plugin.manager.alias_type']
- tags:
- - { name: event_subscriber }
diff --git a/modules/pathauto/pathauto.tokens.inc b/modules/pathauto/pathauto.tokens.inc
deleted file mode 100644
index 626ff09..0000000
--- a/modules/pathauto/pathauto.tokens.inc
+++ /dev/null
@@ -1,49 +0,0 @@
- t('Joined path'),
- 'description' => t('The array values each cleaned by Pathauto and then joined with the slash into a string that resembles an URL.'),
- );
-
- return $info;
-}
-
-/**
- * Implements hook_tokens().
- */
-function pathauto_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
- $replacements = array();
-
- if ($type == 'array' && !empty($data['array'])) {
- $array = $data['array'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'join-path':
- $values = array();
- foreach (token_element_children($array) as $key) {
- $value = is_array($array[$key]) ? render($array[$key]) : (string) $array[$key];
- $value = \Drupal::service('pathauto.alias_cleaner')->cleanString($value, $options);
- $values[] = $value;
- }
- $replacements[$original] = implode('/', $values);
- break;
- }
- }
- }
-
- return $replacements;
-}
diff --git a/modules/pathauto/src/AliasCleaner.php b/modules/pathauto/src/AliasCleaner.php
deleted file mode 100644
index 340a266..0000000
--- a/modules/pathauto/src/AliasCleaner.php
+++ /dev/null
@@ -1,351 +0,0 @@
-configFactory = $config_factory;
- $this->aliasStorageHelper = $alias_storage_helper;
- $this->languageManager = $language_manager;
- $this->cacheBackend = $cache_backend;
- $this->transliteration = $transliteration;
- $this->moduleHandler = $module_handler;
- }
-
- /**
- * {@inheritdoc}
- */
- public function cleanAlias($alias) {
- $config = $this->configFactory->get('pathauto.settings');
- $alias_max_length = min($config->get('max_length'), $this->aliasStorageHelper->getAliasSchemaMaxLength());
-
- $output = $alias;
-
- // Trim duplicate, leading, and trailing separators. Do this before cleaning
- // backslashes since a pattern like "[token1]/[token2]-[token3]/[token4]"
- // could end up like "value1/-/value2" and if backslashes were cleaned first
- // this would result in a duplicate blackslash.
- $output = $this->getCleanSeparators($output);
-
- // Trim duplicate, leading, and trailing backslashes.
- $output = $this->getCleanSeparators($output, '/');
-
- // Shorten to a logical place based on word boundaries.
- $output = Unicode::truncate($output, $alias_max_length, TRUE);
-
- return $output;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCleanSeparators($string, $separator = NULL) {
- $config = $this->configFactory->get('pathauto.settings');
-
- if (!isset($separator)) {
- $separator = $config->get('separator');
- }
-
- $output = $string;
-
- if (strlen($separator)) {
- // Trim any leading or trailing separators.
- $output = trim($output, $separator);
-
- // Escape the separator for use in regular expressions.
- $seppattern = preg_quote($separator, '/');
-
- // Replace multiple separators with a single one.
- $output = preg_replace("/$seppattern+/", $separator, $output);
-
- // Replace trailing separators around slashes.
- if ($separator !== '/') {
- $output = preg_replace("/\/+$seppattern\/+|$seppattern\/+|\/+$seppattern/", "/", $output);
- }
- else {
- // If the separator is a slash, we need to re-add the leading slash
- // dropped by the trim function.
- $output = '/' . $output;
- }
- }
-
- return $output;
- }
-
- /**
- * {@inheritdoc}
- */
- public function cleanString($string, array $options = array()) {
- if (empty($this->cleanStringCache)) {
- // Generate and cache variables used in this method.
- $config = $this->configFactory->get('pathauto.settings');
- $this->cleanStringCache = array(
- 'separator' => $config->get('separator'),
- 'strings' => array(),
- 'transliterate' => $config->get('transliterate'),
- 'punctuation' => array(),
- 'reduce_ascii' => (bool) $config->get('reduce_ascii'),
- 'ignore_words_regex' => FALSE,
- 'lowercase' => (bool) $config->get('case'),
- 'maxlength' => min($config->get('max_component_length'), $this->aliasStorageHelper->getAliasSchemaMaxLength()),
- );
-
- // Generate and cache the punctuation replacements for strtr().
- $punctuation = $this->getPunctuationCharacters();
- foreach ($punctuation as $name => $details) {
- $action = $config->get('punctuation.' . $name);
- switch ($action) {
- case PathautoGeneratorInterface::PUNCTUATION_REMOVE:
- $this->cleanStringCache['punctuation'][$details['value']] = '';
- break;
-
- case PathautoGeneratorInterface::PUNCTUATION_REPLACE:
- $this->cleanStringCache['punctuation'][$details['value']] = $this->cleanStringCache['separator'];
- break;
-
- case PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING:
- // Literally do nothing.
- break;
- }
- }
-
- // Generate and cache the ignored words regular expression.
- $ignore_words = $config->get('ignore_words');
- $ignore_words_regex = preg_replace(array('/^[,\s]+|[,\s]+$/', '/[,\s]+/'), array('', '\b|\b'), $ignore_words);
- if ($ignore_words_regex) {
- $this->cleanStringCache['ignore_words_regex'] = '\b' . $ignore_words_regex . '\b';
- if (function_exists('mb_eregi_replace')) {
- mb_regex_encoding('UTF-8');
- $this->cleanStringCache['ignore_words_callback'] = 'mb_eregi_replace';
- }
- else {
- $this->cleanStringCache['ignore_words_callback'] = 'preg_replace';
- $this->cleanStringCache['ignore_words_regex'] = '/' . $this->cleanStringCache['ignore_words_regex'] . '/i';
- }
- }
- }
-
- // Empty strings do not need any processing.
- if ($string === '' || $string === NULL) {
- return '';
- }
-
- $langcode = NULL;
- if (!empty($options['language'])) {
- $langcode = $options['language']->getId();
- }
- elseif (!empty($options['langcode'])) {
- $langcode = $options['langcode'];
- }
-
- // Check if the string has already been processed, and if so return the
- // cached result.
- if (isset($this->cleanStringCache['strings'][$langcode][(string) $string])) {
- return $this->cleanStringCache['strings'][$langcode][(string) $string];
- }
-
- // Remove all HTML tags from the string.
- $output = Html::decodeEntities($string);
- $output = PlainTextOutput::renderFromHtml($output);
-
- // Optionally transliterate.
- if ($this->cleanStringCache['transliterate']) {
- // If the reduce strings to letters and numbers is enabled, don't bother
- // replacing unknown characters with a question mark. Use an empty string
- // instead.
- $output = $this->transliteration->transliterate($output, $langcode, $this->cleanStringCache['reduce_ascii'] ? '' : '?');
- }
-
- // Replace or drop punctuation based on user settings.
- $output = strtr($output, $this->cleanStringCache['punctuation']);
-
- // Reduce strings to letters and numbers.
- if ($this->cleanStringCache['reduce_ascii']) {
- $output = preg_replace('/[^a-zA-Z0-9\/]+/', $this->cleanStringCache['separator'], $output);
- }
-
- // Get rid of words that are on the ignore list.
- if ($this->cleanStringCache['ignore_words_regex']) {
- $words_removed = $this->cleanStringCache['ignore_words_callback']($this->cleanStringCache['ignore_words_regex'], '', $output);
- if (Unicode::strlen(trim($words_removed)) > 0) {
- $output = $words_removed;
- }
- }
-
- // Always replace whitespace with the separator.
- $output = preg_replace('/\s+/', $this->cleanStringCache['separator'], $output);
-
- // Trim duplicates and remove trailing and leading separators.
- $output = $this->getCleanSeparators($this->getCleanSeparators($output, $this->cleanStringCache['separator']));
-
- // Optionally convert to lower case.
- if ($this->cleanStringCache['lowercase']) {
- $output = Unicode::strtolower($output);
- }
-
- // Shorten to a logical place based on word boundaries.
- $output = Unicode::truncate($output, $this->cleanStringCache['maxlength'], TRUE);
-
- // Cache this result in the static array.
- $this->cleanStringCache['strings'][$langcode][(string) $string] = $output;
-
- return $output;
- }
-
-
- /**
- * {@inheritdoc}
- */
- public function getPunctuationCharacters() {
- if (empty($this->punctuationCharacters)) {
- $langcode = $this->languageManager->getCurrentLanguage()->getId();
-
- $cid = 'pathauto:punctuation:' . $langcode;
- if ($cache = $this->cacheBackend->get($cid)) {
- $this->punctuationCharacters = $cache->data;
- }
- else {
- $punctuation = array();
- $punctuation['double_quotes'] = array('value' => '"', 'name' => t('Double quotation marks'));
- $punctuation['quotes'] = array('value' => '\'', 'name' => t("Single quotation marks (apostrophe)"));
- $punctuation['backtick'] = array('value' => '`', 'name' => t('Back tick'));
- $punctuation['comma'] = array('value' => ',', 'name' => t('Comma'));
- $punctuation['period'] = array('value' => '.', 'name' => t('Period'));
- $punctuation['hyphen'] = array('value' => '-', 'name' => t('Hyphen'));
- $punctuation['underscore'] = array('value' => '_', 'name' => t('Underscore'));
- $punctuation['colon'] = array('value' => ':', 'name' => t('Colon'));
- $punctuation['semicolon'] = array('value' => ';', 'name' => t('Semicolon'));
- $punctuation['pipe'] = array('value' => '|', 'name' => t('Vertical bar (pipe)'));
- $punctuation['left_curly'] = array('value' => '{', 'name' => t('Left curly bracket'));
- $punctuation['left_square'] = array('value' => '[', 'name' => t('Left square bracket'));
- $punctuation['right_curly'] = array('value' => '}', 'name' => t('Right curly bracket'));
- $punctuation['right_square'] = array('value' => ']', 'name' => t('Right square bracket'));
- $punctuation['plus'] = array('value' => '+', 'name' => t('Plus sign'));
- $punctuation['equal'] = array('value' => '=', 'name' => t('Equal sign'));
- $punctuation['asterisk'] = array('value' => '*', 'name' => t('Asterisk'));
- $punctuation['ampersand'] = array('value' => '&', 'name' => t('Ampersand'));
- $punctuation['percent'] = array('value' => '%', 'name' => t('Percent sign'));
- $punctuation['caret'] = array('value' => '^', 'name' => t('Caret'));
- $punctuation['dollar'] = array('value' => '$', 'name' => t('Dollar sign'));
- $punctuation['hash'] = array('value' => '#', 'name' => t('Number sign (pound sign, hash)'));
- $punctuation['at'] = array('value' => '@', 'name' => t('At sign'));
- $punctuation['exclamation'] = array('value' => '!', 'name' => t('Exclamation mark'));
- $punctuation['tilde'] = array('value' => '~', 'name' => t('Tilde'));
- $punctuation['left_parenthesis'] = array('value' => '(', 'name' => t('Left parenthesis'));
- $punctuation['right_parenthesis'] = array('value' => ')', 'name' => t('Right parenthesis'));
- $punctuation['question_mark'] = array('value' => '?', 'name' => t('Question mark'));
- $punctuation['less_than'] = array('value' => '<', 'name' => t('Less-than sign'));
- $punctuation['greater_than'] = array('value' => '>', 'name' => t('Greater-than sign'));
- $punctuation['slash'] = array('value' => '/', 'name' => t('Slash'));
- $punctuation['back_slash'] = array('value' => '\\', 'name' => t('Backslash'));
-
- // Allow modules to alter the punctuation list and cache the result.
- $this->moduleHandler->alter('pathauto_punctuation_chars', $punctuation);
- $this->cacheBackend->set($cid, $punctuation);
- $this->punctuationCharacters = $punctuation;
- }
- }
-
- return $this->punctuationCharacters;
- }
-
- /**
- * {@inheritdoc}
- */
- public function cleanTokenValues(&$replacements, $data = array(), $options = array()) {
- foreach ($replacements as $token => $value) {
- // Only clean non-path tokens.
- if (!preg_match('/(path|alias|url|url-brief)\]$/', $token)) {
- $replacements[$token] = $this->cleanString($value, $options);
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function resetCaches() {
- $this->cleanStringCache = array();
- }
-
-}
diff --git a/modules/pathauto/src/AliasCleanerInterface.php b/modules/pathauto/src/AliasCleanerInterface.php
deleted file mode 100644
index 87cc27e..0000000
--- a/modules/pathauto/src/AliasCleanerInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-configFactory = $config_factory;
- $this->aliasStorage = $alias_storage;
- $this->database = $database;
- $this->messenger = $messenger;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAliasSchemaMaxLength() {
- return $this->aliasSchemaMaxLength;
- }
-
- /**
- * {@inheritdoc}
- */
- public function save(array $path, $existing_alias = NULL, $op = NULL) {
- $config = $this->configFactory->get('pathauto.settings');
-
- // Alert users if they are trying to create an alias that is the same as the
- // internal path.
- if ($path['source'] == $path['alias']) {
- $this->messenger->addMessage($this->t('Ignoring alias %alias because it is the same as the internal path.', array('%alias' => $path['alias'])));
- return NULL;
- }
-
- // Skip replacing the current alias with an identical alias.
- if (empty($existing_alias) || $existing_alias['alias'] != $path['alias']) {
- $path += array(
- 'pathauto' => TRUE,
- 'original' => $existing_alias,
- 'pid' => NULL,
- );
-
- // If there is already an alias, respect some update actions.
- if (!empty($existing_alias)) {
- switch ($config->get('update_action')) {
- case PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW:
- // Do not create the alias.
- return NULL;
-
- case PathautoGeneratorInterface::UPDATE_ACTION_LEAVE:
- // Create a new alias instead of overwriting the existing by leaving
- // $path['pid'] empty.
- break;
-
- case PathautoGeneratorInterface::UPDATE_ACTION_DELETE:
- // The delete actions should overwrite the existing alias.
- $path['pid'] = $existing_alias['pid'];
- break;
- }
- }
-
- // Save the path array.
- $this->aliasStorage->save($path['source'], $path['alias'], $path['language'], $path['pid']);
-
- if (!empty($existing_alias['pid'])) {
- $this->messenger->addMessage($this->t(
- 'Created new alias %alias for %source, replacing %old_alias.',
- array(
- '%alias' => $path['alias'],
- '%source' => $path['source'],
- '%old_alias' => $existing_alias['alias'],
- )
- )
- );
- }
- else {
- $this->messenger->addMessage($this->t('Created new alias %alias for %source.', array(
- '%alias' => $path['alias'],
- '%source' => $path['source'],
- )));
- }
-
- return $path;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function loadBySource($source, $language = LanguageInterface::LANGCODE_NOT_SPECIFIED) {
- $alias = $this->aliasStorage->load([
- 'source' => $source,
- 'langcode' => $language,
- ]);
- // If no alias was fetched and if a language was specified, fallbacks to
- // undefined language.
- if (!$alias && ($language !== LanguageInterface::LANGCODE_NOT_SPECIFIED)) {
- $alias = $this->aliasStorage->load([
- 'source' => $source,
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
- ]);
- }
- return $alias;
- }
-
- /**
- * {@inheritdoc}
- */
- public function deleteBySourcePrefix($source) {
- $pids = $this->loadBySourcePrefix($source);
- if ($pids) {
- $this->deleteMultiple($pids);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function deleteAll() {
- $this->database->truncate('url_alias')->execute();
- }
-
- /**
- * {@inheritdoc}
- */
- public function deleteEntityPathAll(EntityInterface $entity, $default_uri = NULL) {
- $this->deleteBySourcePrefix('/' . $entity->toUrl('canonical')->getInternalPath());
- if (isset($default_uri) && $entity->toUrl('canonical')->toString() != $default_uri) {
- $this->deleteBySourcePrefix($default_uri);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function loadBySourcePrefix($source) {
- $select = $this->database->select('url_alias', 'u')
- ->fields('u', array('pid'));
-
- $or_group = $select->orConditionGroup()
- ->condition('source', $source)
- ->condition('source', rtrim($source, '/') . '/%', 'LIKE');
-
- return $select
- ->condition($or_group)
- ->execute()
- ->fetchCol();
- }
-
- /**
- * {@inheritdoc}
- */
- public function countBySourcePrefix($source) {
- $select = $this->database->select('url_alias', 'u')
- ->fields('u', array('pid'));
-
- $or_group = $select->orConditionGroup()
- ->condition('source', $source)
- ->condition('source', rtrim($source, '/') . '/%', 'LIKE');
-
- return $select
- ->condition($or_group)
- ->countQuery()
- ->execute()
- ->fetchField();
- }
-
- /**
- * {@inheritdoc}
- */
- public function countAll() {
- return $this->database->select('url_alias')
- ->countQuery()
- ->execute()
- ->fetchField();
- }
-
- /**
- * Delete multiple URL aliases.
- *
- * Intent of this is to abstract a potential path_delete_multiple() function
- * for Drupal 7 or 8.
- *
- * @param int[] $pids
- * An array of path IDs to delete.
- */
- public function deleteMultiple($pids) {
- foreach ($pids as $pid) {
- $this->aliasStorage->delete(array('pid' => $pid));
- }
- }
-
-}
diff --git a/modules/pathauto/src/AliasStorageHelperInterface.php b/modules/pathauto/src/AliasStorageHelperInterface.php
deleted file mode 100644
index 4f17880..0000000
--- a/modules/pathauto/src/AliasStorageHelperInterface.php
+++ /dev/null
@@ -1,117 +0,0 @@
-alterInfo('pathauto_alias_types');
- $this->setCacheBackend($cache_backend, 'pathauto_alias_types');
- }
-
- /**
- * Returns plugin definitions that support a given token type.
- *
- * @param string $type
- * The type of token plugin must support to be useful.
- *
- * @return array
- * Plugin definitions.
- */
- public function getPluginDefinitionByType($type) {
- $definitions = array_filter($this->getDefinitions(), function ($definition) use ($type) {
- if (!empty($definition['types']) && in_array($type, $definition['types'])) {
- return TRUE;
- }
- return FALSE;
- });
- return $definitions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFallbackPluginId($plugin_id, array $configuration = array()) {
- return 'broken';
- }
-
- /**
- * Gets the definition of all visible plugins for this type.
- *
- * @return array
- * An array of plugin definitions (empty array if no definitions were
- * found). Keys are plugin IDs.
- */
- public function getVisibleDefinitions() {
- $definitions = $this->getDefinitions();
- unset($definitions['broken']);
- return $definitions;
- }
-
-}
diff --git a/modules/pathauto/src/AliasUniquifier.php b/modules/pathauto/src/AliasUniquifier.php
deleted file mode 100644
index 43fc5fa..0000000
--- a/modules/pathauto/src/AliasUniquifier.php
+++ /dev/null
@@ -1,167 +0,0 @@
-configFactory = $config_factory;
- $this->aliasStorageHelper = $alias_storage_helper;
- $this->moduleHandler = $module_handler;
- $this->routeProvider = $route_provider;
- $this->aliasManager = $alias_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function uniquify(&$alias, $source, $langcode) {
- $config = $this->configFactory->get('pathauto.settings');
-
- if (!$this->isReserved($alias, $source, $langcode)) {
- return;
- }
-
- // If the alias already exists, generate a new, hopefully unique, variant.
- $maxlength = min($config->get('max_length'), $this->aliasStorageHelper->getAliasSchemaMaxlength());
- $separator = $config->get('separator');
- $original_alias = $alias;
-
- $i = 0;
- do {
- // Append an incrementing numeric suffix until we find a unique alias.
- $unique_suffix = $separator . $i;
- $alias = Unicode::truncate($original_alias, $maxlength - Unicode::strlen($unique_suffix), TRUE) . $unique_suffix;
- $i++;
- } while ($this->isReserved($alias, $source, $langcode));
- }
-
- /**
- * {@inheritdoc}
- */
- public function isReserved($alias, $source, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED) {
- // Check if this alias already exists.
- if ($existing_source = $this->aliasManager->getPathByAlias($alias, $langcode)) {
- if ($existing_source != $alias) {
- // If it is an alias for the provided source, it is allowed to keep using
- // it. If not, then it is reserved.
- return $existing_source != $source;
- }
-
- }
-
- // Then check if there is a route with the same path.
- if ($this->isRoute($alias)) {
- return TRUE;
- }
- // Finally check if any other modules have reserved the alias.
- $args = array(
- $alias,
- $source,
- $langcode,
- );
- $implementations = $this->moduleHandler->getImplementations('pathauto_is_alias_reserved');
- foreach ($implementations as $module) {
-
- $result = $this->moduleHandler->invoke($module, 'pathauto_is_alias_reserved', $args);
-
- if (!empty($result)) {
- // As soon as the first module says that an alias is in fact reserved,
- // then there is no point in checking the rest of the modules.
- return TRUE;
- }
- }
-
- return FALSE;
- }
-
- /**
- * Verify if the given path is a valid route.
- *
- * @param string $path
- * A string containing a relative path.
- *
- * @return bool
- * TRUE if the path already exists.
- *
- * @throws \InvalidArgumentException
- */
- public function isRoute($path) {
- if (is_file(DRUPAL_ROOT . '/' . $path) || is_dir(DRUPAL_ROOT . '/' . $path)) {
- // Do not allow existing files or directories to get assigned an automatic
- // alias. Note that we do not need to use is_link() to check for symbolic
- // links since this returns TRUE for either is_file() or is_dir() already.
- return TRUE;
- }
-
- $routes = $this->routeProvider->getRoutesByPattern($path);
-
- // Only return true for an exact match, ignore placeholders.
- foreach ($routes as $route) {
- if ($route->getPath() == $path) {
- return TRUE;
- }
- }
-
- return FALSE;
-
- }
-
-}
diff --git a/modules/pathauto/src/AliasUniquifierInterface.php b/modules/pathauto/src/AliasUniquifierInterface.php
deleted file mode 100644
index 2da4ba2..0000000
--- a/modules/pathauto/src/AliasUniquifierInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-getSelectionConditions() as $id => $condition) {
- $criteria[$id] = $condition->getConfiguration();
- }
- $this->selection_criteria = $criteria;
-
- // Invalidate the static caches.
- \Drupal::service('pathauto.generator')->resetCaches();
- }
-
- /**
- * {@inheritdoc}
- */
- public static function postDelete(EntityStorageInterface $storage, array $entities) {
- parent::postDelete($storage, $entities);
- // Invalidate the static caches.
- \Drupal::service('pathauto.generator')->resetCaches();
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- parent::calculateDependencies();
-
- $this->calculatePluginDependencies($this->getAliasType());
-
- foreach ($this->getSelectionConditions() as $instance) {
- $this->calculatePluginDependencies($instance);
- }
-
- return $this->getDependencies();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPattern() {
- return $this->pattern;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setPattern($pattern) {
- $this->pattern = $pattern;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getType() {
- return $this->type;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAliasType() {
- if (!$this->aliasTypeCollection) {
- $this->aliasTypeCollection = new DefaultSingleLazyPluginCollection(\Drupal::service('plugin.manager.alias_type'), $this->getType(), ['default' => $this->getPattern()]);
- }
- return $this->aliasTypeCollection->get($this->getType());
- }
-
- /**
- * {@inheritdoc}
- */
- public function getWeight() {
- return $this->weight;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setWeight($weight) {
- $this->weight = $weight;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getContexts() {
- $contexts = $this->getAliasType()->getContexts();
- foreach ($this->getRelationships() as $token => $definition) {
- /** @var \Drupal\ctools\TypedDataResolver $resolver */
- $resolver = \Drupal::service('ctools.typed_data.resolver');
- $context = $resolver->convertTokenToContext($token, $contexts);
- $context_definition = $context->getContextDefinition();
- if (!empty($definition['label'])) {
- $context_definition->setLabel($definition['label']);
- }
- $contexts[$token] = $context;
- }
- return $contexts;
- }
-
- /**
- * {@inheritdoc}
- */
- public function hasRelationship($token) {
- return isset($this->relationships[$token]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function addRelationship($token, $label = NULL) {
- if (!$this->hasRelationship($token)) {
- $this->relationships[$token] = [
- 'label' => $label,
- ];
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function replaceRelationship($token, $label) {
- if ($this->hasRelationship($token)) {
- $this->relationships[$token] = [
- 'label' => $label,
- ];
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeRelationship($token) {
- unset($this->relationships[$token]);
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getRelationships() {
- return $this->relationships;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSelectionConditions() {
- if (!$this->selectionConditionCollection) {
- $this->selectionConditionCollection = new ConditionPluginCollection(\Drupal::service('plugin.manager.condition'), $this->get('selection_criteria'));
- }
- return $this->selectionConditionCollection;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addSelectionCondition(array $configuration) {
- $configuration['uuid'] = $this->uuidGenerator()->generate();
- $this->getSelectionConditions()->addInstanceId($configuration['uuid'], $configuration);
- return $configuration['uuid'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSelectionCondition($condition_id) {
- return $this->getSelectionConditions()->get($condition_id);
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeSelectionCondition($condition_id) {
- $this->getSelectionConditions()->removeInstanceId($condition_id);
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSelectionLogic() {
- return $this->selection_logic;
- }
-
- /**
- * {@inheritdoc}
- */
- public function applies($object) {
- if ($this->getAliasType()->applies($object)) {
- $definitions = $this->getAliasType()->getContextDefinitions();
- if (count($definitions) > 1) {
- throw new \Exception("Alias types do not support more than one context.");
- }
- $keys = array_keys($definitions);
- // Set the context object on our Alias plugin before retrieving contexts.
- $this->getAliasType()->setContextValue($keys[0], $object);
- /** @var \Drupal\Core\Plugin\Context\ContextInterface[] $base_contexts */
- $contexts = $this->getContexts();
- /** @var \Drupal\Core\Plugin\Context\ContextHandler $context_handler */
- $context_handler = \Drupal::service('context.handler');
- $conditions = $this->getSelectionConditions();
- foreach ($conditions as $condition) {
- if ($condition instanceof ContextAwarePluginInterface) {
- try {
- $context_handler->applyContextMapping($condition, $contexts);
- }
- catch (ContextException $e) {
- watchdog_exception('pathauto', $e);
- return FALSE;
- }
- }
- $result = $condition->execute();
- if ($this->getSelectionLogic() == 'and' && !$result) {
- return FALSE;
- }
- elseif ($this->getSelectionLogic() == 'or' && $result) {
- return TRUE;
- }
- }
- return TRUE;
- }
- return FALSE;
- }
-
-}
diff --git a/modules/pathauto/src/EventSubscriber/PathautoSettingsCacheTag.php b/modules/pathauto/src/EventSubscriber/PathautoSettingsCacheTag.php
deleted file mode 100644
index 371fe2e..0000000
--- a/modules/pathauto/src/EventSubscriber/PathautoSettingsCacheTag.php
+++ /dev/null
@@ -1,54 +0,0 @@
-entityFieldManager = $entity_field_manager;
- $this->aliasTypeManager = $alias_type_manager;
- }
-
- /**
- * Invalidate the 'rendered' cache tag whenever the settings are modified.
- *
- * @param \Drupal\Core\Config\ConfigCrudEvent $event
- * The Event to process.
- */
- public function onSave(ConfigCrudEvent $event) {
- if ($event->getConfig()->getName() === 'pathauto.settings') {
- $config = $event->getConfig();
- $original_entity_types = $config->getOriginal('enabled_entity_types');
-
- // Clear cached field definitions if the values are changed.
- if ($original_entity_types != $config->get('enabled_entity_types')) {
- $this->entityFieldManager->clearCachedFieldDefinitions();
- $this->aliasTypeManager->clearCachedDefinitions();
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public static function getSubscribedEvents() {
- $events[ConfigEvents::SAVE][] = ['onSave'];
- return $events;
- }
-
-}
diff --git a/modules/pathauto/src/Form/PathautoAdminDelete.php b/modules/pathauto/src/Form/PathautoAdminDelete.php
deleted file mode 100644
index a230525..0000000
--- a/modules/pathauto/src/Form/PathautoAdminDelete.php
+++ /dev/null
@@ -1,185 +0,0 @@
-aliasTypeManager = $alias_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('plugin.manager.alias_type')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'pathauto_admin_delete';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $form['delete'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Choose aliases to delete'),
- '#tree' => TRUE,
- ];
-
- // First we do the "all" case.
- $storage_helper = \Drupal::service('pathauto.alias_storage_helper');
- $total_count = $storage_helper->countAll();
- $form['delete']['all_aliases'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('All aliases'),
- '#default_value' => FALSE,
- '#description' => $this->t('Delete all aliases. Number of aliases which will be deleted: %count.', ['%count' => $total_count]),
- ];
-
- // Next, iterate over all visible alias types.
- $definitions = $this->aliasTypeManager->getVisibleDefinitions();
-
- foreach ($definitions as $id => $definition) {
- /** @var \Drupal\pathauto\AliasTypeInterface $alias_type */
- $alias_type = $this->aliasTypeManager->createInstance($id);
- $count = $storage_helper->countBySourcePrefix($alias_type->getSourcePrefix());
- $form['delete']['plugins'][$id] = [
- '#type' => 'checkbox',
- '#title' => (string) $definition['label'],
- '#default_value' => FALSE,
- '#description' => $this->t('Delete aliases for all @label. Number of aliases which will be deleted: %count.', ['@label' => (string) $definition['label'], '%count' => $count]),
- ];
- }
-
- $form['options'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Delete options'),
- '#tree' => TRUE,
- ];
-
- // Provide checkbox for not deleting custom aliases.
- $form['options']['keep_custom_aliases'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Only delete automatically generated aliases'),
- '#default_value' => TRUE,
- '#description' => $this->t('When checked, aliases which have been manually set are not affected by this mass-deletion.'),
- ];
-
- // Warn them and give a button that shows we mean business.
- $form['warning'] = ['#value' => '' . $this->t('Note: there is no confirmation. Be sure of your action before clicking the "Delete aliases now!" button.
'];
- $form['buttons']['submit'] = [
- '#type' => 'submit',
- '#value' => $this->t('Delete aliases now!'),
- ];
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $delete_all = $form_state->getValue(['delete', 'all_aliases']);
- // Keeping custom aliases forces us to go the slow way to correctly check
- // the automatic/manual flag.
- if ($form_state->getValue(['options', 'keep_custom_aliases'])) {
- $batch = [
- 'title' => $this->t('Bulk deleting URL aliases'),
- 'operations' => [['Drupal\pathauto\Form\PathautoAdminDelete::batchStart', [$delete_all]]],
- 'finished' => 'Drupal\pathauto\Form\PathautoAdminDelete::batchFinished',
- ];
-
- if ($delete_all) {
- foreach (array_keys($form_state->getValue(['delete', 'plugins'])) as $id) {
- $batch['operations'][] = ['Drupal\pathauto\Form\PathautoAdminDelete::batchProcess', [$id]];
- }
- }
- else {
- foreach (array_keys(array_filter($form_state->getValue(['delete', 'plugins']))) as $id) {
- $batch['operations'][] = ['Drupal\pathauto\Form\PathautoAdminDelete::batchProcess', [$id]];
- }
- }
-
- batch_set($batch);
- }
- else if ($delete_all) {
- \Drupal::service('pathauto.alias_storage_helper')->deleteAll();
- drupal_set_message($this->t('All of your path aliases have been deleted.'));
- }
- else {
- $storage_helper = \Drupal::service('pathauto.alias_storage_helper');
- foreach (array_keys(array_filter($form_state->getValue(['delete', 'plugins']))) as $id) {
- $alias_type = $this->aliasTypeManager->createInstance($id);
- $storage_helper->deleteBySourcePrefix((string) $alias_type->getSourcePrefix());
- drupal_set_message($this->t('All of your %label path aliases have been deleted.', ['%label' => $alias_type->getLabel()]));
- }
- }
- }
-
- /**
- * Batch callback; record if aliases of all types must be deleted.
- */
- public static function batchStart($delete_all, &$context) {
- $context['results']['delete_all'] = $delete_all;
- $context['results']['deletions'] = [];
- }
-
- /**
- * Common batch processing callback for all operations.
- */
- public static function batchProcess($id, &$context) {
- /** @var \Drupal\pathauto\AliasTypeBatchUpdateInterface $alias_type */
- $alias_type = \Drupal::service('plugin.manager.alias_type')->createInstance($id);
- $alias_type->batchDelete($context);
- }
-
- /**
- * Batch finished callback.
- */
- public static function batchFinished($success, $results, $operations) {
- if ($success) {
- if ($results['delete_all']) {
- drupal_set_message(t('All of your automatically generated path aliases have been deleted.'));
- }
- else if (isset($results['deletions'])) {
- foreach (array_values($results['deletions']) as $label) {
- drupal_set_message(t('All of your automatically generated %label path aliases have been deleted.', ['%label' => $label]));
- }
- }
- }
- else {
- $error_operation = reset($operations);
- drupal_set_message(t('An error occurred while processing @operation with arguments : @args', array('@operation' => $error_operation[0], '@args' => print_r($error_operation[0], TRUE))));
- }
- }
-
-}
diff --git a/modules/pathauto/src/Form/PathautoBulkUpdateForm.php b/modules/pathauto/src/Form/PathautoBulkUpdateForm.php
deleted file mode 100644
index e66cd9d..0000000
--- a/modules/pathauto/src/Form/PathautoBulkUpdateForm.php
+++ /dev/null
@@ -1,164 +0,0 @@
-aliasTypeManager = $alias_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('plugin.manager.alias_type')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'pathauto_bulk_update_form';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
-
- $form = array();
-
- $form['#update_callbacks'] = array();
-
- $form['update'] = array(
- '#type' => 'checkboxes',
- '#title' => $this->t('Select the types of paths for which to generate URL aliases'),
- '#options' => array(),
- '#default_value' => array(),
- );
-
- $definitions = $this->aliasTypeManager->getVisibleDefinitions();
-
- foreach ($definitions as $id => $definition) {
- $alias_type = $this->aliasTypeManager->createInstance($id);
- if ($alias_type instanceof AliasTypeBatchUpdateInterface) {
- $form['update']['#options'][$id] = $alias_type->getLabel();
- }
- }
-
- $form['action'] = array(
- '#type' => 'radios',
- '#title' => $this->t('Select which URL aliases to generate'),
- '#options' => ['create' => $this->t('Generate a URL alias for un-aliased paths only')],
- '#default_value' => 'create',
- );
-
- $config = $this->config('pathauto.settings');
-
- if ($config->get('update_action') == PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW) {
- // Existing aliases should not be updated.
- $form['warning'] = array(
- '#markup' => $this->t('Pathauto settings are set to ignore paths which already have a URL alias. You can only create URL aliases for paths having none.', [':url' => Url::fromRoute('pathauto.settings.form')->toString()]),
- );
- }
- else {
- $form['action']['#options']['update'] = $this->t('Update the URL alias for paths having an old URL alias');
- $form['action']['#options']['all'] = $this->t('Regenerate URL aliases for all paths');
- }
-
- $form['actions']['#type'] = 'actions';
- $form['actions']['submit'] = array(
- '#type' => 'submit',
- '#value' => $this->t('Update'),
- );
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $batch = array(
- 'title' => $this->t('Bulk updating URL aliases'),
- 'operations' => array(
- array('Drupal\pathauto\Form\PathautoBulkUpdateForm::batchStart', array()),
- ),
- 'finished' => 'Drupal\pathauto\Form\PathautoBulkUpdateForm::batchFinished',
- );
-
- $action = $form_state->getValue('action');
-
- foreach ($form_state->getValue('update') as $id) {
- if (!empty($id)) {
- $batch['operations'][] = array('Drupal\pathauto\Form\PathautoBulkUpdateForm::batchProcess', [$id, $action]);
- }
- }
-
- batch_set($batch);
- }
-
- /**
- * Batch callback; initialize the number of updated aliases.
- */
- public static function batchStart(&$context) {
- $context['results']['updates'] = 0;
- }
-
- /**
- * Common batch processing callback for all operations.
- *
- * Required to load our include the proper batch file.
- */
- public static function batchProcess($id, $action, &$context) {
- /** @var \Drupal\pathauto\AliasTypeBatchUpdateInterface $alias_type */
- $alias_type = \Drupal::service('plugin.manager.alias_type')->createInstance($id);
- $alias_type->batchUpdate($action, $context);
- }
-
- /**
- * Batch finished callback.
- */
- public static function batchFinished($success, $results, $operations) {
- if ($success) {
- if ($results['updates']) {
- drupal_set_message(\Drupal::translation()->formatPlural($results['updates'], 'Generated 1 URL alias.', 'Generated @count URL aliases.'));
- }
- else {
- drupal_set_message(t('No new URL aliases to generate.'));
- }
- }
- else {
- $error_operation = reset($operations);
- drupal_set_message(t('An error occurred while processing @operation with arguments : @args', array('@operation' => $error_operation[0], '@args' => print_r($error_operation[0], TRUE))));
- }
- }
-
-}
diff --git a/modules/pathauto/src/Form/PathautoSettingsForm.php b/modules/pathauto/src/Form/PathautoSettingsForm.php
deleted file mode 100644
index 281edb2..0000000
--- a/modules/pathauto/src/Form/PathautoSettingsForm.php
+++ /dev/null
@@ -1,266 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->entityFieldManager = $entity_field_manager;
- $this->aliasTypeManager = $alias_type_manager;
- }
-
- /**
- * {@inheritDoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config.factory'),
- $container->get('entity_type.manager'),
- $container->get('entity_field.manager'),
- $container->get('plugin.manager.alias_type')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'pathauto_settings_form';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditableConfigNames() {
- return ['pathauto.settings'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $config = $this->config('pathauto.settings');
-
- $form['enabled_entity_types'] = [
- '#type' => 'details',
- '#open' => TRUE,
- '#title' => $this->t('Enabled entity types'),
- '#description' => $this->t('Enable to add a path field and allow to define alias patterns for the given type. Disabled types already define a path field themselves or currently have a pattern.'),
- '#tree' => TRUE,
- ];
-
- // Get all applicable entity types.
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Disable a checkbox if it already exists and if the entity type has
- // patterns currently defined or if it isn't defined by us.
- $patterns_count = \Drupal::entityQuery('pathauto_pattern')
- ->condition('type', 'canonical_entities:' . $entity_type_id)
- ->count()
- ->execute();
-
- if (is_subclass_of($entity_type->getClass(), FieldableEntityInterface::class) && $entity_type->hasLinkTemplate('canonical')) {
- $field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
- $form['enabled_entity_types'][$entity_type_id] = [
- '#type' => 'checkbox',
- '#title' => $entity_type->getLabel(),
- '#default_value' => isset($field_definitions['path']) || in_array($entity_type_id, $config->get('enabled_entity_types')),
- '#disabled' => isset($field_definitions['path']) && ($field_definitions['path']->getProvider() != 'pathauto' || $patterns_count),
- ];
- }
- }
-
- $form['verbose'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Verbose'),
- '#default_value' => $config->get('verbose'),
- '#description' => $this->t('Display alias changes (except during bulk updates).'),
- );
-
- $form['separator'] = array(
- '#type' => 'textfield',
- '#title' => $this->t('Separator'),
- '#size' => 1,
- '#maxlength' => 1,
- '#default_value' => $config->get('separator'),
- '#description' => $this->t('Character used to separate words in titles. This will replace any spaces and punctuation characters. Using a space or + character can cause unexpected results.'),
- );
-
- $form['case'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Character case'),
- '#default_value' => $config->get('case'),
- '#description' => $this->t('Convert token values to lowercase.'),
- );
-
- $max_length = \Drupal::service('pathauto.alias_storage_helper')->getAliasSchemaMaxlength();
-
- $help_link = '';
- if (\Drupal::moduleHandler()->moduleExists('help')) {
- $help_link = ' ' . $this->t('See Pathauto help for details.', [':pathauto-help' => Url::fromRoute('help.page', ['name' => 'pathauto'])->toString()]);
- }
-
- $form['max_length'] = array(
- '#type' => 'number',
- '#title' => $this->t('Maximum alias length'),
- '#size' => 3,
- '#maxlength' => 3,
- '#default_value' => $config->get('max_length'),
- '#min' => 1,
- '#max' => $max_length,
- '#description' => $this->t('Maximum length of aliases to generate. 100 is the recommended length. @max is the maximum possible length.', array('@max' => $max_length)) . $help_link,
- );
-
- $form['max_component_length'] = array(
- '#type' => 'number',
- '#title' => $this->t('Maximum component length'),
- '#size' => 3,
- '#maxlength' => 3,
- '#default_value' => $config->get('max_component_length'),
- '#min' => 1,
- '#max' => $max_length,
- '#description' => $this->t('Maximum text length of any component in the alias (e.g., [title]). 100 is the recommended length. @max is the maximum possible length.', ['@max' => $max_length]) . $help_link,
- );
-
- $description = $this->t('What should Pathauto do when updating an existing content item which already has an alias?');
- if (\Drupal::moduleHandler()->moduleExists('redirect')) {
- $description .= ' ' . $this->t('The Redirect module settings affect whether a redirect is created when an alias is deleted.', array(':url' => Url::fromRoute('redirect.settings')->toString()));
- }
- else {
- $description .= ' ' . $this->t('Considering installing the Redirect module to get redirects when your aliases change.', array(':url' => 'http://drupal.org/project/redirect'));
- }
-
- $form['update_action'] = array(
- '#type' => 'radios',
- '#title' => $this->t('Update action'),
- '#default_value' => $config->get('update_action'),
- '#options' => array(
- PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW => $this->t('Do nothing. Leave the old alias intact.'),
- PathautoGeneratorInterface::UPDATE_ACTION_LEAVE => $this->t('Create a new alias. Leave the existing alias functioning.'),
- PathautoGeneratorInterface::UPDATE_ACTION_DELETE => $this->t('Create a new alias. Delete the old alias.'),
- ),
- '#description' => $description,
- );
-
- $form['transliterate'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Transliterate prior to creating alias'),
- '#default_value' => $config->get('transliterate'),
- '#description' => $this->t('When a pattern includes certain characters (such as those with accents) should Pathauto attempt to transliterate them into the US-ASCII alphabet?'),
- );
-
- $form['reduce_ascii'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Reduce strings to letters and numbers'),
- '#default_value' => $config->get('reduce_ascii'),
- '#description' => $this->t('Filters the new alias to only letters and numbers found in the ASCII-96 set.'),
- );
-
- $form['ignore_words'] = array(
- '#type' => 'textarea',
- '#title' => $this->t('Strings to Remove'),
- '#default_value' => $config->get('ignore_words'),
- '#description' => $this->t('Words to strip out of the URL alias, separated by commas. Do not use this to remove punctuation.'),
- '#wysiwyg' => FALSE,
- );
-
- $form['punctuation'] = array(
- '#type' => 'fieldset',
- '#title' => $this->t('Punctuation'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#tree' => TRUE,
- );
-
- $punctuation = \Drupal::service('pathauto.alias_cleaner')->getPunctuationCharacters();
-
- foreach ($punctuation as $name => $details) {
- // Use the value from config if it exists.
- if ($config->get('punctuation.' . $name) !== NULL) {
- $details['default'] = $config->get('punctuation.' . $name);
- }
- else {
- // Otherwise use the correct default.
- $details['default'] = $details['value'] == $config->get('separator') ? PathautoGeneratorInterface::PUNCTUATION_REPLACE : PathautoGeneratorInterface::PUNCTUATION_REMOVE;
- }
- $form['punctuation'][$name] = array(
- '#type' => 'select',
- '#title' => $details['name'] . ' (' . Html::escape($details['value']) . ')',
- '#default_value' => $details['default'],
- '#options' => array(
- PathautoGeneratorInterface::PUNCTUATION_REMOVE => $this->t('Remove'),
- PathautoGeneratorInterface::PUNCTUATION_REPLACE => $this->t('Replace by separator'),
- PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING => $this->t('No action (do not replace)'),
- ),
- );
- }
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
-
- $config = $this->config('pathauto.settings');
-
- $form_state->cleanValues();
-
- $original_entity_types = $config->get('enabled_entity_types');
- foreach ($form_state->getValues() as $key => $value) {
- if ($key == 'enabled_entity_types') {
- $enabled_entity_types = [];
- foreach ($value as $entity_type_id => $enabled) {
- $field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
- // Verify that the entity type is enabled and that it is not defined
- // or defined by us before adding it to the configuration, so that
- // we do not store an entity type that cannot be enabled or disabled.
- if ($enabled && (!isset($field_definitions['path']) || ($field_definitions['path']->getProvider() === 'pathauto'))) {
- $enabled_entity_types[] = $entity_type_id;
- }
- }
- $value = $enabled_entity_types;
- }
- $config->set($key, $value);
- }
- $config->save();
-
- parent::submitForm($form, $form_state);
- }
-
-}
diff --git a/modules/pathauto/src/Form/PatternDisableForm.php b/modules/pathauto/src/Form/PatternDisableForm.php
deleted file mode 100644
index c87b88b..0000000
--- a/modules/pathauto/src/Form/PatternDisableForm.php
+++ /dev/null
@@ -1,52 +0,0 @@
-t('Are you sure you want to disable the pattern %label?', array('%label' => $this->entity->label()));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return new Url('entity.pathauto_pattern.collection');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return $this->t('Disable');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDescription() {
- return $this->t('Disabled patterns are ignored when generating aliases.');
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->entity->disable()->save();
- drupal_set_message($this->t('Disabled pattern %label.', array('%label' => $this->entity->label())));
-
- $form_state->setRedirectUrl($this->getCancelUrl());
- }
-
-}
diff --git a/modules/pathauto/src/Form/PatternEditForm.php b/modules/pathauto/src/Form/PatternEditForm.php
deleted file mode 100644
index 49efc7e..0000000
--- a/modules/pathauto/src/Form/PatternEditForm.php
+++ /dev/null
@@ -1,285 +0,0 @@
-get('plugin.manager.alias_type'),
- $container->get('entity_type.bundle.info'),
- $container->get('entity_type.manager'),
- $container->get('language_manager')
- );
- }
-
- /**
- * PatternEditForm constructor.
- *
- * @param \Drupal\pathauto\AliasTypeManager $manager
- * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
- * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
- */
- function __construct(AliasTypeManager $manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EntityTypeManagerInterface $entity_type_manager, LanguageManagerInterface $language_manager) {
- $this->manager = $manager;
- $this->entityTypeBundleInfo = $entity_type_bundle_info;
- $this->entityTypeManager = $entity_type_manager;
- $this->languageManager = $language_manager;
- }
-
- /**
- * {@inheritDoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
-
- $options = [];
- foreach ($this->manager->getVisibleDefinitions() as $plugin_id => $plugin_definition) {
- $options[$plugin_id] = $plugin_definition['label'];
- }
- $form['type'] = [
- '#type' => 'select',
- '#title' => $this->t('Pattern type'),
- '#default_value' => $this->entity->getType(),
- '#options' => $options,
- '#required' => TRUE,
- '#limit_validation_errors' => array(array('type')),
- '#submit' => array('::submitSelectType'),
- '#executes_submit_callback' => TRUE,
- '#ajax' => array(
- 'callback' => '::ajaxReplacePatternForm',
- 'wrapper' => 'pathauto-pattern',
- 'method' => 'replace',
- ),
- ];
-
- $form['pattern_container'] = [
- '#type' => 'container',
- '#prefix' => '',
- '#suffix' => '
',
- ];
-
- // if there is no type yet, stop here.
- if ($this->entity->getType()) {
-
- $alias_type = $this->entity->getAliasType();
-
- $form['pattern_container']['pattern'] = array(
- '#type' => 'textfield',
- '#title' => 'Path pattern',
- '#default_value' => $this->entity->getPattern(),
- '#size' => 65,
- '#maxlength' => 1280,
- '#element_validate' => array('token_element_validate', 'pathauto_pattern_validate'),
- '#after_build' => array('token_element_validate'),
- '#token_types' => $alias_type->getTokenTypes(),
- '#min_tokens' => 1,
- '#required' => TRUE,
- );
-
- // Show the token help relevant to this pattern type.
- $form['pattern_container']['token_help'] = array(
- '#theme' => 'token_tree_link',
- '#token_types' => $alias_type->getTokenTypes(),
- );
-
- // Expose bundle and language conditions.
- if ($alias_type->getDerivativeId() && $entity_type = $this->entityTypeManager->getDefinition($alias_type->getDerivativeId())) {
-
- $default_bundles = [];
- $default_languages = [];
- foreach ($this->entity->getSelectionConditions() as $condition_id => $condition) {
- if (in_array($condition->getPluginId(), ['entity_bundle:' . $entity_type->id(), 'node_type'])) {
- $default_bundles = $condition->getConfiguration()['bundles'];
- }
- elseif ($condition->getPluginId() == 'language') {
- $default_languages = $condition->getConfiguration()['langcodes'];
- }
- }
-
- if ($entity_type->hasKey('bundle') && $bundles = $this->entityTypeBundleInfo->getBundleInfo($entity_type->id())) {
- $bundle_options = [];
- foreach ($bundles as $id => $info) {
- $bundle_options[$id] = $info['label'];
- }
- $form['pattern_container']['bundles'] = array(
- '#title' => $entity_type->getBundleLabel(),
- '#type' => 'checkboxes',
- '#options' => $bundle_options,
- '#default_value' => $default_bundles,
- '#description' => $this->t('Check to which types this pattern should be applied. Leave empty to allow any.'),
- );
- }
-
- if ($this->languageManager->isMultilingual() && $entity_type->isTranslatable()) {
- $language_options = [];
- foreach ($this->languageManager->getLanguages() as $id => $language) {
- $language_options[$id] = $language->getName();
- }
- $form['pattern_container']['languages'] = array(
- '#title' => $this->t('Languages'),
- '#type' => 'checkboxes',
- '#options' => $language_options,
- '#default_value' => $default_languages,
- '#description' => $this->t('Check to which languages this pattern should be applied. Leave empty to allow any.'),
- );
- }
- }
- }
-
- $form['label'] = array(
- '#type' => 'textfield',
- '#title' => $this->t('Label'),
- '#maxlength' => 255,
- '#default_value' => $this->entity->label(),
- '#required' => TRUE,
- '#description' => $this->t('A short name to help you identify this pattern in the patterns list.'),
- );
-
- $form['id'] = array(
- '#type' => 'machine_name',
- '#title' => $this->t('ID'),
- '#maxlength' => 255,
- '#default_value' => $this->entity->id(),
- '#required' => TRUE,
- '#disabled' => !$this->entity->isNew(),
- '#machine_name' => array(
- 'exists' => 'Drupal\pathauto\Entity\PathautoPattern::load',
- ),
- );
-
- $form['status'] = [
- '#title' => $this->t('Enabled'),
- '#type' => 'checkbox',
- '#default_value' => $this->entity->status(),
- ];
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritDoc}
- */
- public function buildEntity(array $form, FormStateInterface $form_state) {
- /** @var \Drupal\pathauto\PathautoPatternInterface $entity */
- $entity = parent::buildEntity($form, $form_state);
-
- // Will only be used for new patterns.
- $default_weight = 0;
-
- $alias_type = $entity->getAliasType();
- if ($alias_type->getDerivativeId() && $this->entityTypeManager->hasDefinition($alias_type->getDerivativeId())) {
- $entity_type = $alias_type->getDerivativeId();
- // First, remove bundle and language conditions.
- foreach ($entity->getSelectionConditions() as $condition_id => $condition) {
- if (in_array($condition->getPluginId(), ['entity_bundle:' . $entity_type, 'node_type', 'language'])) {
- $entity->removeSelectionCondition($condition_id);
- }
- }
-
- if ($bundles = array_filter((array) $form_state->getValue('bundles'))) {
- $default_weight -= 5;
- $plugin_id = $entity_type == 'node' ? 'node_type' : 'entity_bundle:' . $entity_type;
- $entity->addSelectionCondition(
- [
- 'id' => $plugin_id,
- 'bundles' => $bundles,
- 'negate' => FALSE,
- 'context_mapping' => [
- $entity_type => $entity_type,
- ]
- ]
- );
- }
-
- if ($languages = array_filter((array) $form_state->getValue('languages'))) {
- $default_weight -= 5;
- $language_mapping = $entity_type . ':' . $this->entityTypeManager->getDefinition($entity_type)->getKey('langcode') . ':language';
- $entity->addSelectionCondition(
- [
- 'id' => 'language',
- 'langcodes' => array_combine($languages, $languages),
- 'negate' => FALSE,
- 'context_mapping' => [
- 'language' => $language_mapping,
- ]
- ]
- );
- $entity->addRelationship($language_mapping, t('Language'));
- }
-
- }
-
- if ($entity->isNew()) {
- $entity->setWeight($default_weight);
- }
-
- return $entity;
- }
-
- /**
- * {@inheritDoc}
- */
- public function save(array $form, FormStateInterface $form_state) {
- parent::save($form, $form_state);
- drupal_set_message($this->t('Pattern @label saved.', ['@label' => $this->entity->label()]));
- $form_state->setRedirectUrl($this->entity->toUrl('collection'));
- }
-
- /**
- * Handles switching the type selector.
- */
- public function ajaxReplacePatternForm($form, FormStateInterface $form_state) {
- return $form['pattern_container'];
- }
-
- /**
- * Handles submit call when alias type is selected.
- */
- public function submitSelectType(array $form, FormStateInterface $form_state) {
- $this->entity = $this->buildEntity($form, $form_state);
- $form_state->setRebuild();
- }
-
-}
diff --git a/modules/pathauto/src/Form/PatternEnableForm.php b/modules/pathauto/src/Form/PatternEnableForm.php
deleted file mode 100644
index 253ca31..0000000
--- a/modules/pathauto/src/Form/PatternEnableForm.php
+++ /dev/null
@@ -1,52 +0,0 @@
-t('Are you sure you want to enable the pattern %label?', array('%label' => $this->entity->label()));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return new Url('entity.pathauto_pattern.collection');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return $this->t('Enable');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDescription() {
- return '';
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->entity->enable()->save();
- drupal_set_message($this->t('Enabled pattern %label.', array('%label' => $this->entity->label())));
-
- $form_state->setRedirectUrl($this->getCancelUrl());
- }
-
-}
diff --git a/modules/pathauto/src/MessengerInterface.php b/modules/pathauto/src/MessengerInterface.php
deleted file mode 100644
index e31f48f..0000000
--- a/modules/pathauto/src/MessengerInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-configFactory = $config_factory;
- $this->moduleHandler = $module_handler;
- $this->token = $token;
- $this->aliasCleaner = $alias_cleaner;
- $this->aliasStorageHelper = $alias_storage_helper;
- $this->aliasUniquifier = $alias_uniquifier;
- $this->messenger = $messenger;
- $this->stringTranslation = $string_translation;
- $this->tokenEntityMapper = $token_entity_mappper;
- $this->entityTypeManager = $entity_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function createEntityAlias(EntityInterface $entity, $op) {
- // Retrieve and apply the pattern for this content type.
- $pattern = $this->getPatternByEntity($entity);
- if (empty($pattern)) {
- // No pattern? Do nothing (otherwise we may blow away existing aliases...)
- return NULL;
- }
-
- $source = '/' . $entity->toUrl()->getInternalPath();
- $config = $this->configFactory->get('pathauto.settings');
- $langcode = $entity->language()->getId();
-
- // Core does not handle aliases with language Not Applicable.
- if ($langcode == LanguageInterface::LANGCODE_NOT_APPLICABLE) {
- $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED;
- }
-
- // Build token data.
- $data = [
- $this->tokenEntityMapper->getTokenTypeForEntityType($entity->getEntityTypeId()) => $entity,
- ];
-
- // Allow other modules to alter the pattern.
- $context = array(
- 'module' => $entity->getEntityType()->getProvider(),
- 'op' => $op,
- 'source' => $source,
- 'data' => $data,
- 'bundle' => $entity->bundle(),
- 'language' => &$langcode,
- );
- // @todo Is still hook still useful?
- $this->moduleHandler->alter('pathauto_pattern', $pattern, $context);
-
- // Special handling when updating an item which is already aliased.
- $existing_alias = NULL;
- if ($op == 'update' || $op == 'bulkupdate') {
- if ($existing_alias = $this->aliasStorageHelper->loadBySource($source, $langcode)) {
- switch ($config->get('update_action')) {
- case PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW:
- // If an alias already exists,
- // and the update action is set to do nothing,
- // then gosh-darn it, do nothing.
- return NULL;
- }
- }
- }
-
- // Replace any tokens in the pattern.
- // Uses callback option to clean replacements. No sanitization.
- // Pass empty BubbleableMetadata object to explicitly ignore cacheablity,
- // as the result is never rendered.
- $alias = $this->token->replace($pattern->getPattern(), $data, array(
- 'clear' => TRUE,
- 'callback' => array($this->aliasCleaner, 'cleanTokenValues'),
- 'langcode' => $langcode,
- 'pathauto' => TRUE,
- ), new BubbleableMetadata());
-
- // Check if the token replacement has not actually replaced any values. If
- // that is the case, then stop because we should not generate an alias.
- // @see token_scan()
- $pattern_tokens_removed = preg_replace('/\[[^\s\]:]*:[^\s\]]*\]/', '', $pattern->getPattern());
- if ($alias === $pattern_tokens_removed) {
- return NULL;
- }
-
- $alias = $this->aliasCleaner->cleanAlias($alias);
-
- // Allow other modules to alter the alias.
- $context['source'] = &$source;
- $context['pattern'] = $pattern;
- $this->moduleHandler->alter('pathauto_alias', $alias, $context);
-
- // If we have arrived at an empty string, discontinue.
- if (!Unicode::strlen($alias)) {
- return NULL;
- }
-
- // If the alias already exists, generate a new, hopefully unique, variant.
- $original_alias = $alias;
- $this->aliasUniquifier->uniquify($alias, $source, $langcode);
- if ($original_alias != $alias) {
- // Alert the user why this happened.
- $this->messenger->addMessage($this->t('The automatically generated alias %original_alias conflicted with an existing alias. Alias changed to %alias.', array(
- '%original_alias' => $original_alias,
- '%alias' => $alias,
- )), $op);
- }
-
- // Return the generated alias if requested.
- if ($op == 'return') {
- return $alias;
- }
-
- // Build the new path alias array and send it off to be created.
- $path = array(
- 'source' => $source,
- 'alias' => $alias,
- 'language' => $langcode,
- );
-
- return $this->aliasStorageHelper->save($path, $existing_alias, $op);
- }
-
- /**
- * Loads pathauto patterns for a given entity type ID
- *
- * @param string $entity_type_id
- * An entity type ID.
- *
- * @return \Drupal\pathauto\PathautoPatternInterface[]
- * A list of patterns, sorted by weight.
- */
- protected function getPatternByEntityType($entity_type_id) {
- if (!isset($this->patternsByEntityType[$entity_type_id])) {
- $ids = \Drupal::entityQuery('pathauto_pattern')
- ->condition('type', array_keys(\Drupal::service('plugin.manager.alias_type')
- ->getPluginDefinitionByType($this->tokenEntityMapper->getTokenTypeForEntityType($entity_type_id))))
- ->condition('status', 1)
- ->sort('weight')
- ->execute();
-
- $this->patternsByEntityType[$entity_type_id] = \Drupal::entityTypeManager()
- ->getStorage('pathauto_pattern')
- ->loadMultiple($ids);
- }
-
- return $this->patternsByEntityType[$entity_type_id];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPatternByEntity(EntityInterface $entity) {
- $langcode = $entity->language()->getId();
- if (!isset($this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode])) {
- foreach ($this->getPatternByEntityType($entity->getEntityTypeId()) as $pattern) {
- if ($pattern->applies($entity)) {
- $this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode] = $pattern;
- break;
- }
- }
- // If still not set.
- if (!isset($this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode])) {
- $this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode] = NULL;
- }
- }
- return $this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode];
- }
-
- /**
- * {@inheritdoc}
- */
- public function resetCaches() {
- $this->patterns = [];
- $this->patternsByEntityType = [];
- $this->aliasCleaner->resetCaches();
- }
-
- /**
- * {@inheritdoc}
- */
- public function updateEntityAlias(EntityInterface $entity, $op, array $options = array()) {
- // Skip if the entity does not have the path field.
- if (!($entity instanceof ContentEntityInterface) || !$entity->hasField('path')) {
- return NULL;
- }
-
- // Skip if pathauto processing is disabled.
- if ($entity->path->pathauto != PathautoState::CREATE && empty($options['force'])) {
- return NULL;
- }
-
- // Only act if this is the default revision.
- if ($entity instanceof RevisionableInterface && !$entity->isDefaultRevision()) {
- return NULL;
- }
-
- $options += array('language' => $entity->language()->getId());
- $type = $entity->getEntityTypeId();
-
- // Skip processing if the entity has no pattern.
- if (!$this->getPatternByEntity($entity)) {
- return NULL;
- }
-
- // Deal with taxonomy specific logic.
- // @todo Update and test forum related code.
- if ($type == 'taxonomy_term') {
-
- $config_forum = $this->configFactory->get('forum.settings');
- if ($entity->getVocabularyId() == $config_forum->get('vocabulary')) {
- $type = 'forum';
- }
- }
-
- try {
- $result = $this->createEntityAlias($entity, $op);
- }
- catch (\InvalidArgumentException $e) {
- drupal_set_message($e->getMessage(), 'error');
- return NULL;
- }
-
- // @todo Move this to a method on the pattern plugin.
- if ($type == 'taxonomy_term') {
- foreach ($this->loadTermChildren($entity->id()) as $subterm) {
- $this->updateEntityAlias($subterm, $op, $options);
- }
- }
-
- return $result;
- }
-
- /**
- * Finds all children of a term ID.
- *
- * @param int $tid
- * Term ID to retrieve parents for.
- *
- * @return \Drupal\taxonomy\TermInterface[]
- * An array of term objects that are the children of the term $tid.
- */
- protected function loadTermChildren($tid) {
- return $this->entityTypeManager->getStorage('taxonomy_term')->loadChildren($tid);
- }
-
-}
diff --git a/modules/pathauto/src/PathautoGeneratorInterface.php b/modules/pathauto/src/PathautoGeneratorInterface.php
deleted file mode 100644
index 5880adb..0000000
--- a/modules/pathauto/src/PathautoGeneratorInterface.php
+++ /dev/null
@@ -1,89 +0,0 @@
-setLabel(t('Pathauto state'))
- ->setDescription(t('Whether an automated alias should be created or not.'))
- ->setComputed(TRUE)
- ->setClass('\Drupal\pathauto\PathautoState');
- return $properties;
- }
-
- /**
- * {@inheritdoc}
- */
- public function postSave($update) {
- // Only allow the parent implementation to act if pathauto will not create
- // an alias.
- if ($this->pathauto == PathautoState::SKIP) {
- parent::postSave($update);
- }
- $this->get('pathauto')->persist();
- }
-
- /**
- * {@inheritdoc}
- */
- public function isEmpty() {
- // Make sure that the pathauto state flag does not get lost if just that is
- // changed.
- return !$this->alias && !$this->get('pathauto')->hasValue();
- }
-
- /**
- * {@inheritdoc}
- */
- public function applyDefaultValue($notify = TRUE) {
- parent::applyDefaultValue($notify);
- // Created fields default creating a new alias.
- $this->setValue(array('pathauto' => PathautoState::CREATE), $notify);
- return $this;
- }
-
-}
diff --git a/modules/pathauto/src/PathautoPatternInterface.php b/modules/pathauto/src/PathautoPatternInterface.php
deleted file mode 100644
index 9782f2e..0000000
--- a/modules/pathauto/src/PathautoPatternInterface.php
+++ /dev/null
@@ -1,181 +0,0 @@
-t('Label');
- $header['pattern'] = $this->t('Pattern');
- $header['type'] = $this->t('Pattern type');
- $header['conditions'] = $this->t('Conditions');
- return $header + parent::buildHeader();
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- /* @var \Drupal\pathauto\PathautoPatternInterface $entity */
- $row['label'] = $entity->label();
- $row['patern']['#markup'] = $entity->getPattern();
- $row['type']['#markup'] = $entity->getAliasType()->getLabel();
- $row['conditions']['#theme'] = 'item_list';
- foreach ($entity->getSelectionConditions() as $condition) {
- $row['conditions']['#items'][] = $condition->summary();
- }
- return $row + parent::buildRow($entity);
- }
-
-}
diff --git a/modules/pathauto/src/PathautoState.php b/modules/pathauto/src/PathautoState.php
deleted file mode 100644
index 6415252..0000000
--- a/modules/pathauto/src/PathautoState.php
+++ /dev/null
@@ -1,97 +0,0 @@
-value === NULL) {
- // If no value has been set or loaded yet, try to load a value if this
- // entity has already been saved.
- $this->value = \Drupal::keyValue($this->getCollection())
- ->get($this->parent->getEntity()->id());
- // If it was not yet saved or no value was found, then set the flag to
- // create the alias if there is a matching pattern.
- if ($this->value === NULL) {
- $entity = $this->parent->getEntity();
- $pattern = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
- $this->value = !empty($pattern) ? static::CREATE : static::SKIP;
- }
- }
- return $this->value;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setValue($value, $notify = TRUE) {
- $this->value = $value;
- // Notify the parent of any changes.
- if ($notify && isset($this->parent)) {
- $this->parent->onChange($this->name);
- }
- }
-
- /**
- * Returns TRUE if a value was set.
- */
- public function hasValue() {
- return $this->value !== NULL;
- }
-
- /**
- * Persists the state.
- */
- public function persist() {
- \Drupal::keyValue($this->getCollection())->set(
- $this->parent->getEntity()
- ->id(), $this->value
- );
- }
-
- /**
- * Deletes the stored state.
- */
- public function purge() {
- \Drupal::keyValue($this->getCollection())
- ->delete($this->parent->getEntity()->id());
- }
-
- /**
- * Returns the key value collection that should be used for the given entity.
- * @return string
- */
- protected function getCollection() {
- return 'pathauto_state.' . $this->parent->getEntity()->getEntityTypeId();
- }
-
-}
diff --git a/modules/pathauto/src/PathautoWidget.php b/modules/pathauto/src/PathautoWidget.php
deleted file mode 100644
index 3ca0490..0000000
--- a/modules/pathauto/src/PathautoWidget.php
+++ /dev/null
@@ -1,71 +0,0 @@
-getEntity();
-
- // Taxonomy terms do not have an actual fieldset for path settings.
- // Merge in the defaults.
- // @todo Impossible to do this in widget, use another solution
- /*
- $form['path'] += array(
- '#type' => 'fieldset',
- '#title' => $this->t('URL path settings'),
- '#collapsible' => TRUE,
- '#collapsed' => empty($form['path']['alias']),
- '#group' => 'additional_settings',
- '#attributes' => array(
- 'class' => array('path-form'),
- ),
- '#access' => \Drupal::currentUser()->hasPermission('create url aliases') || \Drupal::currentUser()->hasPermission('administer url aliases'),
- '#weight' => 30,
- '#tree' => TRUE,
- '#element_validate' => array('path_form_element_validate'),
- );*/
-
- $pattern = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
- if (empty($pattern)) {
- return $element;
- }
-
- if (\Drupal::currentUser()->hasPermission('administer pathauto')) {
- $description = $this->t('Uncheck this to create a custom alias below. Configure URL alias patterns. ', ['@admin_link' => Url::fromRoute('entity.pathauto_pattern.collection')->toString()]);
- }
- else {
- $description = $this->t('Uncheck this to create a custom alias below.');
- }
-
- $element['pathauto'] = array(
- '#type' => 'checkbox',
- '#title' => $this->t('Generate automatic URL alias'),
- '#default_value' => $entity->path->pathauto,
- '#description' => $description,
- '#weight' => -1,
- );
-
- // Add JavaScript that will disable the path textfield when the automatic
- // alias checkbox is checked.
- $element['alias']['#states']['disabled']['input[name="path[' . $delta . '][pathauto]"]'] = array('checked' => TRUE);
-
- // Override path.module's vertical tabs summary.
- $element['alias']['#attached']['library'] = ['pathauto/widget'];
-
- return $element;
- }
-
-}
diff --git a/modules/pathauto/src/Plugin/Action/UpdateAction.php b/modules/pathauto/src/Plugin/Action/UpdateAction.php
deleted file mode 100644
index bfe0f48..0000000
--- a/modules/pathauto/src/Plugin/Action/UpdateAction.php
+++ /dev/null
@@ -1,36 +0,0 @@
-path->pathauto = PathautoState::CREATE;
- \Drupal::service('pathauto.generator')->updateEntityAlias($entity, 'bulkupdate', array('message' => TRUE));
- }
-
- /**
- * {@inheritdoc}
- */
- public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
- $result = AccessResult::allowedIfHasPermission($account, 'create url aliases');
- return $return_as_object ? $result : $result->isAllowed();
- }
-
-}
diff --git a/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php b/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
deleted file mode 100644
index cf7b4a2..0000000
--- a/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
+++ /dev/null
@@ -1,94 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->entityFieldManager = $entity_field_manager;
- $this->stringTranslation = $string_translation;
- $this->tokenEntityMapper = $token_entity_mapper;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static(
- $container->get('entity_type.manager'),
- $container->get('entity_field.manager'),
- $container->get('string_translation'),
- $container->get('token.entity_mapper')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // An entity type must have a canonical link template and support fields.
- if ($entity_type->hasLinkTemplate('canonical') && is_subclass_of($entity_type->getClass(), FieldableEntityInterface::class)) {
- $base_fields = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
- if (!isset($base_fields['path'])) {
- // The entity type does not have a path field and is therefore not
- // supported.
- continue;
- }
- $this->derivatives[$entity_type_id] = $base_plugin_definition;
- $this->derivatives[$entity_type_id]['label'] = $entity_type->getLabel();
- $this->derivatives[$entity_type_id]['types'] = [$this->tokenEntityMapper->getTokenTypeForEntityType($entity_type_id)];
- $this->derivatives[$entity_type_id]['provider'] = $entity_type->getProvider();
- $this->derivatives[$entity_type_id]['context'] = [
- $entity_type_id => new ContextDefinition("entity:$entity_type_id", $this->t('@label being aliased', ['@label' => $entity_type->getLabel()]))
- ];
- }
- }
- return $this->derivatives;
- }
-
-}
diff --git a/modules/pathauto/src/Plugin/pathauto/AliasType/Broken.php b/modules/pathauto/src/Plugin/pathauto/AliasType/Broken.php
deleted file mode 100644
index cc48771..0000000
--- a/modules/pathauto/src/Plugin/pathauto/AliasType/Broken.php
+++ /dev/null
@@ -1,24 +0,0 @@
-t('Broken type');
- }
-
-}
diff --git a/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php b/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
deleted file mode 100644
index 121f04b..0000000
--- a/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
+++ /dev/null
@@ -1,342 +0,0 @@
-moduleHandler = $module_handler;
- $this->languageManager = $language_manager;
- $this->entityTypeManager = $entity_type_manager;
- $this->keyValue = $key_value;
- $this->database = $database;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('module_handler'),
- $container->get('language_manager'),
- $container->get('entity_type.manager'),
- $container->get('keyvalue'),
- $container->get('database')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getLabel() {
- $definition = $this->getPluginDefinition();
- // Cast the admin label to a string since it is an object.
- // @see \Drupal\Core\StringTranslation\TranslationWrapper
- return (string) $definition['label'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getTokenTypes() {
- $definition = $this->getPluginDefinition();
- return $definition['types'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function batchUpdate($action, &$context) {
- if (!isset($context['sandbox']['current'])) {
- $context['sandbox']['count'] = 0;
- $context['sandbox']['current'] = 0;
- }
-
- $entity_type = $this->entityTypeManager->getDefinition($this->getEntityTypeId());
- $id_key = $entity_type->getKey('id');
-
- $query = $this->database->select($entity_type->get('base_table'), 'base_table');
- $query->leftJoin('url_alias', 'ua', "CONCAT('" . $this->getSourcePrefix() . "' , base_table.$id_key) = ua.source");
- $query->addField('base_table', $id_key, 'id');
-
- switch ($action) {
- case 'create':
- $query->isNull('ua.source');
- break;
- case 'update':
- $query->isNotNull('ua.source');
- break;
- case 'all':
- // Nothing to do. We want all paths.
- break;
- default:
- // Unknown action. Abort!
- return;
- }
- $query->condition('base_table.' . $id_key, $context['sandbox']['current'], '>');
- $query->orderBy('base_table.' . $id_key);
- $query->addTag('pathauto_bulk_update');
- $query->addMetaData('entity', $this->getEntityTypeId());
-
- // Get the total amount of items to process.
- if (!isset($context['sandbox']['total'])) {
- $context['sandbox']['total'] = $query->countQuery()->execute()->fetchField();
-
- // If there are no entities to update, then stop immediately.
- if (!$context['sandbox']['total']) {
- $context['finished'] = 1;
- return;
- }
- }
-
- $query->range(0, 25);
- $ids = $query->execute()->fetchCol();
-
- $updates = $this->bulkUpdate($ids);
- $context['sandbox']['count'] += count($ids);
- $context['sandbox']['current'] = max($ids);
- $context['results']['updates'] += $updates;
- $context['message'] = $this->t('Updated alias for %label @id.', array('%label' => $entity_type->getLabel(), '@id' => end($ids)));
-
- if ($context['sandbox']['count'] != $context['sandbox']['total']) {
- $context['finished'] = $context['sandbox']['count'] / $context['sandbox']['total'];
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function batchDelete(&$context) {
- if (!isset($context['sandbox']['current'])) {
- $context['sandbox']['count'] = 0;
- $context['sandbox']['current'] = 0;
- }
-
- $entity_type = $this->entityTypeManager->getDefinition($this->getEntityTypeId());
- $id_key = $entity_type->getKey('id');
-
- $query = $this->database->select($entity_type->get('base_table'), 'base_table');
- $query->innerJoin('url_alias', 'ua', "CONCAT('" . $this->getSourcePrefix() . "' , base_table.$id_key) = ua.source");
- $query->addField('base_table', $id_key, 'id');
- $query->addField('ua', 'pid');
- $query->condition('ua.pid', $context['sandbox']['current'], '>');
- $query->orderBy('ua.pid');
- $query->addTag('pathauto_bulk_delete');
- $query->addMetaData('entity', $this->getEntityTypeId());
-
- // Get the total amount of items to process.
- if (!isset($context['sandbox']['total'])) {
- $context['sandbox']['total'] = $query->countQuery()->execute()->fetchField();
-
- // If there are no entities to delete, then stop immediately.
- if (!$context['sandbox']['total']) {
- $context['finished'] = 1;
- return;
- }
- }
-
- $query->range(0, 100);
- $pids_by_id = $query->execute()->fetchAllKeyed();
-
- $this->bulkDelete($pids_by_id);
- $context['sandbox']['count'] += count($pids_by_id);
- $context['sandbox']['current'] = max($pids_by_id);
- $context['results']['deletions'][] = $this->getLabel();
-
- if ($context['sandbox']['count'] != $context['sandbox']['total']) {
- $context['finished'] = $context['sandbox']['count'] / $context['sandbox']['total'];
- }
- }
-
- /**
- * Returns the entity type ID.
- *
- * @return string
- * The entity type ID.
- */
- protected function getEntityTypeId() {
- return $this->getDerivativeId();
- }
-
- /**
- * Update the URL aliases for multiple entities.
- *
- * @param array $ids
- * An array of entity IDs.
- * @param array $options
- * An optional array of additional options.
- *
- * @return int
- * The number of updated URL aliases.
- */
- protected function bulkUpdate(array $ids, array $options = array()) {
- $options += array('message' => FALSE);
- $updates = 0;
-
- $entities = $this->entityTypeManager->getStorage($this->getEntityTypeId())->loadMultiple($ids);
- foreach ($entities as $entity) {
- // Update aliases for the entity's default language and its translations.
- foreach ($entity->getTranslationLanguages() as $langcode => $language) {
- $translated_entity = $entity->getTranslation($langcode);
- $result = \Drupal::service('pathauto.generator')->updateEntityAlias($translated_entity, 'bulkupdate', $options);
- if ($result) {
- $updates++;
- }
- }
- }
-
- if (!empty($options['message'])) {
- drupal_set_message(\Drupal::translation()->formatPlural(count($ids), 'Updated 1 %label URL alias.', 'Updated @count %label URL aliases.'), array('%label' => $this->getLabel()));
- }
-
- return $updates;
- }
-
- /**
- * Deletes the URL aliases for multiple entities.
- *
- * @param int[] $pids_by_id
- * A list of path IDs keyed by entity ID.
- */
- protected function bulkDelete(array $pids_by_id) {
- $collection = 'pathauto_state.' . $this->getEntityTypeId();
- $states = $this->keyValue->get($collection)->getMultiple(array_keys($pids_by_id));
-
- $pids = [];
- foreach ($pids_by_id as $id => $pid) {
- // Only delete aliases that were created by this module.
- if (isset($states[$id]) && $states[$id] == PathautoState::CREATE) {
- $pids[] = $pid;
- }
- }
- \Drupal::service('pathauto.alias_storage_helper')->deleteMultiple($pids);
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- $dependencies = [];
- $dependencies['module'][] = $this->entityTypeManager->getDefinition($this->getEntityTypeId())->getProvider();
- return $dependencies;
- }
-
- /**
- * {@inheritdoc}
- */
- public function applies($object) {
- return $object instanceof FieldableEntityInterface && $object->getEntityTypeId() == $this->getEntityTypeId();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSourcePrefix() {
- if (empty($this->prefix)) {
- $entity_type = $this->entityTypeManager->getDefinition($this->getEntityTypeId());
- $path = $entity_type->getLinkTemplate('canonical');
- $this->prefix = substr($path, 0, strpos($path, '{'));
- }
- return $this->prefix;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setContextValue($name, $value) {
- // Overridden to avoid merging existing cacheability metadata, which is not
- // relevant for alias type plugins.
- $this->context[$name] = new Context($this->getContextDefinition($name), $value);
- return $this;
- }
-
-
-}
diff --git a/modules/pathauto/src/Plugin/pathauto/AliasType/ForumAliasType.php b/modules/pathauto/src/Plugin/pathauto/AliasType/ForumAliasType.php
deleted file mode 100644
index a572593..0000000
--- a/modules/pathauto/src/Plugin/pathauto/AliasType/ForumAliasType.php
+++ /dev/null
@@ -1,106 +0,0 @@
-configFactory = $config_factory;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('module_handler'),
- $container->get('language_manager'),
- $container->get('entity_type.manager'),
- $container->get('keyvalue'),
- $container->get('database'),
- $container->get('config.factory')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEntityTypeId() {
- return 'taxonomy_term';
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSourcePrefix() {
- return '/forum/';
- }
-
- /**
- * {@inheritdoc}
- */
- public function applies($object) {
- if (parent::applies($object)) {
- /** @var \Drupal\taxonomy\TermInterface $object */
- $vid = $this->configFactory->get('forum.settings')->get('vocabulary');
- return $object->getVocabularyId() == $vid;
- }
- return FALSE;
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoBulkUpdateTest.php b/modules/pathauto/src/Tests/PathautoBulkUpdateTest.php
deleted file mode 100644
index 2fa2194..0000000
--- a/modules/pathauto/src/Tests/PathautoBulkUpdateTest.php
+++ /dev/null
@@ -1,156 +0,0 @@
-adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
-
- $this->patterns = array();
- $this->patterns['node'] = $this->createPattern('node', '/content/[node:title]');
- $this->patterns['user'] = $this->createPattern('user', '/users/[user:name]');
- $this->patterns['forum'] = $this->createPattern('forum', '/forums/[term:name]');
- }
-
- function testBulkUpdate() {
- // Create some nodes.
- $this->nodes = array();
- for ($i = 1; $i <= 5; $i++) {
- $node = $this->drupalCreateNode();
- $this->nodes[$node->id()] = $node;
- }
-
- // Clear out all aliases.
- $this->deleteAllAliases();
-
- // Bulk create aliases.
- $edit = array(
- 'update[canonical_entities:node]' => TRUE,
- 'update[canonical_entities:user]' => TRUE,
- 'update[forum]' => TRUE,
- );
- $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-
- // This has generated 8 aliases: 5 nodes, 2 users and 1 forum.
- $this->assertText('Generated 8 URL aliases.');
-
- // Check that aliases have actually been created.
- foreach ($this->nodes as $node) {
- $this->assertEntityAliasExists($node);
- }
- $this->assertEntityAliasExists($this->adminUser);
- // This is the default "General discussion" forum.
- $this->assertAliasExists(['source' => '/taxonomy/term/1']);
-
- // Add a new node.
- $new_node = $this->drupalCreateNode(array('path' => array('alias' => '', 'pathauto' => PathautoState::SKIP)));
-
- // Run the update again which should not run against any nodes.
- $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
- $this->assertText('No new URL aliases to generate.');
- $this->assertNoEntityAliasExists($new_node);
-
- // Make sure existing aliases can be overriden.
- $this->drupalPostForm('admin/config/search/path/settings', ['update_action' => PathautoGeneratorInterface::UPDATE_ACTION_DELETE], t('Save configuration'));
-
- // Patterns did not change, so no aliases should be regenerated.
- $edit['action'] = 'all';
- $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
- $this->assertText('No new URL aliases to generate.');
-
- // Update the node pattern, and leave other patterns alone. Existing nodes should get a new alias,
- // except the node above whose alias is manually set. Other aliases must be left alone.
- $this->patterns['node']->delete();
- $this->patterns['node'] = $this->createPattern('node', '/archive/node-[node:nid]');
-
- $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
- $this->assertText('Generated 5 URL aliases.');
-
- // Prevent existing aliases to be overriden. The bulk generate page should only offer
- // to create an alias for paths which have none.
- $this->drupalPostForm('admin/config/search/path/settings', ['update_action' => PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW], t('Save configuration'));
-
- $this->drupalGet('admin/config/search/path/update_bulk');
- $this->assertFieldByName('action', 'create');
- $this->assertText('Pathauto settings are set to ignore paths which already have a URL alias.');
- $this->assertNoFieldByName('action', 'update');
- $this->assertNoFieldByName('action', 'all');
- }
-
- /**
- * Tests alias generation for nodes that existed before installing Pathauto.
- */
- function testBulkUpdateExistingContent() {
- // Create a node.
- $node = $this->drupalCreateNode();
-
- // Delete its alias and Pathauto metadata.
- \Drupal::service('pathauto.alias_storage_helper')->deleteEntityPathAll($node);
- $node->path->first()->get('pathauto')->purge();
- \Drupal::entityTypeManager()->getStorage('node')->resetCache(array($node->id()));
-
- // Execute bulk generation.
- // Bulk create aliases.
- $edit = array(
- 'update[canonical_entities:node]' => TRUE,
- );
- $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-
- // Verify that the alias was created for the node.
- $this->assertText('Generated 1 URL alias.');
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoEnablingEntityTypesTest.php b/modules/pathauto/src/Tests/PathautoEnablingEntityTypesTest.php
deleted file mode 100644
index c8cc1ff..0000000
--- a/modules/pathauto/src/Tests/PathautoEnablingEntityTypesTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-drupalCreateContentType(array('type' => 'article'));
- $this->addDefaultCommentField('node', 'article');
-
- $permissions = array(
- 'administer pathauto',
- 'administer url aliases',
- 'create url aliases',
- 'administer nodes',
- 'post comments',
- );
- $this->adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
- }
-
- /**
- * A suite of tests to verify if the feature to enable and disable the
- * ability to define alias patterns for a given entity type works. Test with
- * the comment module, as it is not enabled by default.
- */
- function testEnablingEntityTypes() {
- // Verify that the comment entity type is not available when trying to add
- // a new pattern, nor "broken".
- $this->drupalGet('/admin/config/search/path/patterns/add');
- $this->assertEqual(count($this->cssSelect('option[value = "canonical_entities:comment"]:contains(Comment)')), 0);
- $this->assertEqual(count($this->cssSelect('option:contains(Broken)')), 0);
-
- // Enable the entity type and create a pattern for it.
- $this->drupalGet('/admin/config/search/path/settings');
- $edit = [
- 'enabled_entity_types[comment]' => TRUE,
- ];
- $this->drupalPostForm(NULL, $edit, 'Save configuration');
- $this->createPattern('comment', '/comment/[comment:body]');
-
- // Create a node, a comment type and a comment entity.
- $node = $this->drupalCreateNode(['type' => 'article']);
- $this->drupalGet('/node/' . $node->id());
- $edit = [
- 'comment_body[0][value]' => 'test-body',
- ];
- $this->drupalPostForm(NULL, $edit, 'Save');
-
- // Verify that an alias has been generated and that the type can no longer
- // be disabled.
- $this->assertAliasExists(['alias' => '/comment/test-body']);
- $this->drupalGet('/admin/config/search/path/settings');
- $this->assertEqual(count($this->cssSelect('input[name = "enabled_entity_types[comment]"][disabled = "disabled"]')), 1);
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoLocaleTest.php b/modules/pathauto/src/Tests/PathautoLocaleTest.php
deleted file mode 100644
index dd271ef..0000000
--- a/modules/pathauto/src/Tests/PathautoLocaleTest.php
+++ /dev/null
@@ -1,201 +0,0 @@
-drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
- }
-
- /**
- * Test that when an English node is updated, its old English alias is
- * updated and its newer French alias is left intact.
- */
- function testLanguageAliases() {
-
- $this->createPattern('node', '/content/[node:title]');
-
- // Add predefined French language.
- ConfigurableLanguage::createFromLangcode('fr')->save();
-
- $node = array(
- 'title' => 'English node',
- 'langcode' => 'en',
- 'path' => array(array(
- 'alias' => '/english-node',
- 'pathauto' => FALSE,
- )),
- );
- $node = $this->drupalCreateNode($node);
- $english_alias = \Drupal::service('path.alias_storage')->load(array('alias' => '/english-node', 'langcode' => 'en'));
- $this->assertTrue($english_alias, 'Alias created with proper language.');
-
- // Also save a French alias that should not be left alone, even though
- // it is the newer alias.
- $this->saveEntityAlias($node, '/french-node', 'fr');
-
- // Add an alias with the soon-to-be generated alias, causing the upcoming
- // alias update to generate a unique alias with the '-0' suffix.
- $this->saveAlias('/node/invalid', '/content/english-node', Language::LANGCODE_NOT_SPECIFIED);
-
- // Update the node, triggering a change in the English alias.
- $node->path->pathauto = PathautoState::CREATE;
- $node->save();
-
- // Check that the new English alias replaced the old one.
- $this->assertEntityAlias($node, '/content/english-node-0', 'en');
- $this->assertEntityAlias($node, '/french-node', 'fr');
- $this->assertAliasExists(array('pid' => $english_alias['pid'], 'alias' => '/content/english-node-0'));
-
- // Create a new node with the same title as before but without
- // specifying a language.
- $node = $this->drupalCreateNode(array('title' => 'English node', 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED));
-
- // Check that the new node had a unique alias generated with the '-0'
- // suffix.
- $this->assertEntityAlias($node, '/content/english-node-0', LanguageInterface::LANGCODE_NOT_SPECIFIED);
- }
-
- /**
- * Test that patterns work on multilingual content.
- */
- function testLanguagePatterns() {
- $this->drupalLogin($this->rootUser);
-
- // Add French language.
- $edit = array(
- 'predefined_langcode' => 'fr',
- );
- $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-
- $this->enableArticleTranslation();
-
- // Create a pattern for English articles.
- $this->drupalGet('admin/config/search/path/patterns/add');
- $edit = array(
- 'type' => 'canonical_entities:node',
- );
- $this->drupalPostAjaxForm(NULL, $edit, 'type');
- $edit += array(
- 'pattern' => '/the-articles/[node:title]',
- 'label' => 'English articles',
- 'id' => 'english_articles',
- 'bundles[article]' => TRUE,
- 'languages[en]' => TRUE,
- );
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('Pattern English articles saved.');
-
- // Create a pattern for French articles.
- $this->drupalGet('admin/config/search/path/patterns/add');
- $edit = array(
- 'type' => 'canonical_entities:node',
- );
- $this->drupalPostAjaxForm(NULL, $edit, 'type');
- $edit += array(
- 'pattern' => '/les-articles/[node:title]',
- 'label' => 'French articles',
- 'id' => 'french_articles',
- 'bundles[article]' => TRUE,
- 'languages[fr]' => TRUE,
- );
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('Pattern French articles saved.');
-
- // Create a node and its translation. Assert aliases.
- $edit = array(
- 'title[0][value]' => 'English node',
- 'langcode[0][value]' => 'en',
- );
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $english_node = $this->drupalGetNodeByTitle('English node');
- $this->assertAlias('/node/' . $english_node->id(), '/the-articles/english-node', 'en');
-
- $this->drupalGet('node/' . $english_node->id() . '/translations');
- $this->clickLink(t('Add'));
- $edit = array(
- 'title[0][value]' => 'French node',
- );
- $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
- $this->rebuildContainer();
- $english_node = $this->drupalGetNodeByTitle('English node');
- $french_node = $english_node->getTranslation('fr');
- $this->assertAlias('/node/' . $french_node->id(), '/les-articles/french-node', 'fr');
-
- // Bulk delete and Bulk generate patterns. Assert aliases.
- $this->deleteAllAliases();
- // Bulk create aliases.
- $edit = array(
- 'update[canonical_entities:node]' => TRUE,
- );
- $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
- $this->assertText(t('Generated 2 URL aliases.'));
- $this->assertAlias('/node/' . $english_node->id(), '/the-articles/english-node', 'en');
- $this->assertAlias('/node/' . $french_node->id(), '/les-articles/french-node', 'fr');
- }
-
- /**
- * Tests the alias created for a node with language Not Applicable.
- */
- public function testLanguageNotApplicable() {
- $this->drupalLogin($this->rootUser);
- $this->enableArticleTranslation();
-
- // Create a pattern for nodes.
- $pattern = $this->createPattern('node', '/content/[node:title]', -1);
- $pattern->save();
-
- // Create a node with language Not Applicable.
- $node = $this->createNode(['type' => 'article', 'title' => 'Test node', 'langcode' => LanguageInterface::LANGCODE_NOT_APPLICABLE]);
-
- // Check that the generated alias has language Not Specified.
- $alias = \Drupal::service('pathauto.alias_storage_helper')->loadBySource('/node/' . $node->id());
- $this->assertEqual($alias['langcode'], LanguageInterface::LANGCODE_NOT_SPECIFIED, 'PathautoGenerator::createEntityAlias() adjusts the alias langcode from Not Applicable to Not Specified.');
-
- // Check that the alias works.
- $this->drupalGet('content/test-node');
- $this->assertResponse(200);
- }
-
- /**
- * Enables content translation on articles.
- */
- protected function enableArticleTranslation() {
- // Enable content translation on articles.
- $this->drupalGet('admin/config/regional/content-language');
- $edit = array(
- 'entity_types[node]' => TRUE,
- 'settings[node][article][translatable]' => TRUE,
- 'settings[node][article][settings][language][language_alterable]' => TRUE,
- );
- $this->drupalPostForm(NULL, $edit, t('Save configuration'));
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoMassDeleteTest.php b/modules/pathauto/src/Tests/PathautoMassDeleteTest.php
deleted file mode 100644
index 93f4ca3..0000000
--- a/modules/pathauto/src/Tests/PathautoMassDeleteTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
-
- $this->createPattern('node', '/content/[node:title]');
- $this->createPattern('user', '/users/[user:name]');
- $this->createPattern('taxonomy_term', '/[term:vocabulary]/[term:name]');
- }
-
- /**
- * Tests the deletion of all the aliases.
- */
- function testDeleteAll() {
- // 1. Test that deleting all the aliases, of any type, works.
- $this->generateAliases();
- $edit = array(
- 'delete[all_aliases]' => TRUE,
- 'options[keep_custom_aliases]' => FALSE,
- );
- $this->drupalPostForm('admin/config/search/path/delete_bulk', $edit, t('Delete aliases now!'));
- $this->assertText(t('All of your path aliases have been deleted.'));
- $this->assertUrl('admin/config/search/path/delete_bulk');
-
- // Make sure that all of them are actually deleted.
- $aliases = \Drupal::database()->select('url_alias', 'ua')->fields('ua', array())->execute()->fetchAll();
- $this->assertEqual($aliases, array(), "All the aliases have been deleted.");
-
- // 2. Test deleting only specific (entity type) aliases.
- $manager = $this->container->get('plugin.manager.alias_type');
- $pathauto_plugins = array('canonical_entities:node' => 'nodes', 'canonical_entities:taxonomy_term' => 'terms', 'canonical_entities:user' => 'accounts');
- foreach ($pathauto_plugins as $pathauto_plugin => $attribute) {
- $this->generateAliases();
- $edit = array(
- 'delete[plugins][' . $pathauto_plugin . ']' => TRUE,
- 'options[keep_custom_aliases]' => FALSE,
- );
- $this->drupalPostForm('admin/config/search/path/delete_bulk', $edit, t('Delete aliases now!'));
- $alias_type = $manager->createInstance($pathauto_plugin);
- $this->assertRaw(t('All of your %label path aliases have been deleted.', array('%label' => $alias_type->getLabel())));
- // Check that the aliases were actually deleted.
- foreach ($this->{$attribute} as $entity) {
- $this->assertNoEntityAlias($entity);
- }
-
- // Check that the other aliases are not deleted.
- foreach ($pathauto_plugins as $_pathauto_plugin => $_attribute) {
- // Skip the aliases that should be deleted.
- if ($_pathauto_plugin == $pathauto_plugin) {
- continue;
- }
- foreach ($this->{$_attribute} as $entity) {
- $this->assertEntityAliasExists($entity);
- }
- }
- }
-
- // 3. Test deleting automatically generated aliases only.
- $this->generateAliases();
- $edit = array(
- 'delete[all_aliases]' => TRUE,
- 'options[keep_custom_aliases]' => TRUE,
- );
- $this->drupalPostForm('admin/config/search/path/delete_bulk', $edit, t('Delete aliases now!'));
- $this->assertText(t('All of your automatically generated path aliases have been deleted.'));
- $this->assertUrl('admin/config/search/path/delete_bulk');
-
- // Make sure that only custom aliases and aliases with no information about
- // their state still exist.
- $aliases = \Drupal::database()->select('url_alias', 'ua')->fields('ua', ['source'])->execute()->fetchCol();
- $this->assertEqual($aliases, ['/node/101', '/node/104', '/node/105'], 'Custom aliases still exist.');
- }
-
- /**
- * Helper function to generate aliases.
- */
- function generateAliases() {
- // Delete all aliases to avoid duplicated aliases. They will be recreated below.
- $this->deleteAllAliases();
-
- // We generate a bunch of aliases for nodes, users and taxonomy terms. If
- // the entities are already created we just update them, otherwise we create
- // them.
- if (empty($this->nodes)) {
- // Create a large number of nodes (100+) to make sure that the batch code works.
- for ($i = 1; $i <= 105; $i++) {
- // Set the alias of two nodes manually.
- $settings = ($i > 103) ? ['path' => ['alias' => "/custom_alias_$i", 'pathauto' => PathautoState::SKIP]] : [];
- $node = $this->drupalCreateNode($settings);
- $this->nodes[$node->id()] = $node;
- }
- }
- else {
- foreach ($this->nodes as $node) {
- if ($node->id() > 103) {
- // The alias is set manually.
- $node->set('path', ['alias' => '/custom_alias_' . $node->id()]);
- }
- $node->save();
- }
- }
- // Delete information about the state of an alias to make sure that aliases
- // with no such data are left alone by default.
- \Drupal::keyValue('pathauto_state.node')->delete(101);
-
- if (empty($this->accounts)) {
- for ($i = 1; $i <= 5; $i++) {
- $account = $this->drupalCreateUser();
- $this->accounts[$account->id()] = $account;
- }
- }
- else {
- foreach ($this->accounts as $id => $account) {
- $account->save();
- }
- }
-
- if (empty($this->terms)) {
- $vocabulary = $this->addVocabulary(array('name' => 'test vocabulary', 'vid' => 'test_vocabulary'));
- for ($i = 1; $i <= 5; $i++) {
- $term = $this->addTerm($vocabulary);
- $this->terms[$term->id()] = $term;
- }
- }
- else {
- foreach ($this->terms as $term) {
- $term->save();
- }
- }
-
- // Check that we have aliases for the entities.
- foreach (array('nodes', 'accounts', 'terms') as $attribute) {
- foreach ($this->{$attribute} as $entity) {
- $this->assertEntityAliasExists($entity);
- }
- }
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoNodeWebTest.php b/modules/pathauto/src/Tests/PathautoNodeWebTest.php
deleted file mode 100644
index 95f5eb5..0000000
--- a/modules/pathauto/src/Tests/PathautoNodeWebTest.php
+++ /dev/null
@@ -1,292 +0,0 @@
-drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
- $this->drupalCreateContentType(array('type' => 'article'));
-
- // Allow other modules to add additional permissions for the admin user.
- $permissions = array(
- 'administer pathauto',
- 'administer url aliases',
- 'create url aliases',
- 'administer nodes',
- 'bypass node access',
- 'access content overview',
- );
- $this->adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
-
- $this->createPattern('node', '/content/[node:title]');
- }
-
- /**
- * Tests editing nodes with different settings.
- */
- function testNodeEditing() {
- // Ensure that the Pathauto checkbox is checked by default on the node add form.
- $this->drupalGet('node/add/page');
- $this->assertFieldChecked('edit-path-0-pathauto');
-
- // Create a node by saving the node form.
- $title = ' Testing: node title [';
- $automatic_alias = '/content/testing-node-title';
- $this->drupalPostForm(NULL, array('title[0][value]' => $title), t('Save and publish'));
- $node = $this->drupalGetNodeByTitle($title);
-
- // Look for alias generated in the form.
- $this->drupalGet("node/{$node->id()}/edit");
- $this->assertFieldChecked('edit-path-0-pathauto');
- $this->assertFieldByName('path[0][alias]', $automatic_alias, 'Generated alias visible in the path alias field.');
-
- // Check whether the alias actually works.
- $this->drupalGet($automatic_alias);
- $this->assertText($title, 'Node accessible through automatic alias.');
-
- // Manually set the node's alias.
- $manual_alias = '/content/' . $node->id();
- $edit = array(
- 'path[0][pathauto]' => FALSE,
- 'path[0][alias]' => $manual_alias,
- );
- $this->drupalPostForm($node->toUrl('edit-form'), $edit, t('Save and keep published'));
- $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
-
- // Check that the automatic alias checkbox is now unchecked by default.
- $this->drupalGet("node/{$node->id()}/edit");
- $this->assertNoFieldChecked('edit-path-0-pathauto');
- $this->assertFieldByName('path[0][alias]', $manual_alias);
-
- // Submit the node form with the default values.
- $this->drupalPostForm(NULL, array('path[0][pathauto]' => FALSE), t('Save and keep published'));
- $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
-
- // Test that the old (automatic) alias has been deleted and only accessible
- // through the new (manual) alias.
- $this->drupalGet($automatic_alias);
- $this->assertResponse(404, 'Node not accessible through automatic alias.');
- $this->drupalGet($manual_alias);
- $this->assertText($title, 'Node accessible through manual alias.');
-
- // Test that the manual alias is not kept for new nodes when the pathauto
- // checkbox is ticked.
- $title = 'Automatic Title';
- $edit = array(
- 'title[0][value]' => $title,
- 'path[0][pathauto]' => TRUE,
- 'path[0][alias]' => '/should-not-get-created',
- );
- $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
- $this->assertNoAliasExists(array('alias' => 'should-not-get-created'));
- $node = $this->drupalGetNodeByTitle($title);
- $this->assertEntityAlias($node, '/content/automatic-title');
-
- // Remove the pattern for nodes, the pathauto checkbox should not be
- // displayed.
- $ids = \Drupal::entityQuery('pathauto_pattern')
- ->condition('type', 'canonical_entities:node')
- ->execute();
- foreach (PathautoPattern::loadMultiple($ids) as $pattern) {
- $pattern->delete();
- }
-
- $this->drupalGet('node/add/article');
- $this->assertNoFieldById('edit-path-0-pathauto');
- $this->assertFieldByName('path[0][alias]', '');
-
- $edit = array();
- $edit['title'] = 'My test article';
- $this->drupalCreateNode($edit);
- //$this->drupalPostForm(NULL, $edit, t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle($edit['title']);
-
- // Pathauto checkbox should still not exist.
- $this->drupalGet($node->toUrl('edit-form'));
- $this->assertNoFieldById('edit-path-0-pathauto');
- $this->assertFieldByName('path[0][alias]', '');
- $this->assertNoEntityAlias($node);
- }
-
- /**
- * Test node operations.
- */
- function testNodeOperations() {
- $node1 = $this->drupalCreateNode(array('title' => 'node1'));
- $node2 = $this->drupalCreateNode(array('title' => 'node2'));
-
- // Delete all current URL aliases.
- $this->deleteAllAliases();
-
- $this->drupalGet('admin/content');
-
- // Check which of the two nodes is first.
- if (strpos($this->getTextContent(), 'node1') < strpos($this->getTextContent(), 'node2')) {
- $index = 0;
- }
- else {
- $index = 1;
- }
-
- $edit = array(
- 'action' => 'pathauto_update_alias_node',
- 'node_bulk_form[' . $index . ']' => TRUE,
- );
- $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
- $this->assertText('Update URL alias was applied to 1 item.');
-
- $this->assertEntityAlias($node1, '/content/' . $node1->getTitle());
- $this->assertEntityAlias($node2, '/node/' . $node2->id());
- }
-
- /**
- * @todo Merge this with existing node test methods?
- */
- public function testNodeState() {
- $nodeNoAliasUser = $this->drupalCreateUser(array('bypass node access'));
- $nodeAliasUser = $this->drupalCreateUser(array('bypass node access', 'create url aliases'));
-
- $node = $this->drupalCreateNode(array(
- 'title' => 'Node version one',
- 'type' => 'page',
- 'path' => array(
- 'pathauto' => PathautoState::SKIP,
- ),
- ));
-
- $this->assertNoEntityAlias($node);
-
- // Set a manual path alias for the node.
- $node->path->alias = '/test-alias';
- $node->save();
-
- // Ensure that the pathauto field was saved to the database.
- \Drupal::entityTypeManager()->getStorage('node')->resetCache();
- $node = Node::load($node->id());
- $this->assertIdentical($node->path->pathauto, PathautoState::SKIP);
-
- // Ensure that the manual path alias was saved and an automatic alias was not generated.
- $this->assertEntityAlias($node, '/test-alias');
- $this->assertNoEntityAliasExists($node, '/content/node-version-one');
-
- // Save the node as a user who does not have access to path fieldset.
- $this->drupalLogin($nodeNoAliasUser);
- $this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertNoFieldByName('path[0][pathauto]');
-
- $edit = array('title[0][value]' => 'Node version two');
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('Basic page Node version two has been updated.');
-
- $this->assertEntityAlias($node, '/test-alias');
- $this->assertNoEntityAliasExists($node, '/content/node-version-one');
- $this->assertNoEntityAliasExists($node, '/content/node-version-two');
-
- // Load the edit node page and check that the Pathauto checkbox is unchecked.
- $this->drupalLogin($nodeAliasUser);
- $this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertNoFieldChecked('edit-path-0-pathauto');
-
- // Edit the manual alias and save the node.
- $edit = array(
- 'title[0][value]' => 'Node version three',
- 'path[0][alias]' => '/manually-edited-alias',
- );
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('Basic page Node version three has been updated.');
-
- $this->assertEntityAlias($node, '/manually-edited-alias');
- $this->assertNoEntityAliasExists($node, '/test-alias');
- $this->assertNoEntityAliasExists($node, '/content/node-version-one');
- $this->assertNoEntityAliasExists($node, '/content/node-version-two');
- $this->assertNoEntityAliasExists($node, '/content/node-version-three');
-
- // Programatically save the node with an automatic alias.
- \Drupal::entityTypeManager()->getStorage('node')->resetCache();
- $node = Node::load($node->id());
- $node->path->pathauto = PathautoState::CREATE;
- $node->save();
-
- // Ensure that the pathauto field was saved to the database.
- \Drupal::entityTypeManager()->getStorage('node')->resetCache();
- $node = Node::load($node->id());
- $this->assertIdentical($node->path->pathauto, PathautoState::CREATE);
-
- $this->assertEntityAlias($node, '/content/node-version-three');
- $this->assertNoEntityAliasExists($node, '/manually-edited-alias');
- $this->assertNoEntityAliasExists($node, '/test-alias');
- $this->assertNoEntityAliasExists($node, '/content/node-version-one');
- $this->assertNoEntityAliasExists($node, '/content/node-version-two');
-
- $node->delete();
- $this->assertNull(\Drupal::keyValue('pathauto_state.node')->get($node->id()), 'Pathauto state was deleted');
- }
-
-
- /**
- * Tests that nodes without a Pathauto pattern can set custom aliases.
- */
- public function testCustomAliasWithoutPattern() {
- // First, delete all patterns to be sure that there will be no match.
- $entity_ids = \Drupal::entityQuery('pathauto_pattern')->execute();
- $entities = PathautoPattern::loadMultiple($entity_ids);
- foreach ($entities as $entity) {
- $entity->delete();
- }
-
- // Next, create a node with a custom alias.
- $edit = [
- 'title[0][value]' => 'Sample article',
- 'path[0][alias]' => '/sample-article',
- ];
- $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
- $this->assertText(t('article Sample article has been created.'));
-
- // Test the alias.
- $this->assertAliasExists(array('alias' => '/sample-article'));
- $this->drupalGet('sample-article');
- $this->assertResponse(200, 'A node without a pattern can have a custom alias.');
-
- // Now create a node through the API.
- $node = Node::create(['type' => 'article', 'title' => 'Sample article API', 'path' => ['alias' => '/sample-article-api']]);
- $node->save();
-
- // Test the alias.
- $this->assertAliasExists(['alias' => '/sample-article-api']);
- $this->drupalGet('sample-article-api');
- $this->assertResponse(200);
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoSettingsFormWebTest.php b/modules/pathauto/src/Tests/PathautoSettingsFormWebTest.php
deleted file mode 100644
index 9a4a690..0000000
--- a/modules/pathauto/src/Tests/PathautoSettingsFormWebTest.php
+++ /dev/null
@@ -1,240 +0,0 @@
- FALSE,
- 'separator' => '-',
- 'case' => '1',
- 'max_length' => '100',
- 'max_component_length' => '100',
- 'update_action' => '2',
- 'transliterate' => '1',
- 'reduce_ascii' => FALSE,
- 'ignore_words' => 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with',
- );
-
- /**
- * Punctuation form items with default values.
- *
- * @var array
- */
- protected $defaultPunctuations = array(
- 'punctuation[double_quotes]' => '0',
- 'punctuation[quotes]' => '0',
- 'punctuation[backtick]' => '0',
- 'punctuation[comma]' => '0',
- 'punctuation[period]' => '0',
- 'punctuation[hyphen]' => '1',
- 'punctuation[underscore]' => '0',
- 'punctuation[colon]' => '0',
- 'punctuation[semicolon]' => '0',
- 'punctuation[pipe]' => '0',
- 'punctuation[left_curly]' => '0',
- 'punctuation[left_square]' => '0',
- 'punctuation[right_curly]' => '0',
- 'punctuation[right_square]' => '0',
- 'punctuation[plus]' => '0',
- 'punctuation[equal]' => '0',
- 'punctuation[asterisk]' => '0',
- 'punctuation[ampersand]' => '0',
- 'punctuation[percent]' => '0',
- 'punctuation[caret]' => '0',
- 'punctuation[dollar]' => '0',
- 'punctuation[hash]' => '0',
- 'punctuation[exclamation]' => '0',
- 'punctuation[tilde]' => '0',
- 'punctuation[left_parenthesis]' => '0',
- 'punctuation[right_parenthesis]' => '0',
- 'punctuation[question_mark]' => '0',
- 'punctuation[less_than]' => '0',
- 'punctuation[greater_than]' => '0',
- 'punctuation[slash]' => '0',
- 'punctuation[back_slash]' => '0',
- );
-
- /**
- * {inheritdoc}
- */
- function setUp() {
- parent::setUp();
-
- $this->drupalCreateContentType(array('type' => 'article'));
-
- $permissions = array(
- 'administer pathauto',
- 'notify of path changes',
- 'administer url aliases',
- 'create url aliases',
- 'administer nodes',
- 'bypass node access',
- );
- $this->adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
- $this->createPattern('node', '/content/[node:title]');
- }
-
- /**
- * Test if the default values are shown correctly in the form.
- */
- function testDefaultFormValues() {
- $this->drupalGet('/admin/config/search/path/settings');
- $this->assertNoFieldChecked('edit-verbose');
- $this->assertField('edit-separator', $this->defaultFormValues['separator']);
- $this->assertFieldChecked('edit-case');
- $this->assertField('edit-max-length', $this->defaultFormValues['max_length']);
- $this->assertField('edit-max-component-length', $this->defaultFormValues['max_component_length']);
- $this->assertFieldChecked('edit-update-action-2');
- $this->assertFieldChecked('edit-transliterate');
- $this->assertNoFieldChecked('edit-reduce-ascii');
- $this->assertField('edit-ignore-words', $this->defaultFormValues['ignore_words']);
- }
-
- /**
- * Test the verbose option.
- */
- function testVerboseOption() {
- $edit = array('verbose' => '1');
- $this->drupalPostForm('/admin/config/search/path/settings', $edit, t('Save configuration'));
- $this->assertText(t('The configuration options have been saved.'));
- $this->assertFieldChecked('edit-verbose');
-
- $title = 'Verbose settings test';
- $this->drupalGet('/node/add/article');
- $this->assertFieldChecked('edit-path-0-pathauto');
- $this->drupalPostForm(NULL, array('title[0][value]' => $title), t('Save and publish'));
- $this->assertText('Created new alias /content/verbose-settings-test for');
-
- $node = $this->drupalGetNodeByTitle($title);
- $this->drupalPostForm('/node/' . $node->id() . '/edit', array('title[0][value]' => 'Updated title'), t('Save and keep published'));
- $this->assertText('Created new alias /content/updated-title for');
- $this->assertText('replacing /content/verbose-settings-test.');
- }
-
- /**
- * Tests generating aliases with different settings.
- */
- function testSettingsForm() {
- // Ensure the separator settings apply correctly.
- $this->checkAlias('My awesome content', '/content/my.awesome.content', array('separator' => '.'));
-
- // Ensure the character case setting works correctly.
- // Leave case the same as source token values.
- $this->checkAlias('My awesome Content', '/content/My-awesome-Content', array('case' => FALSE));
- $this->checkAlias('Change Lower', '/content/change-lower', array('case' => '1'));
-
- // Ensure the maximum alias length is working.
- $this->checkAlias('My awesome Content', '/content/my-awesome', array('max_length' => '23'));
-
- // Ensure the maximum component length is working.
- $this->checkAlias('My awesome Content', '/content/my', array('max_component_length' => '2'));
-
- // Ensure transliteration option is working.
- $this->checkAlias('è é àl ö äl ü', '/content/e-e-al-o-al-u', array('transliterate' => '1'));
- $this->checkAlias('è é àl äl ö ü', '/content/è-é-àl-äl-ö-ü', array('transliterate' => FALSE));
-
- $ignore_words = 'a, new, very, should';
- $this->checkAlias('a very new alias to test', '/content/alias-to-test', array('ignore_words' => $ignore_words));
- }
-
- /**
- * Test the punctuation setting form items.
- */
- function testPunctuationSettings() {
- // Test the replacement of punctuations.
- $settings = [];
- foreach ($this->defaultPunctuations as $key => $punctuation) {
- $settings[$key] = PathautoGeneratorInterface::PUNCTUATION_REPLACE;
- }
-
- $title = 'aa"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
- $alias = '/content/aa-b-c-d-e-f-g-h-i-j-k-l-m-n-o-p-q-r-s-t-u-v-w-x-y-z-1-2-3';
- $this->checkAlias($title, $alias, $settings);
-
- // Test the removal of punctuations.
- $settings = [];
- foreach ($this->defaultPunctuations as $key => $punctuation) {
- $settings[$key] = PathautoGeneratorInterface::PUNCTUATION_REMOVE;
- }
-
- $title = 'a"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
- $alias = '/content/abcdefghijklmnopqrstuvwxyz123';
- $this->checkAlias($title, $alias, $settings);
-
- // Keep all punctuations in alias.
- $settings = [];
- foreach ($this->defaultPunctuations as $key => $punctuation) {
- $settings[$key] = PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING;
- }
-
- $title = 'al"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
- $alias = '/content/al"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
- $this->checkAlias($title, $alias, $settings);
- }
-
- /**
- * Helper method to check the an aliases.
- *
- * @param string $title
- * The node title to build the aliases from.
- * @param string $alias
- * The expected alias.
- * @param array $settings
- * The form values the alias should be generated with.
- */
- protected function checkAlias($title, $alias, $settings = array()) {
- // Submit the settings form.
- $edit = array_merge($this->defaultFormValues + $this->defaultPunctuations, $settings);
- $this->drupalPostForm('/admin/config/search/path/settings', $edit, t('Save configuration'));
- $this->assertText(t('The configuration options have been saved.'));
-
- // If we do not clear the caches here, AliasCleaner will use its
- // cleanStringCache instance variable. Due to that the creation of aliases
- // with $this->createNode() will only work correctly on the first call.
- \Drupal::service('pathauto.generator')->resetCaches();
-
- // Create a node and check if the settings applied.
- $node = $this->createNode(
- array(
- 'title' => $title,
- 'type' => 'article',
- )
- );
-
- $this->drupalGet($alias);
- $this->assertResponse(200);
- $this->assertEntityAlias($node, $alias);
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoTaxonomyWebTest.php b/modules/pathauto/src/Tests/PathautoTaxonomyWebTest.php
deleted file mode 100644
index e1a7e88..0000000
--- a/modules/pathauto/src/Tests/PathautoTaxonomyWebTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
-
- $this->createPattern('taxonomy_term', '/[term:vocabulary]/[term:name]');
- }
-
-
- /**
- * Basic functional testing of Pathauto with taxonomy terms.
- */
- function testTermEditing() {
- $this->drupalGet('admin/structure');
- $this->drupalGet('admin/structure/taxonomy');
-
- // Add vocabulary "tags".
- $vocabulary = $this->addVocabulary(array('name' => 'tags', 'vid' => 'tags'));
-
- // Create term for testing.
- $name = 'Testing: term name [';
- $automatic_alias = '/tags/testing-term-name';
- $this->drupalPostForm('admin/structure/taxonomy/manage/tags/add', array('name[0][value]' => $name), 'Save');
- $name = trim($name);
- $this->assertText("Created new term $name.");
- $term = $this->drupalGetTermByName($name);
-
- // Look for alias generated in the form.
- $this->drupalGet("taxonomy/term/{$term->id()}/edit");
- $this->assertFieldChecked('edit-path-0-pathauto');
- $this->assertFieldByName('path[0][alias]', $automatic_alias, 'Generated alias visible in the path alias field.');
-
- // Check whether the alias actually works.
- $this->drupalGet($automatic_alias);
- $this->assertText($name, 'Term accessible through automatic alias.');
-
- // Manually set the term's alias.
- $manual_alias = '/tags/' . $term->id();
- $edit = array(
- 'path[0][pathauto]' => FALSE,
- 'path[0][alias]' => $manual_alias,
- );
- $this->drupalPostForm("taxonomy/term/{$term->id()}/edit", $edit, t('Save'));
- $this->assertText("Updated term $name.");
-
- // Check that the automatic alias checkbox is now unchecked by default.
- $this->drupalGet("taxonomy/term/{$term->id()}/edit");
- $this->assertNoFieldChecked('edit-path-0-pathauto');
- $this->assertFieldByName('path[0][alias]', $manual_alias);
-
- // Submit the term form with the default values.
- $this->drupalPostForm(NULL, array('path[0][pathauto]' => FALSE), t('Save'));
- $this->assertText("Updated term $name.");
-
- // Test that the old (automatic) alias has been deleted and only accessible
- // through the new (manual) alias.
- $this->drupalGet($automatic_alias);
- $this->assertResponse(404, 'Term not accessible through automatic alias.');
- $this->drupalGet($manual_alias);
- $this->assertText($name, 'Term accessible through manual alias.');
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoTestHelperTrait.php b/modules/pathauto/src/Tests/PathautoTestHelperTrait.php
deleted file mode 100644
index 5fc6b40..0000000
--- a/modules/pathauto/src/Tests/PathautoTestHelperTrait.php
+++ /dev/null
@@ -1,190 +0,0 @@
- Unicode::strtolower($this->randomMachineName()),
- 'type' => $type,
- 'pattern' => $pattern,
- 'weight' => $weight,
- ]);
- $pattern->save();
- return $pattern;
- }
-
- /**
- * Add a bundle condition to a pathauto pattern.
- *
- * @param \Drupal\pathauto\PathautoPatternInterface $pattern
- * The pattern.
- * @param string $entity_type
- * The entity type ID.
- * @param string $bundle
- * The bundle
- */
- protected function addBundleCondition(PathautoPatternInterface $pattern, $entity_type, $bundle) {
- $plugin_id = $entity_type == 'node' ? 'node_type' : 'entity_bundle:' . $entity_type;
-
- $pattern->addSelectionCondition(
- [
- 'id' => $plugin_id,
- 'bundles' => [
- $bundle => $bundle,
- ],
- 'negate' => FALSE,
- 'context_mapping' => [
- $entity_type => $entity_type,
- ]
- ]
- );
- }
-
- public function assertToken($type, $object, $token, $expected) {
- $bubbleable_metadata = new BubbleableMetadata();
- $tokens = \Drupal::token()->generate($type, array($token => $token), array($type => $object), [], $bubbleable_metadata);
- $tokens += array($token => '');
- $this->assertIdentical($tokens[$token], $expected, t("Token value for [@type:@token] was '@actual', expected value '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $tokens[$token], '@expected' => $expected)));
- }
-
- public function saveAlias($source, $alias, $langcode = Language::LANGCODE_NOT_SPECIFIED) {
- \Drupal::service('path.alias_storage')->delete(array('source' => $source, 'language', 'langcode' => $langcode));
- return \Drupal::service('path.alias_storage')->save($source, $alias, $langcode);
- }
-
- public function saveEntityAlias(EntityInterface $entity, $alias, $langcode = NULL) {
- // By default, use the entity language.
- if (!$langcode) {
- $langcode = $entity->language()->getId();
- }
- return $this->saveAlias('/' . $entity->toUrl()->getInternalPath(), $alias, $langcode);
- }
-
- public function assertEntityAlias(EntityInterface $entity, $expected_alias, $langcode = NULL) {
- // By default, use the entity language.
- if (!$langcode) {
- $langcode = $entity->language()->getId();
- }
- $this->assertAlias('/' . $entity->toUrl()->getInternalPath(), $expected_alias, $langcode);
- }
-
- public function assertEntityAliasExists(EntityInterface $entity) {
- return $this->assertAliasExists(array('source' => '/' . $entity->toUrl()->getInternalPath()));
- }
-
- public function assertNoEntityAlias(EntityInterface $entity, $langcode = NULL) {
- // By default, use the entity language.
- if (!$langcode) {
- $langcode = $entity->language()->getId();
- }
- $this->assertEntityAlias($entity, '/' . $entity->toUrl()->getInternalPath(), $langcode);
- }
-
- public function assertNoEntityAliasExists(EntityInterface $entity, $alias = NULL) {
- $path = array('source' => '/' . $entity->toUrl()->getInternalPath());
- if (!empty($alias)) {
- $path['alias'] = $alias;
- }
- $this->assertNoAliasExists($path);
- }
-
- public function assertAlias($source, $expected_alias, $langcode = Language::LANGCODE_NOT_SPECIFIED) {
- \Drupal::service('path.alias_manager')->cacheClear($source);
- $this->assertEqual($expected_alias, \Drupal::service('path.alias_manager')->getAliasByPath($source, $langcode), t("Alias for %source with language '@language' is correct.",
- array('%source' => $source, '@language' => $langcode)));
- }
-
- public function assertAliasExists($conditions) {
- $path = \Drupal::service('path.alias_storage')->load($conditions);
- $this->assertTrue($path, t('Alias with conditions @conditions found.', array('@conditions' => var_export($conditions, TRUE))));
- return $path;
- }
-
- public function assertNoAliasExists($conditions) {
- $alias = \Drupal::service('path.alias_storage')->load($conditions);
- $this->assertFalse($alias, t('Alias with conditions @conditions not found.', array('@conditions' => var_export($conditions, TRUE))));
- }
-
- public function deleteAllAliases() {
- \Drupal::database()->delete('url_alias')->execute();
- \Drupal::service('path.alias_manager')->cacheClear();
- }
-
- /**
- * @param array $values
- * @return \Drupal\taxonomy\VocabularyInterface
- */
- public function addVocabulary(array $values = array()) {
- $name = Unicode::strtolower($this->randomMachineName(5));
- $values += array(
- 'name' => $name,
- 'vid' => $name,
- );
- $vocabulary = Vocabulary::create($values);
- $vocabulary->save();
-
- return $vocabulary;
- }
-
- public function addTerm(VocabularyInterface $vocabulary, array $values = array()) {
- $values += array(
- 'name' => Unicode::strtolower($this->randomMachineName(5)),
- 'vid' => $vocabulary->id(),
- );
-
- $term = Term::create($values);
- $term->save();
- return $term;
- }
-
- public function assertEntityPattern($entity_type, $bundle, $langcode = Language::LANGCODE_NOT_SPECIFIED, $expected) {
-
- $values = [
- 'langcode' => $langcode,
- \Drupal::entityTypeManager()->getDefinition($entity_type)->getKey('bundle') => $bundle,
- ];
- $entity = \Drupal::entityTypeManager()->getStorage($entity_type)->create($values);
-
- $pattern = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
- $this->assertIdentical($expected, $pattern->getPattern());
- }
-
- public function drupalGetTermByName($name, $reset = FALSE) {
- if ($reset) {
- // @todo - implement cache reset.
- }
- $terms = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadByProperties(array('name' => $name));
- return !empty($terms) ? reset($terms) : FALSE;
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoUiTest.php b/modules/pathauto/src/Tests/PathautoUiTest.php
deleted file mode 100644
index a0bb436..0000000
--- a/modules/pathauto/src/Tests/PathautoUiTest.php
+++ /dev/null
@@ -1,189 +0,0 @@
-drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
- $this->drupalCreateContentType(array('type' => 'article'));
-
- // Allow other modules to add additional permissions for the admin user.
- $permissions = array(
- 'administer pathauto',
- 'administer url aliases',
- 'create url aliases',
- 'administer nodes',
- 'bypass node access',
- 'access content overview',
- );
- $this->adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
- }
-
- function testSettingsValidation() {
- $edit = array();
- $edit['max_length'] = 'abc';
- $edit['max_component_length'] = 'abc';
- $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
- /*$this->assertText('The field Maximum alias length is not a valid number.');
- $this->assertText('The field Maximum component length is not a valid number.');*/
- $this->assertNoText('The configuration options have been saved.');
-
- $edit['max_length'] = '0';
- $edit['max_component_length'] = '0';
- $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
- /*$this->assertText('The field Maximum alias length cannot be less than 1.');
- $this->assertText('The field Maximum component length cannot be less than 1.');*/
- $this->assertNoText('The configuration options have been saved.');
-
- $edit['max_length'] = '999';
- $edit['max_component_length'] = '999';
- $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
- /*$this->assertText('The field Maximum alias length cannot be greater than 255.');
- $this->assertText('The field Maximum component length cannot be greater than 255.');*/
- $this->assertNoText('The configuration options have been saved.');
-
- $edit['max_length'] = '50';
- $edit['max_component_length'] = '50';
- $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
- $this->assertText('The configuration options have been saved.');
- }
-
- function testPatternsWorkflow() {
- // Try to save an empty pattern, should not be allowed.
- $this->drupalGet('admin/config/search/path/patterns/add');
- $edit = array(
- 'type' => 'canonical_entities:node',
- );
- $this->drupalPostAjaxForm(NULL, $edit, 'type');
- $edit += array(
- 'bundles[page]' => TRUE,
- 'label' => 'Page pattern',
- 'id' => 'page_pattern',
- );
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('Path pattern field is required.');
- $this->assertNoText('The configuration options have been saved.');
-
- // Try to save an invalid pattern.
- $edit += array(
- 'pattern' => '[node:title]/[user:name]/[term:name]',
- );
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('Path pattern is using the following invalid tokens: [user:name], [term:name].');
- $this->assertNoText('The configuration options have been saved.');
-
- $edit['pattern'] = '#[node:title]';
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('The Path pattern is using the following invalid characters: #.');
- $this->assertNoText('The configuration options have been saved.');
-
- // Checking whitespace ending of the string.
- $edit['pattern'] = '[node:title] ';
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('The Path pattern doesn\'t allow the patterns ending with whitespace.');
- $this->assertNoText('The configuration options have been saved.');
-
- // Fix the pattern, then check that it gets saved successfully.
- $edit['pattern'] = '[node:title]';
- $this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertText('Pattern Page pattern saved.');
-
- \Drupal::service('pathauto.generator')->resetCaches();
-
- // Create a node with pattern enabled and check if the pattern applies.
- $title = 'Page Pattern enabled';
- $alias = '/page-pattern-enabled';
- $node = $this->createNode(['title' => $title, 'type' => 'page']);
- $this->drupalGet($alias);
- $this->assertResponse(200);
- $this->assertEntityAlias($node, $alias);
-
- // Edit workflow, set a new label and weight for the pattern.
- $this->drupalPostForm('/admin/config/search/path/patterns', ['entities[page_pattern][weight]' => '4'], t('Save'));
- $this->clickLink(t('Edit'));
- $this->assertUrl('/admin/config/search/path/patterns/page_pattern');
- $this->assertFieldByName('pattern', '[node:title]');
- $this->assertFieldByName('label', 'Page pattern');
- $this->assertFieldChecked('edit-status');
- $this->assertLink(t('Delete'));
-
- $edit = array('label' => 'Test');
- $this->drupalPostForm('/admin/config/search/path/patterns/page_pattern', $edit, t('Save'));
- $this->assertText('Pattern Test saved.');
- // Check that the pattern weight did not change.
- $this->assertOptionSelected('edit-entities-page-pattern-weight', '4');
-
- // Disable workflow.
- $this->drupalGet('/admin/config/search/path/patterns');
- $this->assertNoLink(t('Enable'));
- $this->clickLink(t('Disable'));
- $this->assertUrl('/admin/config/search/path/patterns/page_pattern/disable');
- $this->drupalPostForm(NULL, [], t('Disable'));
- $this->assertText('Disabled pattern Test.');
-
- // Load the pattern from storage and check if its disabled.
- $pattern = PathautoPattern::load('page_pattern');
- $this->assertFalse($pattern->status());
-
- \Drupal::service('pathauto.generator')->resetCaches();
-
- // Create a node with pattern disabled and check that we have no new alias.
- $title = 'Page Pattern disabled';
- $node = $this->createNode(['title' => $title, 'type' => 'page']);
- $this->assertNoEntityAlias($node);
-
- // Enable workflow.
- $this->drupalGet('/admin/config/search/path/patterns');
- $this->assertNoLink(t('Disable'));
- $this->clickLink(t('Enable'));
- $this->assertUrl('/admin/config/search/path/patterns/page_pattern/enable');
- $this->drupalPostForm(NULL, [], t('Enable'));
- $this->assertText('Enabled pattern Test.');
-
- // Reload pattern from storage and check if its enabled.
- $pattern = PathautoPattern::load('page_pattern');
- $this->assertTrue($pattern->status());
-
- // Delete workflow.
- $this->drupalGet('/admin/config/search/path/patterns');
- $this->clickLink(t('Delete'));
- $this->assertUrl('/admin/config/search/path/patterns/page_pattern/delete');
- $this->assertText(t('This action cannot be undone.'));
- $this->drupalPostForm(NULL, [], t('Delete'));
- $this->assertText('The pathauto pattern Test has been deleted.');
-
- $this->assertFalse(PathautoPattern::load('page_pattern'));
- }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoUserWebTest.php b/modules/pathauto/src/Tests/PathautoUserWebTest.php
deleted file mode 100644
index 54832df..0000000
--- a/modules/pathauto/src/Tests/PathautoUserWebTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-adminUser = $this->drupalCreateUser($permissions);
- $this->drupalLogin($this->adminUser);
-
- $this->createPattern('user', '/users/[user:name]');
- }
-
-
- /**
- * Basic functional testing of Pathauto with users.
- */
- function testUserEditing() {
- // There should be no Pathauto checkbox on user forms.
- $this->drupalGet('user/' . $this->adminUser->id() . '/edit');
- $this->assertNoFieldById('path[0][pathauto]');
- }
-
- /**
- * Test user operations.
- */
- function testUserOperations() {
- $account = $this->drupalCreateUser();
-
- // Delete all current URL aliases.
- $this->deleteAllAliases();
-
- // Find the position of just created account in the user_admin_people view.
- $view = Views::getView('user_admin_people');
- $view->initDisplay();
- $view->preview('page_1');
-
-
- foreach ($view->result as $key => $row) {
- if ($view->field['name']->getValue($row) == $account->getUsername()) {
- break;
- }
- }
-
- $edit = array(
- 'action' => 'pathauto_update_alias_user',
- "user_bulk_form[$key]" => TRUE,
- );
- $this->drupalPostForm('admin/people', $edit, t('Apply to selected items'));
- $this->assertText('Update URL alias was applied to 1 item.');
-
- $this->assertEntityAlias($account, '/users/' . Unicode::strtolower($account->getUsername()));
- $this->assertEntityAlias($this->adminUser, '/user/' . $this->adminUser->id());
- }
-
-}
diff --git a/modules/pathauto/src/VerboseMessenger.php b/modules/pathauto/src/VerboseMessenger.php
deleted file mode 100644
index bc60b5c..0000000
--- a/modules/pathauto/src/VerboseMessenger.php
+++ /dev/null
@@ -1,63 +0,0 @@
-configFactory = $config_factory;
- $this->account = $account;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addMessage($message, $op = NULL) {
-
- if (!isset($this->isVerbose)) {
- $config = $this->configFactory->get('pathauto.settings');
- $this->isVerbose = $config->get('verbose') && $this->account->hasPermission('notify of path changes');
- }
-
- if (!$this->isVerbose || (isset($op) && in_array($op, array('bulkupdate', 'return')))) {
- return FALSE;
- }
-
- if ($message) {
- drupal_set_message($message);
- }
-
- return TRUE;
- }
-
-}
diff --git a/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml b/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
deleted file mode 100644
index 249516f..0000000
--- a/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
+++ /dev/null
@@ -1,231 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - node
- - taxonomy
- - user
-id: articles
-label: articles
-module: pathauto_views_test
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-core: 8.x
-display:
- default:
- display_plugin: default
- id: default
- display_title: Master
- position: 0
- display_options:
- access:
- type: perm
- options:
- perm: 'access content'
- cache:
- type: tag
- options: { }
- query:
- type: views_query
- options:
- disable_sql_rewrite: false
- distinct: false
- replica: false
- query_comment: ''
- query_tags: { }
- exposed_form:
- type: basic
- options:
- submit_button: Apply
- reset_button: false
- reset_button_label: Reset
- exposed_sorts_label: 'Sort by'
- expose_sort_order: true
- sort_asc_label: Asc
- sort_desc_label: Desc
- pager:
- type: full
- options:
- items_per_page: 10
- offset: 0
- id: 0
- total_pages: null
- expose:
- items_per_page: false
- items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 25, 50'
- items_per_page_options_all: false
- items_per_page_options_all_label: '- All -'
- offset: false
- offset_label: Offset
- tags:
- previous: '‹ Previous'
- next: 'Next ›'
- first: '« First'
- last: 'Last »'
- quantity: 9
- style:
- type: default
- row:
- type: 'entity:node'
- options:
- view_mode: teaser
- fields:
- title:
- id: title
- table: node_field_data
- field: title
- entity_type: node
- entity_field: title
- label: ''
- alter:
- alter_text: false
- make_link: false
- absolute: false
- trim: false
- word_boundary: false
- ellipsis: false
- strip_tags: false
- html: false
- hide_empty: false
- empty_zero: false
- settings:
- link_to_entity: true
- plugin_id: field
- relationship: none
- group_type: group
- admin_label: ''
- exclude: false
- element_type: ''
- element_class: ''
- element_label_type: ''
- element_label_class: ''
- element_label_colon: true
- element_wrapper_type: ''
- element_wrapper_class: ''
- element_default_classes: true
- empty: ''
- hide_alter_empty: true
- click_sort_column: value
- type: string
- group_column: value
- group_columns: { }
- group_rows: true
- delta_limit: 0
- delta_offset: 0
- delta_reversed: false
- delta_first_last: false
- multi_type: separator
- separator: ', '
- field_api_classes: false
- filters:
- status:
- value: '1'
- table: node_field_data
- field: status
- plugin_id: boolean
- entity_type: node
- entity_field: status
- id: status
- expose:
- operator: ''
- group: 1
- type:
- id: type
- table: node_field_data
- field: type
- value:
- article: article
- entity_type: node
- entity_field: type
- plugin_id: bundle
- sorts:
- created:
- id: created
- table: node_field_data
- field: created
- order: DESC
- entity_type: node
- entity_field: created
- plugin_id: date
- relationship: none
- group_type: group
- admin_label: ''
- exposed: false
- expose:
- label: ''
- granularity: second
- title: articles
- header: { }
- footer: { }
- empty: { }
- relationships: { }
- arguments:
- tid:
- id: tid
- table: taxonomy_index
- field: tid
- relationship: none
- group_type: group
- admin_label: ''
- default_action: ignore
- exception:
- value: all
- title_enable: false
- title: All
- title_enable: false
- title: ''
- default_argument_type: fixed
- default_argument_options:
- argument: ''
- default_argument_skip_url: false
- summary_options:
- base_path: ''
- count: true
- items_per_page: 25
- override: false
- summary:
- sort_order: asc
- number_of_records: 0
- format: default_summary
- specify_validation: false
- validate:
- type: none
- fail: 'not found'
- validate_options: { }
- break_phrase: false
- add_table: false
- require_value: false
- reduce_duplicates: false
- plugin_id: taxonomy_index_tid
- display_extenders: { }
- cache_metadata:
- max-age: -1
- contexts:
- - 'languages:language_content'
- - 'languages:language_interface'
- - url
- - url.query_args
- - 'user.node_grants:view'
- - user.permissions
- tags: { }
- page_1:
- display_plugin: page
- id: page_1
- display_title: Page
- position: 1
- display_options:
- display_extenders: { }
- path: articles
- cache_metadata:
- max-age: -1
- contexts:
- - 'languages:language_content'
- - 'languages:language_interface'
- - url
- - url.query_args
- - 'user.node_grants:view'
- - user.permissions
- tags: { }
diff --git a/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml b/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
deleted file mode 100644
index ad051ce..0000000
--- a/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Views Test Config'
-type: module
-description: 'Provides default views for tests.'
-package: Testing
-# version: VERSION
-# core: 8.x
-dependencies:
- - views
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'pathauto'
-datestamp: 1493468049
diff --git a/modules/pathauto/tests/src/Kernel/PathautoKernelTest.php b/modules/pathauto/tests/src/Kernel/PathautoKernelTest.php
deleted file mode 100644
index b69d437..0000000
--- a/modules/pathauto/tests/src/Kernel/PathautoKernelTest.php
+++ /dev/null
@@ -1,572 +0,0 @@
-installConfig(array('pathauto', 'taxonomy', 'system', 'node'));
-
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
- $this->installEntitySchema('taxonomy_term');
-
- ConfigurableLanguage::createFromLangcode('fr')->save();
-
- $this->installSchema('node', array('node_access'));
- $this->installSchema('system', array('url_alias', 'sequences', 'router'));
-
- $type = NodeType::create(['type' => 'page']);
- $type->save();
- node_add_body_field($type);
-
- $this->nodePattern = $this->createPattern('node', '/content/[node:title]');
- $this->userPattern = $this->createPattern('user', '/users/[user:name]');
-
- \Drupal::service('router.builder')->rebuild();
-
- $this->currentUser = User::create(array('name' => $this->randomMachineName()));
- $this->currentUser->save();
- }
-
- /**
- * Test _pathauto_get_schema_alias_maxlength().
- */
- public function testGetSchemaAliasMaxLength() {
- $this->assertIdentical(\Drupal::service('pathauto.alias_storage_helper')->getAliasSchemaMaxlength(), 255);
- }
-
- /**
- * Test pathauto_pattern_load_by_entity().
- */
- public function testPatternLoadByEntity() {
- $pattern = $this->createPattern('node', '/article/[node:title]', -1);
- $this->addBundleCondition($pattern, 'node', 'article');
- $pattern->save();
-
- $pattern = $this->createPattern('node', '/article/en/[node:title]', -2);
- $this->addBundleCondition($pattern, 'node', 'article');
- $pattern->addSelectionCondition(
- [
- 'id' => 'language',
- 'langcodes' => [
- 'en' => 'en',
- ],
- 'negate' => FALSE,
- 'context_mapping' => [
- 'language' => 'node:langcode:language',
- ]
- ]
- );
-
- $pattern->addRelationship('node:langcode:language');
- $pattern->save();
-
- $pattern = $this->createPattern('node', '/[node:title]', -1);
- $this->addBundleCondition($pattern, 'node', 'page');
- $pattern->save();
-
- $tests = array(
- array(
- 'entity' => 'node',
- 'values' => [
- 'title' => 'Article fr',
- 'type' => 'article',
- 'langcode' => 'fr',
- ],
- 'expected' => '/article/[node:title]',
- ),
- array(
- 'entity' => 'node',
- 'values' => [
- 'title' => 'Article en',
- 'type' => 'article',
- 'langcode' => 'en',
- ],
- 'expected' => '/article/en/[node:title]',
- ),
- array(
- 'entity' => 'node',
- 'values' => [
- 'title' => 'Article und',
- 'type' => 'article',
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
- ],
- 'expected' => '/article/[node:title]',
- ),
- array(
- 'entity' => 'node',
- 'values' => [
- 'title' => 'Page',
- 'type' => 'page',
- ],
- 'expected' => '/[node:title]',
- ),
- array(
- 'entity' => 'user',
- 'values' => [
- 'name' => 'User',
- ],
- 'expected' => '/users/[user:name]',
- ),
- );
- foreach ($tests as $test) {
- $entity = \Drupal::entityTypeManager()->getStorage($test['entity'])->create($test['values']);
- $entity->save();
- $actual = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
- $this->assertIdentical($actual->getPattern(), $test['expected'], t("Correct pattern returned for @entity_type with @values", array(
- '@entity' => $test['entity'],
- '@values' => print_r($test['values'], TRUE),
- )));
- }
- }
-
- /**
- * Test potential conflicts with the same alias in different languages.
- */
- public function testSameTitleDifferentLanguages() {
- // Create two English articles with the same title.
- $edit = [
- 'title' => 'Sample page',
- 'type' => 'page',
- 'langcode' => 'en',
- ];
- $node1 = $this->drupalCreateNode($edit);
- $this->assertEntityAlias($node1, '/content/sample-page', 'en');
-
- $node2 = $this->drupalCreateNode($edit);
- $this->assertEntityAlias($node2, '/content/sample-page-0', 'en');
-
- // Now, create a French article with the same title, and verify that it gets
- // the basic alias with the correct langcode.
- $edit['langcode'] = 'fr';
- $node3 = $this->drupalCreateNode($edit);
- $this->assertEntityAlias($node3, '/content/sample-page', 'fr');
- }
-
- /**
- * Test pathauto_cleanstring().
- */
- public function testCleanString() {
-
- // Test with default settings defined in pathauto.settings.yml.
- $this->installConfig(array('pathauto'));
- \Drupal::service('pathauto.generator')->resetCaches();
-
- $tests = array();
-
- // Test the 'ignored words' removal.
- $tests['this'] = 'this';
- $tests['this with that'] = 'this-with-that';
- $tests['this thing with that thing'] = 'thing-thing';
-
- // Test 'ignored words' removal and duplicate separator removal.
- $tests[' - Pathauto is the greatest - module ever - '] = 'pathauto-greatest-module-ever';
-
- // Test length truncation and lowering of strings.
- $long_string = $this->randomMachineName(120);
- $tests[$long_string] = strtolower(substr($long_string, 0, 100));
-
- // Test that HTML tags are removed.
- $tests['This text has HTML tags text has HTML tags
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/rules/README.md b/modules/rules/README.md
deleted file mode 100644
index 2c5abdf..0000000
--- a/modules/rules/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Rules for Drupal 8
-
-[](https://travis-ci.org/fago/rules)
-
-The Rules module allows site administrators to define conditionally executed
-actions based on occurring events (ECA-rules).
-
-* Project homepage: https://www.drupal.org/project/rules
-* #d8rules initiative: http://d8rules.org/
-* Documentation: http://docs.d8rules.org
-
-## Contributing
-
-Link to [Rules 8.x-3.x contributing tasks](https://www.drupal.org/node/2245015#contributing).
-
-For some time, development will happen on GitHub using the pull request model:
-in case you are not familiar with that, please take a few minutes to read the
-[GitHub article](https://help.github.com/articles/using-pull-requests) on using
-pull requests.
-
-There are a few conventions that should be followed when contributing:
-
-* Always create an issue in the [drupal.org Rules issue queue](https://www.drupal.org/project/issues/rules)
- for every pull request you are working on.
-* Always cross-reference the Issue in the Pull Request and the Pull Request in
- the issue.
-* Always create a new branch for every pull request: its name should contain a
- brief summary of the ticket and its issue id, e.g **readme-2276369**.
-* Try to keep the history of your pull request as clean as possible by squashing
- your commits: you can look at the [Symfony documentation](http://symfony.com/doc/current/cmf/contributing/commits.html)
- or at the [Git book](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
- for more information on how to do that.
-
-For further information on how to contribute please refer to
-[our documentation](https://thefubhy.gitbooks.io/rules/content/).
-
-## Checking coding style
-
-The module comes with a phpcs setup that is verifying a correct coding style.
-To run the check just execute the following command from the rules module
-directory:
-
- # Install phpcs as local dev dependency, then run it:
- composer install
- ./vendor/bin/phpcs
-
- # If there are some coding style violations that can be fixed
- # automatically, use the code beautifier:
- ./vendor/bin/phpcbf
-
-## Executing the automated tests
-
-This module comes with PHPUnit tests. You need a working Drupal 8 installation
-and a checkout of the Rules module in the modules folder.
-
-#### Unit tests only
-
- cd /path/to/drupal-8/core
- ../vendor/bin/phpunit ../modules/rules/tests/src/Unit
- ../vendor/bin/phpunit ../modules/rules/tests/src/Integration
-
-#### Unit tests and kernel/web tests
-
-Make sure to use your DB connection details for the SIMPLETEST_DB and the URL to
-your local Drupal installation for SIMPLETEST_BASE_URL.
-
- cd /path/to/drupal-8/core
- export SIMPLETEST_DB=mysql://drupal-8:password@localhost/drupal-8
- export SIMPLETEST_BASE_URL=http://drupal-8.localhost
- ../vendor/bin/phpunit ../modules/rules
-
-Example for executing one single test file during development:
-
- ../vendor/bin/phpunit ../modules/rules/tests/src/Unit/ActionSetTest.php
-
-You can also execute the test cases from the web interface at
-``/admin/config/development/testing``.
diff --git a/modules/rules/composer.json b/modules/rules/composer.json
deleted file mode 100644
index f4d6142..0000000
--- a/modules/rules/composer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "name": "drupal/rules",
- "description": "React on events and conditionally evaluate actions.",
- "type": "drupal-module",
- "license": "GPL-2.0+",
- "minimum-stability": "dev",
- "require": {
- },
- "require-dev": {
- "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
- "drupal/coder": "8.2.*",
- "squizlabs/php_codesniffer": "2.9.*"
- }
-}
diff --git a/modules/rules/composer.lock b/modules/rules/composer.lock
deleted file mode 100644
index 7dbb22d..0000000
--- a/modules/rules/composer.lock
+++ /dev/null
@@ -1,261 +0,0 @@
-{
- "_readme": [
- "This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
- "This file is @generated automatically"
- ],
- "content-hash": "847660445cbbc4e833514bf85332d9c1",
- "packages": [],
- "packages-dev": [
- {
- "name": "dealerdirect/phpcodesniffer-composer-installer",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/DealerDirect/phpcodesniffer-composer-installer.git",
- "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/DealerDirect/phpcodesniffer-composer-installer/zipball/63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
- "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.0",
- "php": "^5.3|^7",
- "squizlabs/php_codesniffer": "*"
- },
- "require-dev": {
- "composer/composer": "*",
- "wimg/php-compatibility": "^8.0"
- },
- "suggest": {
- "dealerdirect/qa-tools": "All the PHP QA tools you'll need"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
- },
- "autoload": {
- "psr-4": {
- "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Franck Nijhof",
- "email": "f.nijhof@dealerdirect.nl",
- "homepage": "http://workingatdealerdirect.eu",
- "role": "Developer"
- }
- ],
- "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
- "homepage": "http://workingatdealerdirect.eu",
- "keywords": [
- "PHPCodeSniffer",
- "PHP_CodeSniffer",
- "code quality",
- "codesniffer",
- "composer",
- "installer",
- "phpcs",
- "plugin",
- "qa",
- "quality",
- "standard",
- "standards",
- "style guide",
- "stylecheck",
- "tests"
- ],
- "time": "2017-09-18T07:49:36+00:00"
- },
- {
- "name": "drupal/coder",
- "version": "8.2.12",
- "source": {
- "type": "git",
- "url": "https://github.com/klausi/coder.git",
- "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/klausi/coder/zipball/984c54a7b1e8f27ff1c32348df69712afd86b17f",
- "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "php": ">=5.4.0",
- "squizlabs/php_codesniffer": ">=2.8.1 <3.0",
- "symfony/yaml": ">=2.0.0"
- },
- "require-dev": {
- "phpunit/phpunit": ">=3.7 <6"
- },
- "type": "phpcodesniffer-standard",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0+"
- ],
- "description": "Coder is a library to review Drupal code.",
- "homepage": "https://www.drupal.org/project/coder",
- "keywords": [
- "code review",
- "phpcs",
- "standards"
- ],
- "time": "2017-03-18T10:28:49+00:00"
- },
- {
- "name": "squizlabs/php_codesniffer",
- "version": "2.9.1",
- "source": {
- "type": "git",
- "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62",
- "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62",
- "shasum": ""
- },
- "require": {
- "ext-simplexml": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": ">=5.1.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0"
- },
- "bin": [
- "scripts/phpcs",
- "scripts/phpcbf"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "CodeSniffer.php",
- "CodeSniffer/CLI.php",
- "CodeSniffer/Exception.php",
- "CodeSniffer/File.php",
- "CodeSniffer/Fixer.php",
- "CodeSniffer/Report.php",
- "CodeSniffer/Reporting.php",
- "CodeSniffer/Sniff.php",
- "CodeSniffer/Tokens.php",
- "CodeSniffer/Reports/",
- "CodeSniffer/Tokenizers/",
- "CodeSniffer/DocGenerators/",
- "CodeSniffer/Standards/AbstractPatternSniff.php",
- "CodeSniffer/Standards/AbstractScopeSniff.php",
- "CodeSniffer/Standards/AbstractVariableSniff.php",
- "CodeSniffer/Standards/IncorrectPatternException.php",
- "CodeSniffer/Standards/Generic/Sniffs/",
- "CodeSniffer/Standards/MySource/Sniffs/",
- "CodeSniffer/Standards/PEAR/Sniffs/",
- "CodeSniffer/Standards/PSR1/Sniffs/",
- "CodeSniffer/Standards/PSR2/Sniffs/",
- "CodeSniffer/Standards/Squiz/Sniffs/",
- "CodeSniffer/Standards/Zend/Sniffs/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Greg Sherwood",
- "role": "lead"
- }
- ],
- "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "http://www.squizlabs.com/php-codesniffer",
- "keywords": [
- "phpcs",
- "standards"
- ],
- "time": "2017-05-22T02:43:20+00:00"
- },
- {
- "name": "symfony/yaml",
- "version": "3.4.x-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/yaml.git",
- "reference": "0ae79584f89fee567f21868ddd4ca4d580aba607"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/0ae79584f89fee567f21868ddd4ca4d580aba607",
- "reference": "0ae79584f89fee567f21868ddd4ca4d580aba607",
- "shasum": ""
- },
- "require": {
- "php": "^5.5.9|>=7.0.8"
- },
- "conflict": {
- "symfony/console": "<3.4"
- },
- "require-dev": {
- "symfony/console": "~3.4|~4.0"
- },
- "suggest": {
- "symfony/console": "For validating YAML files using the lint command"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.4-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Yaml\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Yaml Component",
- "homepage": "https://symfony.com",
- "time": "2017-09-28T15:24:12+00:00"
- }
- ],
- "aliases": [],
- "minimum-stability": "dev",
- "stability-flags": {
- "dealerdirect/phpcodesniffer-composer-installer": 20
- },
- "prefer-stable": false,
- "prefer-lowest": false,
- "platform": [],
- "platform-dev": []
-}
diff --git a/modules/rules/config/install/rules.settings.yml b/modules/rules/config/install/rules.settings.yml
deleted file mode 100644
index 7e27287..0000000
--- a/modules/rules/config/install/rules.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-log: false
-debug_screen: false
-log_level_system: warning
-log_level_screen: warning
diff --git a/modules/rules/config/schema/rules.action.schema.yml b/modules/rules/config/schema/rules.action.schema.yml
deleted file mode 100644
index 89a3dba..0000000
--- a/modules/rules/config/schema/rules.action.schema.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Per default the schema of arbitrary context values of an action cannot be
-# typed. Actions that need translatability or other features of the config
-# system must specify their context value schema explicitly, see examples below.
-rules.action.context_values.*:
- type: ignore
- label: Context values
-
-rules.action.context_values.rules_system_message:
- type: mapping
- label: Message action context values
- mapping:
- message:
- type: text
- type:
- type: string
- repeat:
- type: boolean
-
-rules.action.context_values.rules_send_email:
- type: mapping
- label: Send e-mail action context values
- mapping:
- to:
- type: sequence
- sequence:
- type: email
- subject:
- type: text
- message:
- type: text
- reply:
- type: email
- language:
- type: string
diff --git a/modules/rules/config/schema/rules.condition.schema.yml b/modules/rules/config/schema/rules.condition.schema.yml
deleted file mode 100644
index fe45a66..0000000
--- a/modules/rules/config/schema/rules.condition.schema.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Per default the schema of arbitrary context values of a condition cannot be
-# typed. Conditions that need translatability or other features of the config
-# system must specify their context value schema explicitly, see examples below.
-rules.condition.context_values.*:
- type: ignore
- label: Context values
-
-rules.condition.context_values.rules_entity_is_new:
- type: mapping
- label: Entity is new context values
- mapping:
- entity:
- type: string
diff --git a/modules/rules/config/schema/rules.context.schema.yml b/modules/rules/config/schema/rules.context.schema.yml
deleted file mode 100644
index 9e2169e..0000000
--- a/modules/rules/config/schema/rules.context.schema.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-rules.context.definition:
- type: mapping
- label: 'Context definition'
- mapping:
- type:
- type: string
- label: 'Type'
- label:
- type: text
- label: 'Label'
- description:
- type: text
- label: 'Description'
-
-rules.context.mapping:
- type: sequence
- label: 'Context mapping'
- sequence:
- - type: string
-
-rules.context.values:
- type: mapping
- label: 'Context values'
- mapping:
- # The entries depend on the plugin here. Plugins have to extend this and
- # provide a suiting schema.
-
-rules.context.processors:
- type: ignore
- label: 'Context processors'
diff --git a/modules/rules/config/schema/rules.data_types.schema.yml b/modules/rules/config/schema/rules.data_types.schema.yml
deleted file mode 100644
index bbc9c35..0000000
--- a/modules/rules/config/schema/rules.data_types.schema.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-rules_component:
- type: mapping
- label: 'Rules component (embedded)'
- mapping:
- context_definitions:
- type: sequence
- label: 'Context definitions'
- sequence:
- - type: rules.context.definition
- provided_context_definitions:
- type: sequence
- label: 'Provided context definitions'
- sequence:
- - type: rules.context.definition
- expression:
- type: rules_expression.[id]
- label: 'Expression configuration'
diff --git a/modules/rules/config/schema/rules.expression.schema.yml b/modules/rules/config/schema/rules.expression.schema.yml
deleted file mode 100644
index ab6d406..0000000
--- a/modules/rules/config/schema/rules.expression.schema.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-rules_expression:
- type: mapping
- label: 'Rules expression'
- id:
- type: string
- label: 'Plugin ID'
- uuid:
- type: string
- label: 'UUID'
-
-rules_expression.rules_condition:
- type: rules_expression
- label: "Rules condition configuration"
- mapping:
- id:
- type: string
- label: 'Plugin ID'
- uuid:
- type: string
- label: 'UUID'
- condition_id:
- type: string
- label: 'Condition plugin ID'
- negate:
- type: boolean
- label: 'Negated'
- context_values:
- type: rules.condition.context_values.[%parent.condition_id]
- label: 'Context values'
- context_mapping:
- type: rules.context.mapping
- label: 'Context mapping'
- context_processors:
- type: rules.context.processors
- label: 'Context processors'
- provides_mapping:
- type: rules.context.mapping
- label: 'Provided context mapping'
-
-rules_expression.rules_action:
- type: rules_expression
- label: "Rules action configuration"
- mapping:
- id:
- type: string
- label: 'Plugin ID'
- uuid:
- type: string
- label: 'UUID'
- action_id:
- type: string
- label: 'Action plugin ID'
- context_values:
- type: rules.action.context_values.[%parent.action_id]
- label: 'Context values'
- context_mapping:
- type: rules.context.mapping
- label: 'Context mapping'
- context_processors:
- type: rules.context.processors
- label: 'Context processors'
- provides_mapping:
- type: rules.context.mapping
- label: 'Provided context mapping'
-
-rules_expression.rules_and:
- type: rules_expression
- label: 'Rules And'
- mapping:
- id:
- type: string
- label: 'Plugin ID'
- uuid:
- type: string
- label: 'UUID'
- negate:
- type: boolean
- label: 'Negate'
- conditions:
- type: sequence
- label: 'Conditions'
- sequence:
- - type: rules_expression.[id]
-
-rules_expression.rules_action_set:
- type: rules_expression
- label: 'Action set'
- mapping:
- id:
- type: string
- label: 'Plugin ID'
- uuid:
- type: string
- label: 'UUID'
- actions:
- type: sequence
- label: 'Actions'
- sequence:
- - type: rules_expression.[id]
-
-rules_expression.rules_rule:
- type: rules_expression
- label: "Rule"
- mapping:
- id:
- type: string
- label: 'Plugin ID'
- uuid:
- type: string
- label: 'UUID'
- conditions:
- type: rules_expression.[id]
- label: 'Conditions'
- actions:
- type: rules_expression.[id]
- label: 'Actions'
diff --git a/modules/rules/config/schema/rules.schema.yml b/modules/rules/config/schema/rules.schema.yml
deleted file mode 100644
index 1faf488..0000000
--- a/modules/rules/config/schema/rules.schema.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# Schema for the configuration files of the Rules module.
-
-rules.component.*:
- type: config_entity
- label: 'Rules component'
- mapping:
- id:
- type: string
- label: 'ID'
- label:
- type: label
- label: 'Label'
- description:
- type: text
- label: 'Administrative description'
- tags:
- type: sequence
- label: Tags
- sequence:
- type: string
- label: 'Tag'
- config_version:
- type: string
- label: 'Configuration schema version'
- component:
- type: rules_component
-
-rules.reaction.*:
- type: config_entity
- label: 'Reaction rule'
- mapping:
- id:
- type: string
- label: 'ID'
- label:
- type: label
- label: 'Label'
- events:
- type: sequence
- label: 'Events'
- sequence:
- type: mapping
- label: 'Event'
- mapping:
- event_name:
- type: string
- label: 'Name'
- configuration:
- type: sequence
- label: 'Configuration'
- sequence:
- type: mapping
- description:
- type: text
- label: 'Administrative description'
- tags:
- type: sequence
- label: Tags
- sequence:
- type: string
- label: 'Tag'
- config_version:
- type: string
- label: 'Configuration schema version'
- expression:
- type: rules_expression.[id]
- label: 'Expression configuration'
-
-rules.settings:
- type: config_object
- label: 'Rules settings'
- mapping:
- log:
- type: boolean
- label: 'Log debug information'
- log_level_system:
- type: string
- label: 'Log level'
- debug_screen:
- type: boolean
- label: 'Show debug information on screen (in the HTML response)'
- log_level_screen:
- type: string
- label: 'Log level'
diff --git a/modules/rules/d7-tests/rules.test b/modules/rules/d7-tests/rules.test
deleted file mode 100644
index 0e76161..0000000
--- a/modules/rules/d7-tests/rules.test
+++ /dev/null
@@ -1,2107 +0,0 @@
- 'Rules Engine tests',
- 'description' => 'Test using the rules API to create and evaluate rules.',
- 'group' => 'Rules',
- );
- }
-
- function setUp() {
- parent::setUp('rules', 'rules_test');
- RulesLog::logger()->clear();
- variable_set('rules_debug_log', 1);
- }
-
- /**
- * Calculates the output of t() given an array of placeholders to replace.
- */
- static function t($text, $strings) {
- $placeholders = array();
- foreach ($strings as $key => $string) {
- $key = !is_numeric($key) ? $key : $string;
- $placeholders['%' . $key] = drupal_placeholder($string);
- }
- return strtr($text, $placeholders);
- }
-
- protected function createTestRule() {
- $rule = rule();
- $rule->condition('rules_test_condition_true')
- ->condition('rules_test_condition_true')
- ->condition(rules_or()
- ->condition(rules_condition('rules_test_condition_true')->negate())
- ->condition('rules_test_condition_false')
- ->condition(rules_and()
- ->condition('rules_test_condition_false')
- ->condition('rules_test_condition_true')
- ->negate()
- )
- );
- $rule->action('rules_test_action');
- return $rule;
- }
-
- /**
- * Tests creating a rule and iterating over the rule elements.
- */
- function testRuleCreation() {
- $rule = $this->createTestRule();
- $rule->integrityCheck();
- $rule->execute();
- $log = RulesLog::logger()->get();
- $last = array_pop($log);
- $last = array_pop($log);
- $last = array_pop($log);
- $this->assertEqual($last[0], 'action called', 'Action called');
- RulesLog::logger()->checkLog();
-
- // Make sure condition and action iterators are working.
- $it = new RecursiveIteratorIterator($rule->conditions(), RecursiveIteratorIterator::SELF_FIRST);
- $this->assertEqual(iterator_count($it), 8, 'Iterated over all conditions and condition containers');
- $it = new RecursiveIteratorIterator($rule->conditions());
- $this->assertEqual(iterator_count($it), 6, 'Iterated over all conditions');
- $this->assertEqual(iterator_count($rule->actions()), 1, 'Iterated over all actions');
- $this->assertEqual(iterator_count($rule->elements()), 10, 'Iterated over all rule elements.');
-
- // Test getting dependencies and the integrity check.
- $rule->integrityCheck();
- $this->assertTrue($rule->dependencies() === array('rules_test'), 'Dependencies correctly returned.');
- }
-
- /**
- * Test handling dependencies.
- */
- function testdependencies() {
- $action = rules_action('rules_node_publish_action');
- $this->assertEqual($action->dependencies(), array('rules_test'), 'Providing module is returned as dependency.');
-
- $container = new RulesTestContainer();
- $this->assertEqual($container->dependencies(), array('rules_test'), 'Providing module for container plugin is returned as dependency.');
-
- // Test handling unmet dependencies.
- $rule = rules_config_load('rules_export_test');
- $this->assertTrue(in_array('comment', $rule->dependencies) && !$rule->dirty, 'Dependencies have been imported.');
-
- // Remove the required comment module and make sure the rule is dirty then.
- module_disable(array('comment'));
- rules_clear_cache();
- $rule = rules_config_load('rules_export_test');
- $this->assertTrue($rule->dirty, 'Rule has been marked as dirty');
-
- // Now try re-enabling.
- module_enable(array('comment'));
- rules_clear_cache();
- $rule = rules_config_load('rules_export_test');
- $this->assertTrue(!$rule->dirty, 'Rule has been marked as not dirty again.');
-
- // Test it with components.
- module_enable(array('path'));
- $action_set = rules_action_set(array('node' => array('type' => 'node')));
- $action_set->action('node_path_alias');
- $action_set->save('rules_test_alias');
-
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->action('component_rules_test_alias');
- $rule->integrityCheck();
- $rule->save('rules_test_rule');
-
- $rule = rules_config_load('rules_test_rule');
- $component = rules_config_load('rules_test_alias');
- $this->assertTrue(in_array('path', $component->dependencies) && !$rule->dirty && !$component->dirty, 'Component has path module dependency.');
-
- // Now disable path module and make sure both configs are marked as dirty.
- module_disable(array('path'));
- rules_clear_cache();
- $rule = rules_config_load('rules_test_rule');
- $component = rules_config_load('rules_test_alias');
-
- $this->assertTrue($component->dirty, 'Component has been marked as dirty');
- $node = $this->drupalCreateNode();
- $result = rules_invoke_component('rules_test_alias', $node);
- $this->assertTrue($result === FALSE, 'Unable to execute a dirty component.');
-
- // When the rule is evaluated, the broken component is detected and the
- // rule should be marked as dirty too.
- $rule->execute($node);
- $this->assertTrue($rule->dirty, 'Rule has been marked as dirty');
-
- module_enable(array('path'));
- rules_clear_cache();
-
- // Trigger rebuilding the cache, so configs are checked again.
- rules_get_cache();
-
- $rule = rules_config_load('rules_test_rule');
- $component = rules_config_load('rules_test_alias');
- $this->assertTrue(!$component->dirty, 'Component has been marked as not dirty again.');
- $this->assertTrue(!$rule->dirty, 'Rule has been marked as not dirty again.');
- }
-
- /**
- * Test setting up an action with some action_info and serializing and
- * executing it.
- */
- function testActionSetup() {
- $action = rules_action('rules_node_publish_action');
-
- $s = serialize($action);
- $action2 = unserialize($s);
- $node = (object) array('status' => 0, 'type' => 'page');
- $node->title = 'test';
-
- $action2->execute($node);
- $this->assertEqual($node->status, 1, 'Action executed correctly');
-
- $this->assertTrue(in_array('node', array_keys($action2->parameterInfo())), 'Parameter info returned.');
-
- $node->status = 0;
- $action2->integrityCheck();
- $action2->executeByArgs(array('node' => $node));
- $this->assertEqual($node->status, 1, 'Action executed correctly');
-
- // Test calling an extended + overriden method.
- $this->assertEqual($action2->help(), 'custom', 'Using custom help callback.');
-
- // Inspect the cache
- //$this->pass(serialize(rules_get_cache()));
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test executing with wrong arguments.
- */
- function testActionExecutionFails() {
- $action = rules_action('rules_node_publish_action');
- try {
- $action->execute();
- $this->fail("Execution hasn't created an exception.");
- }
- catch (RulesEvaluationException $e) {
- $this->pass("RulesEvaluationException was thrown: ". $e);
- }
- }
-
- /**
- * Test setting up a rule and mapping variables.
- */
- function testVariableMapping() {
- $rule = rule(array(
- 'node' => array('type' => 'node'),
- 'node_unchanged' => array('type' => 'node'),
- ));
- $rule->condition(rules_condition('rules_condition_content_is_published')->negate())
- ->condition('rules_condition_content_is_type', array('type' => array('page', 'story')))
- ->action('rules_node_publish_action', array('node:select' => 'node_unchanged'));
-
- $node1 = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
- $node2 = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
- $rule->integrityCheck();
- $rule->execute($node1, $node2);
- $this->assertEqual($node2->status, 1, 'Action executed correctly on node2.');
- $this->assertEqual($node1->status, 0, 'Action not executed on node1.');
-
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Tests making use of class based actions.
- */
- function testClassBasedActions() {
- $cache = rules_get_cache();
- $this->assertTrue(!empty($cache['action_info']['rules_test_class_action']), 'Action has been discovered.');
- $action = rules_action('rules_test_class_action');
-
- $parameters = $action->parameterInfo();
- $this->assertTrue($parameters['node'], 'Action parameter needs a value.');
-
- $node = $this->drupalCreateNode();
- $action->execute($node);
- $log = RulesLog::logger()->get();
- $last = array_pop($log);
- $last = array_pop($log);
- $this->assertEqual($last[0], 'Action called with node ' . $node->nid, 'Action called');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Tests CRUD functionality.
- */
- function testRulesCRUD() {
- $rule = $this->createTestRule();
- $rule->integrityCheck()->save('test');
-
- $this->assertEqual(TRUE, $rule->active, 'Rule is active.');
- $this->assertEqual(0, $rule->weight, 'Rule weight is zero.');
-
- $results = entity_load('rules_config', array('test'));
- $rule2 = array_pop($results);
- $this->assertEqual($rule->id, $rule2->id, 'Rule created and loaded');
- $this->assertEqual(get_class($rule2), get_class($rule), 'Class properly instantiated.');
- $rule2->execute();
- // Update.
- $rule2->save();
-
- // Make sure all rule elements are still here.
- $it = new RecursiveIteratorIterator($rule2->conditions(), RecursiveIteratorIterator::SELF_FIRST);
- $this->assertEqual(iterator_count($it), 8, 'Iterated over all conditions and condition containers');
- $it = new RecursiveIteratorIterator($rule2->conditions());
- $this->assertEqual(iterator_count($it), 6, 'Iterated over all conditions');
- $this->assertEqual(iterator_count($rule2->actions()), 1, 'Iterated over all actions');
-
- // Delete.
- $rule2->delete();
- $this->assertEqual(entity_load('rules_config', FALSE, array('id' => $rule->id)), array(), 'Deleted.');
-
- // Tests CRUD for tags - making sure the tags are stored properly..
- $rule = $this->createTestRule();
- $tag = $this->randomString();
- $rule->tags = array($tag);
- $rule->save();
- $result = db_select('rules_tags')
- ->fields('rules_tags', array('tag'))
- ->condition('id', $rule->id)
- ->execute();
- $this->assertEqual($result->fetchField(), $tag, 'Associated tag has been saved.');
- // Try updating.
- $rule->tags = array($this->randomName(), $this->randomName());
- $rule->integrityCheck()->save();
- $result = db_select('rules_tags')
- ->fields('rules_tags', array('tag'))
- ->condition('id', $rule->id)
- ->execute()
- ->fetchCol();
- $this->assertTrue(in_array($rule->tags[0], $result) && in_array($rule->tags[1], $result), 'Updated associated tags.');
- // Try loading multiple rules by tags.
- $rule2 = $this->createTestRule();
- $rule2->tags = array($this->randomName());
- $rule2->save();
- $loaded = entity_load('rules_config', FALSE, array('tags' => array($rule->tags[0], $rule2->tags[0])));
- $this->assertTrue($loaded[$rule->id]->id == $rule->id && $loaded[$rule2->id]->id == $rule2->id, 'Loading configs by tags');
- // Try deleting.
- $rule->delete();
- $result = db_select('rules_tags')
- ->fields('rules_tags', array('tag'))
- ->condition('id', $rule->id)
- ->execute();
- $this->assertEqual($result->fetchField(), FALSE, 'Deleted associated tags.');
- }
-
- /**
- * Test automatic saving of variables.
- */
- function testActionSaving() {
- // Test saving a parameter.
- $action = rules_action('rules_node_publish_action_save');
- $node = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
- $action->executeByArgs(array('node' => $node));
-
- $this->assertEqual($node->status, 1, 'Action executed correctly on node.');
- // Sync node_load cache with node_save
- entity_get_controller('node')->resetCache();
-
- $node = node_load($node->nid);
- $this->assertEqual($node->status, 1, 'Node has been saved.');
-
- // Now test saving a provided variable, which is renamed and modified before
- // it is saved.
- $title = $this->randomName();
- $rule = rule();
- $rule->action('entity_create', array(
- 'type' => 'node',
- 'param_type' => 'article',
- 'param_author:select' => 'site:current-user',
- 'param_title' => $title,
- 'entity_created:var' => 'node',
- ));
- $rule->action('data_set', array(
- 'data:select' => 'node:body',
- 'value' => array('value' => 'body'),
- ));
- $rule->integrityCheck();
- $rule->execute();
-
- $node = $this->drupalGetNodeByTitle($title);
- $this->assertTrue(!empty($node) && $node->body[LANGUAGE_NONE][0]['value'] == 'body', 'Saved a provided variable');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test adding a variable and optional parameters.
- */
- function testVariableAdding() {
- $node = $this->drupalCreateNode();
- $rule = rule(array('nid' => array('type' => 'integer')));
- $rule->condition('rules_test_condition_true')
- ->action('rules_action_load_node')
- ->action('rules_action_delete_node', array('node:select' => 'node_loaded'))
- ->execute($node->nid);
-
- $this->assertEqual(FALSE, node_load($node->nid), 'Variable added and skipped optional parameter.');
- RulesLog::logger()->checkLog();
-
- $vars = $rule->conditions()->offsetGet(0)->availableVariables();
- $this->assertEqual(!isset($vars['node_loaded']), 'Loaded variable is not available to conditions.');
-
-
- // Test adding a variable with a custom variable name.
- $node = $this->drupalCreateNode();
- $rule = rule(array('nid' => array('type' => 'integer')));
- $rule->action('rules_action_load_node', array('node_loaded:var' => 'node'))
- ->action('rules_action_delete_node')
- ->execute($node->nid);
-
- $this->assertEqual(FALSE, node_load($node->nid), 'Variable with custom name added.');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test custom access for using component actions/conditions.
- */
- function testRuleComponentAccess() {
- // Create a normal user.
- $normal_user = $this->drupalCreateUser();
- // Create a role for granting access to the rule component.
- $this->normal_role = $this->drupalCreateRole(array(), 'test_role');
- $normal_user->roles[$this->normal_role] = 'test_role';
- user_save($normal_user, array('roles' => $normal_user->roles));
- // Create an 'action set' rule component making use of a permission.
- $action_set = rules_action_set(array('node' => array('type' => 'node')));
- $action_set->access_exposed = TRUE;
- $action_set->save('rules_test_roles');
-
- // Set the global user to be the current one as access is checked for the
- // global user.
- global $user;
- $user = user_load($normal_user->uid);
- $this->assertFalse(rules_action('component_rules_test_roles')->access(), 'Authenticated user without the correct role can\'t use the rule component.');
-
- // Assign the role that will have permissions for the rule component.
- user_role_change_permissions($this->normal_role, array('use Rules component rules_test_roles' => TRUE));
- $this->assertTrue(rules_action('component_rules_test_roles')->access(), 'Authenticated user with the correct role can use the rule component.');
-
- // Reset global user to anonyous.
- $user = user_load(0);
- $this->assertFalse(rules_action('component_rules_test_roles')->access(), 'Anonymous user can\'t use the rule component.');
- }
-
- /**
- * Test passing arguments by reference to an action.
- */
- function testPassingByReference() {
- // Keeping references of variables is unsupported, though the
- // EntityMetadataArrayObject may be used to achieve that.
- $array = array('foo' => 'bar');
- $data = new EntityMetadataArrayObject($array);
- rules_action('rules_action_test_reference')->execute($data);
- $this->assertTrue($data['changed'], 'Parameter has been passed by reference');
- }
-
- /**
- * Test sorting rule elements.
- */
- function testSorting() {
- $rule = $this->createTestRule();
- $conditions = $rule->conditions();
- $conditions[0]->weight = 10;
- $conditions[2]->weight = 10;
- $id[0] = $conditions[0]->elementId();
- $id[1] = $conditions[1]->elementId();
- $id[2] = $conditions[2]->elementId();
- // For testing use a deep sort, even if not necessary here.
- $rule->sortChildren(TRUE);
- $conditions = $rule->conditions();
- $this->assertEqual($conditions[0]->elementId(), $id[1], 'Condition sorted correctly.');
- $this->assertEqual($conditions[1]->elementId(), $id[0], 'Condition sorted correctly.');
- $this->assertEqual($conditions[2]->elementId(), $id[2], 'Condition sorted correctly.');
- }
-
- /**
- * Tests using data selectors.
- */
- function testDataSelectors() {
- $body[LANGUAGE_NONE][0] = array('value' => 'The body & nothing. ');
- $node = $this->drupalCreateNode(array('body' => $body, 'type' => 'page', 'summary' => ''));
-
- $rule = rule(array('nid' => array('type' => 'integer')));
- $rule->action('rules_action_load_node')
- ->action('drupal_message', array('message:select' => 'node_loaded:body:value'))
- ->execute($node->nid);
-
- RulesLog::logger()->checkLog();
- $msg = drupal_get_messages('status');
- $last_msg = array_pop($msg['status']);
- $wrapper = entity_metadata_wrapper('node', $node);
- $this->assertEqual($last_msg, $wrapper->body->value->value(array('sanitize' => TRUE)), 'Data selector for getting parameter applied.');
-
- // Get a "reference" on the same object as returned by node_load().
- $node = node_load($node->nid);
- $rule = rule(array('nid' => array('type' => 'integer')));
- $rule->action('rules_action_load_node')
- ->action('data_set', array('data:select' => 'node_loaded:title', 'value' => 'Test title'))
- // Use two actions and make sure the node get saved only once.
- ->action('data_set', array('data:select' => 'node_loaded:title', 'value' => 'Test title2'))
- ->execute($node->nid);
-
- $wrapper = entity_metadata_wrapper('node', $node);
- $this->assertEqual('Test title2', $wrapper->title->value(), 'Data has been modified and saved.');
-
- RulesLog::logger()->checkLog();
- $text = RulesLog::logger()->render();
- $msg = RulesTestCase::t('Saved %node_loaded of type %node.', array('node_loaded', 'node'));
- if ($pos1 = strpos($text, $msg)) {
- $pos2 = strpos($text, $msg, $pos1 + 1);
- }
- $this->assertTrue($pos1 && $pos2 === FALSE, 'Data has been saved only once.');
-
- // Test validation.
- try {
- rules_action('data_set', array('data' => 'no-selector', 'value' => ''))->integrityCheck();
- $this->fail("Validation hasn't created an exception.");
- }
- catch (RulesIntegrityException $e) {
- $this->pass("Validation error correctly detected: ". $e);
- }
-
- // Test auto creation of nested data structures, like the node body field.
- // I.e. if $node->body is not set, it is automatically initialized to an
- // empty array, so that the nested value can be set and the wrappers do not
- // complain about missing parent data structures.
- $rule = rule();
- $rule->action('entity_create', array(
- 'type' => 'node',
- 'param_type' => 'page',
- 'param_title' => 'foo',
- 'param_author' => $GLOBALS['user'],
- ));
- $rule->action('data_set', array('data:select' => 'entity_created:body:value', 'value' => 'test content'))
- ->execute();
- try {
- RulesLog::logger()->checkLog();
- $this->pass('Auto creation of nested data structures.');
- }
- catch (Exception $e) {
- $this->fail('Auto creation of nested data structures.');
- }
-
- // Make sure variables that are passed wrapped work.
- $result = rules_condition('rules_test_condition_node_wrapped')->execute($node->nid);
- $this->assertTrue($result, 'Condition receiving wrapped parameter.');
-
- // Make sure wrapped parameters are checked for containing NULL values.
- $rule = rule(array('node' => array('type' => 'node', 'optional' => TRUE)));
- $rule->condition('rules_test_condition_node_wrapped', array('node:select' => 'node'));
- $rule->execute(entity_metadata_wrapper('node'));
- $text = RulesLog::logger()->render();
- $msg = RulesTestCase::t('The variable or parameter %node is empty.', array('node'));
- $this->assertTrue(strpos($text, $msg) !== FALSE, 'Evaluation aborted due to an empty argument value.');
- }
-
- /**
- * Tests making use of rule sets.
- */
- function testRuleSets() {
- $set = rules_rule_set(array(
- 'node' => array('type' => 'node', 'label' => 'node'),
- ));
- $set->rule(rule()->action('drupal_message', array('message:select' => 'node:title')))
- ->rule(rule()->condition('rules_condition_content_is_published')
- ->action('drupal_message', array('message' => 'Node is published.'))
- );
- $set->integrityCheck()->save('rules_test_set_1');
-
- $node = $this->drupalCreateNode(array('title' => 'The title.', 'status' => 1));
- // Execute.
- rules_invoke_component('rules_test_set_1', $node);
-
- $msg = drupal_get_messages();
- $this->assertEqual($msg['status'][0], 'The title.', 'First rule evaluated.');
- $this->assertEqual($msg['status'][1], 'Node is published.', 'Second rule evaluated.');
-
- // Test a condition set.
- $set = rules_or(array(
- 'node' => array('type' => 'node', 'label' => 'node'),
- ));
- $set->condition('data_is', array('data:select' => 'node:author:name', 'value' => 'notthename'))
- ->condition('data_is', array('data:select' => 'node:nid', 'value' => $node->nid))
- ->integrityCheck()
- ->save('test', 'rules_test');
- // Load and execute condition set.
- $set = rules_config_load('test');
- $this->assertTrue($set->execute($node), 'Set has been correctly evaluated.');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Tests invoking components from the action.
- */
- function testComponentInvocations() {
- $set = rules_rule_set(array(
- 'node1' => array('type' => 'node', 'label' => 'node'),
- ));
- $set->rule(rule()->condition('node_is_published', array('node:select' => 'node1'))
- ->action('node_unpublish', array('node:select' => 'node1'))
- );
- $set->integrityCheck()->save('rules_test_set_2');
-
- // Use different names for the variables to ensure they are properly mapped
- // when taking over the variables to be saved.
- $rule = rule(array(
- 'node2' => array('type' => 'node', 'label' => 'node'),
- ));
- $rule->action('component_rules_test_set_2', array('node1:select' => 'node2'));
- $rule->action('node_make_sticky', array('node:select' => 'node2'));
-
- $node = $this->drupalCreateNode(array('title' => 'The title.', 'status' => 1, 'sticky' => 0));
- $rule->execute($node);
-
- $node = node_load($node->nid, NULL, TRUE);
- $this->assertFalse($node->status, 'The component changes have been saved correctly.');
- $this->assertTrue($node->sticky, 'The action changes have been saved correctly.');
-
- // Check that we have saved the changes only once.
- $text = RulesLog::logger()->render();
- // Make sure both saves are handled in one save operation.
- $this->assertEqual(substr_count($text, 'Saved'), 1, 'Changes have been saved in one save operation.');
- RulesLog::logger()->checkLog();
-
- // Test recursion prevention on components by invoking the component from
- // itself, what should be prevented.
- $set->action('component_rules_test_set_2', array('node1:select' => 'node1'))
- ->save();
-
- $rule->execute($node);
- $text1 = RulesLog::logger()->render();
- $text2 = RulesTestCase::t('Not evaluating rule set %rules_test_set_2 to prevent recursion.', array('rules_test_set_2'));
- $this->assertTrue((strpos($text1, $text2) !== FALSE), "Recursion of component invocation prevented.");
-
- // Test executing the component provided in code via the action. This makes
- // sure the component in code has been properly picked up.
- $node->status = 0;
- node_save($node);
- rules_action('component_rules_test_action_set')->execute($node);
- $this->assertTrue($node->status == 1, 'Component provided in code has been executed.');
- }
-
-
- /**
- * Test asserting metadata, customizing action info and make sure integrity
- * is checked.
- */
- function testMetadataAssertion() {
- $action = rules_action('rules_node_make_sticky_action');
-
- // Test failing integrity check.
- try {
- $rule = rule(array('node' => array('type' => 'entity')));
- $rule->action($action);
- // Fails due to the 'node' variable not matching the node type.
- $rule->integrityCheck();
- $this->fail('Integrity check has not thrown an exception.');
- }
- catch (RulesIntegrityException $e) {
- $this->pass('Integrity check has thrown exception: ' . $e->getMessage());
- }
-
- // Test asserting additional metadata.
- $rule = rule(array('node' => array('type' => 'node')));
- // Customize action info using the settings.
- $rule->condition('data_is', array('data:select' => 'node:type', 'value' => 'page'))
- // Configure an condition using the body. As the body is a field,
- // tis requires the bundle to be correctly asserted.
- ->condition(rules_condition('data_is', array('data:select' => 'node:body:value', 'value' => 'foo'))->negate())
- // The action also requires the page bundle in order to work.
- ->action($action);
- // Make sure the integrity check doesn't throw an exception.
- $rule->integrityCheck();
- // Test the rule.
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
- $rule->execute($node);
- $this->assertTrue($node->sticky, 'Rule with asserted metadata executed.');
-
-
- // Test asserting metadata on a derived property, i.e. not a variable.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('entity_is_of_type', array('entity:select' => 'node:reference', 'type' => 'node'))
- ->condition('data_is', array('data:select' => 'node:reference:type', 'value' => 'page'))
- ->action('rules_node_page_make_sticky_action', array('node:select' => 'node:reference'));
- $rule->integrityCheck();
- $rule->execute($node);
-
- // Test asserting an entity field.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('entity_has_field', array('entity:select' => 'node:reference', 'field' => 'field_tags'))
- ->action('data_set', array('data:select' => 'node:reference:field-tags', 'value' => array()));
- $rule->integrityCheck();
- $rule->execute($node);
-
- // Make sure an asserted bundle can be used as argument.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('entity_is_of_type', array('entity:select' => 'node:reference', 'type' => 'node'))
- ->condition('node_is_of_type', array('node:select' => 'node:reference', 'type' => array('page')))
- ->action('rules_node_page_make_sticky_action', array('node:select' => 'node:reference'));
- $rule->integrityCheck();
- $rule->execute($node);
-
- // Test asserting metadata on a derived property being a list item.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('node_is_of_type', array('node:select' => 'node:ref-nodes:0', 'type' => array('article')))
- ->action('data_set', array('data:select' => 'node:ref-nodes:0:field-tags', 'value' => array()));
- $rule->integrityCheck();
- $rule->execute($node);
-
- // Give green lights if there were no exceptions and check rules-log errors.
- $this->pass('Rules asserting metadata on a derived property pass integrity checks.');
- RulesLog::logger()->checkLog();
-
- // Make sure assertions of a one list item are not valid for another item.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('node_is_of_type', array('node:select' => 'node:ref-nodes:0', 'type' => array('article')))
- ->action('data_set', array('data:select' => 'node:ref-nodes:1:field-tags', 'value' => array()));
- try {
- $rule->integrityCheck();
- $this->fail('Assertion of a list item is not valid for another item.');
- }
- catch (RulesException $e) {
- $this->pass('Assertion of a list item is not valid for another item.');
- }
- }
-
- /**
- * Test using loops.
- */
- function testLoops() {
- // Test passing the list parameter as argument to ensure that is working
- // generally for plugin container too.
- drupal_get_messages(NULL, TRUE);
- $loop = rules_loop();
- $loop->action('drupal_message', array('message' => 'test'));
- $arg_info = $loop->parameterInfo();
- $this->assert($arg_info['list']['type'] == 'list', 'Argument info contains list.');
- $loop->execute(array(1, 2));
-
- // Ensure the action has been executed twice, once for each list item.
- $msg = drupal_get_messages();
- $this->assert($msg['status'][0] == 'test' && $msg['status'][1], 'Loop has been properly executed');
-
- // Now test looping over nodes.
- $node1 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
- $node2 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
- $node3 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
-
- $rule = rule(array(
- 'list' => array(
- 'type' => 'list',
- 'label' => 'A list of nodes',
- )
- ));
- $loop = rules_loop(array('list:select' => 'list', 'item:var' => 'node'));
- $loop->action('data_set', array('data:select' => 'node:sticky', 'value' => TRUE));
- $rule->action($loop);
- // Test using a list with data selectors, just output the last nodes type.
- $rule->action('drupal_message', array('message:select' => 'list:2:type'));
-
- $rule->execute(array($node1->nid, $node2->nid, $node3->nid));
- $text = RulesLog::logger()->render();
- $save_msg = RulesTestCase::t('Saved %node of type %node.', array('node', 'node'));
- $this->assertTrue(substr_count($text, $save_msg) == 3, 'List item variables have been saved.');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test access checks.
- */
- function testAccessCheck() {
- $rule = rule();
- // Try to set a property which is provided by the test module and is not
- // accessible, so the access check has to return FALSE.
- $rule->action('data_set', array('data:select' => 'site:no-access-user', 'value' => 'foo'));
- $this->assertTrue($rule->access() === FALSE, 'Access check is working.');
- }
-
- /**
- * Test returning provided variables.
- */
- function testReturningVariables() {
- $node = $this->drupalCreateNode();
- $action = rules_action('entity_fetch', array('type' => 'node', 'id' => $node->nid));
- list($node2) = $action->execute();
- $this->assertTrue($node2->nid == $node->nid, 'Action returned a variable.');
-
- // Create a simple set that just passed through the given node.
- $set = rules_rule_set(array('node' => array('type' => 'node')), array('node'));
- $set->integrityCheck()->save('rules_test_set_1');
-
- $provides = $set->providesVariables();
- $this->assertTrue($provides['node']['type'] == 'node', 'Rule set correctly passed through the node.');
-
- list($node2) = $set->execute($node);
- $this->assertTrue($node2->nid == $node->nid, 'Rule set returned a variable.');
-
- // Create an action set returning a variable that is no parameter.
- $set = rules_action_set(array(
- 'node' => array(
- 'type' => 'node',
- 'parameter' => FALSE,
- )), array('node'));
- $set->action('entity_fetch', array('type' => 'node', 'id' => $node->nid))
- ->action('data_set', array('data:select' => 'node', 'value:select' => 'entity_fetched'));
- $set->integrityCheck();
- list($node3) = $set->execute();
- $this->assertTrue($node3->nid == $node->nid, 'Action set returned a variable that has not been passed as parameter.');
-
- // Test the same again with a variable holding a not wrapped data type.
- $set = rules_action_set(array(
- 'number' => array(
- 'type' => 'integer',
- 'parameter' => FALSE,
- )), array('number'));
- $set->action('data_set', array('data:select' => 'number', 'value' => 3));
- $set->integrityCheck();
- list($number) = $set->execute();
- $this->assertTrue($number == 3, 'Actions set returned a number.');
- }
-
- /**
- * Tests using input evaluators.
- */
- function testInputEvaluators() {
- $node = $this->drupalCreateNode(array('title' => 'The body & nothing. ', 'type' => 'page'));
-
- $rule = rule(array('nid' => array('type' => 'integer')));
- $rule->action('rules_action_load_node')
- ->action('drupal_message', array('message' => 'Title: [node_loaded:title]'))
- ->execute($node->nid);
-
- RulesLog::logger()->checkLog();
- $msg = drupal_get_messages();
- $this->assertEqual(array_pop($msg['status']), 'Title: ' . check_plain('The body & nothing. '), 'Token input evaluator applied.');
-
- // Test token replacements on a list of text values.
- $component = rules_action_set(array('var' => array('type' => 'list', 'label' => 'var')), array('var'));
- $component->save('rules_test_input');
-
- $action = rules_action('component_rules_test_input', array('var' => array('uid: [site:current-user:uid]')));
- list($var) = $action->execute();
- $uid = $GLOBALS['user']->uid;
- $this->assertEqual(array("uid: $uid"), $var, 'Token replacements on a list of values applied.');
- }
-
- /**
- * Test importing and exporting a rule.
- */
- function testRuleImportExport() {
- $rule = rule(array('nid' => array('type' => 'integer')));
- $rule->name = "rules_export_test";
- $rule->action('rules_action_load_node')
- ->action('drupal_message', array('message' => 'Title: [node_loaded:title]'));
-
- $export =
-'{ "rules_export_test" : {
- "PLUGIN" : "rule",
- "REQUIRES" : [ "rules_test", "rules" ],
- "USES VARIABLES" : { "nid" : { "type" : "integer" } },
- "DO" : [
- { "rules_action_load_node" : { "PROVIDE" : { "node_loaded" : { "node_loaded" : "Loaded content" } } } },
- { "drupal_message" : { "message" : "Title: [node_loaded:title]" } }
- ]
- }
-}';
- $this->assertEqual($export, $rule->export(), 'Rule has been exported correctly.');
-
- // Test importing a rule which makes use of almost all features.
- $export = _rules_export_get_test_export();
- $rule = rules_import($export);
- $this->assertTrue(!empty($rule) && $rule->integrityCheck(), 'Rule has been imported.');
-
- // Test loading the same export provided as default rule.
- $rule = rules_config_load('rules_export_test');
- $this->assertTrue(!empty($rule) && $rule->integrityCheck(), 'Export has been provided in code.');
-
- // Export it and make sure the same export is generated again.
- $this->assertEqual($export, $rule->export(), 'Export of imported rule equals original export.');
-
- // Now try importing a rule set.
- $export =
-'{ "rules_test_set" : {
- "LABEL" : "Test set",
- "PLUGIN" : "rule set",
- "REQUIRES" : [ "rules" ],
- "USES VARIABLES" : { "node" : { "label" : "Test node", "type" : "node" } },
- "RULES" : [
- { "RULE" : {
- "IF" : [ { "NOT data_is" : { "data" : [ "node:title" ], "value" : "test" } } ],
- "DO" : [ { "data_set" : { "data" : [ "node:title" ], "value" : "test" } } ],
- "LABEL" : "Test Rule"
- }
- },
- { "RULE" : {
- "DO" : [ { "drupal_message" : { "message" : "hi" } } ],
- "LABEL" : "Test Rule 2"
- }
- }
- ]
- }
-}';
- $set = rules_import($export);
- $this->assertTrue(!empty($set) && $set->integrityCheck(), 'Rule set has been imported.');
- // Export it and make sure the same export is generated again.
- $this->assertEqual($export, $set->export(), 'Export of imported rule set equals original export.');
-
- // Try executing the imported rule set.
- $node = $this->drupalCreateNode();
- $set->execute($node);
- $this->assertEqual($node->title, 'test', 'Imported rule set has been executed.');
- RulesLog::logger()->checkLog();
-
- // Try import / export for a rule component providing a variable.
- $rule = rule(array(
- 'number' => array(
- 'type' => 'integer',
- 'label' => 'Number',
- 'parameter' => FALSE,
- )), array('number'));
- $rule->action('data_set', array('data:select' => 'number', 'value' => 3));
- $rule->name = 'rules_test_provides';
-
- $export = '{ "rules_test_provides" : {
- "PLUGIN" : "rule",
- "REQUIRES" : [ "rules" ],
- "USES VARIABLES" : { "number" : { "type" : "integer", "label" : "Number", "parameter" : false } },
- "DO" : [ { "data_set" : { "data" : [ "number" ], "value" : 3 } } ],
- "PROVIDES VARIABLES" : [ "number" ]
- }
-}';
- $this->assertEqual($export, $rule->export(), 'Rule 2 has been exported correctly.');
- $imported_rule = rules_import($rule->export());
-
- $this->assertTrue(!empty($imported_rule) && $imported_rule->integrityCheck(), 'Rule 2 has been imported.');
- $this->assertEqual($export, $imported_rule->export(), 'Export of imported rule 2 equals original export.');
-
- // Test importing a negated condition component.
- $export = '{ "rules_negated_component" : {
- "LABEL" : "negated_component",
- "PLUGIN" : "or",
- "REQUIRES" : [ "rules" ],
- "NOT OR" : [ { "data_is_empty" : { "data" : [ "site:slogan" ] } } ]
- }
-}';
- $or = rules_import($export);
- $this->assertTrue($or->integrityCheck() && $or->isNegated(), 'Negated condition component imported.');
- }
-
- /**
- * Test the named parameter mode.
- */
- function testNamedParameters() {
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->action('rules_action_node_set_title', array('title' => 'foo'));
- $rule->integrityCheck();
-
- // Test the rule.
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
- $rule->execute($node);
- $this->assertTrue($node->title == 'foo', 'Action with named parameters has been correctly executed.');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Make sure Rules aborts when NULL values are used.
- */
- function testAbortOnNULLValues() {
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->action('drupal_message', array('message:select' => 'node:log'));
- $rule->integrityCheck();
-
- // Test the rule.
- $node = $this->drupalCreateNode();
- $node->log = NULL;
- $rule->execute($node);
-
- $text = RulesLog::logger()->render();
- $msg = RulesTestCase::t('The variable or parameter %message is empty.', array('message'));
- $this->assertTrue(strpos($text, $msg) !== FALSE, 'Evaluation aborted due to an empty argument value.');
- }
-}
-
-/**
- * Test rules data wrappers.
- */
-class RulesTestDataCase extends DrupalWebTestCase {
-
- static function getInfo() {
- return array(
- 'name' => 'Rules Data tests',
- 'description' => 'Tests rules data saving and type matching.',
- 'group' => 'Rules',
- );
- }
-
- function setUp() {
- parent::setUp('rules', 'rules_test');
- variable_set('rules_debug_log', 1);
- // Make sure we don't ran over issues with the node_load static cache.
- entity_get_controller('node')->resetCache();
- }
-
- /**
- * Tests intelligently saving data.
- */
- function testDataSaving() {
- $node = $this->drupalCreateNode();
- $state = new RulesState(rule());
- $state->addVariable('node', $node, array('type' => 'node'));
- $wrapper = $state->get('node');
- $node->title = 'test';
- $wrapper->set($node);
- $state->saveChanges('node', $wrapper, FALSE);
-
- $this->assertFalse($this->drupalGetNodeByTitle('test'), 'Changes have not been saved.');
- $state->saveChanges('node', $wrapper, TRUE);
- $this->assertTrue($this->drupalGetNodeByTitle('test'), 'Changes have been saved.');
-
- // Test skipping saving.
- $state->addVariable('node2', $node, array(
- 'type' => 'node',
- 'skip save' => TRUE,
- ));
- $wrapper = $state->get('node2');
- $node->title = 'test2';
- $wrapper->set($node);
- $state->saveChanges('node2', $wrapper, TRUE);
- $this->assertFalse($this->drupalGetNodeByTitle('test2'), 'Changes have not been saved.');
-
- // Try saving a non-entity wrapper, which should result in saving the
- // parent entity containing the property.
- $wrapper = $state->get('node');
- $wrapper->title->set('test3');
- $state->saveChanges('node:title', $wrapper, TRUE);
- $this->assertTrue($this->drupalGetNodeByTitle('test3'), 'Parent entity has been saved.');
- }
-
- /**
- * Test type matching
- */
- function testTypeMatching() {
- $entity = array('type' => 'entity');
- $node = array('type' => 'node');
- $this->assertTrue(RulesData::typesMatch($node, $entity), 'Types match.');
- $this->assertFalse(RulesData::typesMatch($entity, $node), 'Types don\'t match.');
-
- $this->assertTrue(RulesData::typesMatch($node + array('bundle' => 'page'), $node), 'Types match.');
- $this->assertTrue(RulesData::typesMatch($node + array('bundle' => 'page'), $entity), 'Types match.');
- $this->assertTrue(RulesData::typesMatch(array('type' => 'list'), array('type' => 'list')), 'Types match.');
- $this->assertTrue(RulesData::typesMatch($node + array('bundle' => 'page'), $node + array('bundles' => array('page', 'story'))), 'Types match.');
- $this->assertFalse(RulesData::typesMatch($node, $node + array('bundles' => array('page', 'story'))), 'Types don\'t match.');
-
- // Test that a type matches its grand-parent type (text > decimal > integer)
- $this->assertTrue(RulesData::typesMatch(array('type' => 'integer'), array('type' => 'text')), 'Types match.');
- $this->assertFalse(RulesData::typesMatch(array('type' => 'text'), array('type' => 'integer')), 'Types don\'t match.');
- }
-
- /**
- * Tests making use of custom wrapper classes.
- */
- function testCustomWrapperClasses() {
- // Test loading a vocabulary by name, which is done by a custom wrapper.
- $set = rules_action_set(array('vocab' => array('type' => 'taxonomy_vocabulary')), array('vocab'));
- $set->action('drupal_message', array('message:select' => 'vocab:name'));
- $set->integrityCheck();
- list($vocab) = $set->execute('tags');
- $this->assertTrue($vocab->machine_name == 'tags', 'Loaded vocabulary by name.');
-
- // Now test wrapper creation for a direct input argument value.
- $set = rules_action_set(array('term' => array('type' => 'taxonomy_term')));
- $set->action('data_set', array('data:select' => 'term:vocabulary', 'value' => 'tags'));
- $set->integrityCheck();
-
- $vocab = entity_create('taxonomy_vocabulary', array(
- 'name' => 'foo',
- 'machine_name' => 'foo',
- ));
- entity_save('taxonomy_vocabulary', $vocab);
- $term_wrapped = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => $vocab,
- ))->save();
- $set->execute($term_wrapped);
- $this->assertEqual($term_wrapped->vocabulary->machine_name->value(), 'tags', 'Vocabulary name used as direct input value.');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Makes sure the RulesIdentifiableDataWrapper is working correctly.
- */
- function testRulesIdentifiableDataWrapper() {
- $node = $this->drupalCreateNode();
- $wrapper = new RulesTestTypeWrapper('rules_test_type', $node);
- $this->assertTrue($wrapper->value() == $node, 'Data correctly wrapped.');
-
- // Test serializing and make sure only the id is stored.
- $this->assertTrue(strpos(serialize($wrapper), $node->title) === FALSE, 'Data has been correctly serialized.');
- $this->assertEqual(unserialize(serialize($wrapper))->value()->title, $node->title, 'Serializing works right.');
-
- $wrapper2 = unserialize(serialize($wrapper));
- // Test serializing the unloaded wrapper.
- $this->assertEqual(unserialize(serialize($wrapper2))->value()->title, $node->title, 'Serializing works right.');
-
- // Test loading a not more existing node.
- $s = serialize($wrapper2);
- node_delete($node->nid);
- $this->assertFalse(node_load($node->nid), 'Node deleted.');
- try {
- unserialize($s)->value();
- $this->fail("Loading hasn't created an exception.");
- }
- catch (EntityMetadataWrapperException $e) {
- $this->pass("Exception was thrown: ". $e->getMessage());
- }
-
- // Test saving a savable custom, identifiable wrapper.
- $action = rules_action('test_type_save');
- $node = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
- $node->status = 1;
- $action->execute($node);
-
- // Load the node fresh from the db.
- $node = node_load($node->nid, NULL, TRUE);
- $this->assertEqual($node->status, 1, 'Savable non-entity has been saved.');
- }
-}
-
-/**
- * Test triggering rules.
- */
-class RulesTriggerTestCase extends DrupalWebTestCase {
-
- static function getInfo() {
- return array(
- 'name' => 'Reaction Rules',
- 'description' => 'Tests triggering reactive rules.',
- 'group' => 'Rules',
- );
- }
-
- function setUp() {
- parent::setUp('rules', 'rules_test');
- RulesLog::logger()->clear();
- variable_set('rules_debug_log', 1);
- }
-
- protected function createTestRule($action = TRUE, $event = 'node_presave') {
- $rule = rules_reaction_rule();
- $rule->event($event)
- ->condition(rules_condition('data_is', array('data:select' => 'node:status', 'value' => TRUE))->negate())
- ->condition('data_is', array('data:select' => 'node:type', 'value' => 'page'));
- if ($action) {
- $rule->action('rules_action_delete_node');
- }
- return $rule;
- }
-
- /**
- * Tests CRUD for reaction rules - making sure the events are stored properly.
- */
- function testReactiveRuleCreation() {
- $rule = $this->createTestRule();
- $rule->save();
- $result = db_query("SELECT event FROM {rules_trigger} WHERE id = :id", array(':id' => $rule->id));
- $this->assertEqual($result->fetchField(), 'node_presave', 'Associated event has been saved.');
- // Try updating.
- $rule->removeEvent('node_presave');
- $rule->event('node_insert');
- $rule->event('node_update');
- $rule->active = FALSE;
- $rule->integrityCheck()->save();
- $result = db_query("SELECT event FROM {rules_trigger} WHERE id = :id", array(':id' => $rule->id));
- $this->assertEqual($result->fetchCol(), array_values($rule->events()), 'Updated associated events.');
- // Try deleting.
- $rule->delete();
- $result = db_query("SELECT event FROM {rules_trigger} WHERE id = :id", array(':id' => $rule->id));
- $this->assertEqual($result->fetchField(), FALSE, 'Deleted associated events.');
- }
-
- /**
- * Tests creating and triggering a basic reaction rule.
- */
- function testBasicReactionRule() {
- $node = $this->drupalCreateNode(array('type' => 'page'));
- $rule = $this->createTestRule();
- $rule->integrityCheck()->save();
- // Test the basics of the event set work right.
- $event = rules_get_cache('event_node_presave');
- $this->assertEqual(array_keys($event->parameterInfo()), array('node'), 'EventSet returns correct argument info.');
-
- // Trigger the rule by updating the node.
- $nid = $node->nid;
- $node->status = 0;
- node_save($node);
-
- RulesLog::logger()->checkLog();
- $this->assertFalse(node_load($nid), 'Rule successfully triggered and executed');
- //debug(RulesLog::logger()->render());
- }
-
- /**
- * Test a rule using a handler to load a variable.
- */
- function testVariableHandler() {
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
- $rule = $this->createTestRule(FALSE, 'node_update');
- $rule->action('rules_node_publish_action_save', array('node:select' => 'node_unchanged'));
- // Test without recursion prevention to make sure recursive invocations
- // work right too. This rule won't ran in an infinite loop anyway.
- $rule->recursion = TRUE;
- $rule->label = 'rule 1';
- $rule->integrityCheck()->save();
-
- $node->status = 0;
- $node->sticky = 1;
- node_save($node);
-
- RulesLog::logger()->checkLog();
- entity_get_controller('node')->resetCache();
- $node = node_load($node->nid);
-
- $this->assertFalse($node->sticky, 'Parameter has been loaded and saved.');
- $this->assertTrue($node->status, 'Action has been executed.');
-
- // Ensure the rule was evaluated a second time
- $text = RulesLog::logger()->render();
- $msg = RulesTestCase::t('Evaluating conditions of rule %rule 1', array('rule 1'));
- $pos = strpos($text, $msg);
- $pos = ($pos !== FALSE) ? strpos($text, $msg, $pos) : FALSE;
- $this->assertTrue($pos !== FALSE, "Recursion prevented.");
- //debug(RulesLog::logger()->render());
- }
-
- /**
- * Test aborting silently when handlers are not able to load.
- */
- function testVariableHandlerFailing() {
- $rule = $this->createTestRule(FALSE, 'node_presave');
- $rule->action('rules_node_publish_action_save', array('node:select' => 'node_unchanged'));
- $rule->integrityCheck()->save();
-
- // On insert it's not possible to get the unchanged node during presave.
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-
- //debug(RulesLog::logger()->render());
- $text = RulesTestCase::t('Unable to load variable %node_unchanged, aborting.', array('node_unchanged'));
- $this->assertTrue(strpos(RulesLog::logger()->render(), $text) !== FALSE, "Aborted evaluation.");
- }
-
- /**
- * Tests preventing recursive rule invocations by creating a rule that reacts
- * on node-update and generates a node update that would trigger it itself.
- */
- function testRecursionPrevention() {
- $rule = $this->createTestRule(FALSE, 'node_update');
- $rule->action('rules_node_make_sticky_action');
- $rule->integrityCheck()->save();
-
- // Now trigger the rule.
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
- node_save($node);
-
- $text = RulesTestCase::t('Not evaluating reaction rule %label to prevent recursion.', array('label' => $rule->name));
- //debug(RulesLog::logger()->render());
- $this->assertTrue((strpos(RulesLog::logger()->render(), $text) !== FALSE), "Recursion prevented.");
- //debug(RulesLog::logger()->render());
- }
-
- /**
- * Ensure the recursion prevention still allows to let the rule trigger again
- * during evaluation of the same event set, if the event isn't caused by the
- * rule itself - thus we won't run in an infinte loop.
- */
- function testRecursionOnDifferentArguments() {
- // Create rule1 - which might recurse.
- $rule = $this->createTestRule(FALSE, 'node_update');
- $rule->action('rules_node_make_sticky_action');
- $rule->label = 'rule 1';
- $rule->integrityCheck()->save();
-
- // Create rule2 - which triggers rule1 on another node.
- $node2 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
- $rule2 = $this->createTestRule(FALSE, 'node_update');
- $rule2->action('rules_action_load_node', array('nid' => $node2->nid))
- ->action('rules_node_make_sticky_action', array('node:select' => 'node_loaded'));
- $rule2->label = 'rule 2';
- $rule2->save();
-
- // Now trigger both rules by generating the event.
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
- node_save($node);
-
- //debug(RulesLog::logger()->render());
- $text = RulesLog::logger()->render();
- $pos = strpos($text, RulesTestCase::t('Evaluating conditions of rule %rule 1', array('rule 1')));
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Evaluating conditions of rule %rule 2', array('rule 2')), $pos) : FALSE;
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Saved %node_loaded of type %node.', array('node_loaded', 'node')), $pos) : FALSE;
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Evaluating conditions of rule %rule 1', array('rule 1')), $pos) : FALSE;
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Not evaluating reaction rule %rule 2 to prevent recursion', array('rule 2')), $pos) : FALSE;
- $this->assertTrue($pos !== FALSE, 'Rule1 was triggered on the event caused by Rule2.');
- }
-
- /**
- * Tests the provided default rule 'rules_test_default_1'.
- */
- function testDefaultRule() {
- $rule = rules_config_load('rules_test_default_1');
- $this->assertTrue($rule->status & ENTITY_IN_CODE && !($rule->status & ENTITY_IN_DB), 'Default rule can be loaded and has the right status.');
- // Enable.
- $rule->active = TRUE;
- $rule->save();
-
- // Create a node that triggers the rule.
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
- // Clear messages.
- drupal_get_messages();
- // Let event node_update occur.
- node_save($node);
-
- $msg = drupal_get_messages();
- $this->assertEqual($msg['status'][0], 'A node has been updated.', 'Default rule has been triggered.');
- }
-
- /**
- * Tests creating and triggering a reaction rule with event settings.
- */
- function testEventSettings() {
- $rule = rules_reaction_rule();
- $rule->event('node_presave', array('bundle' => 'article'))
- ->condition('data_is_empty', array('data:select' => 'node:field-tags'))
- ->action('node_publish', array('node:select' => 'node'));
- $rule->integrityCheck()->save();
-
- $node = $this->drupalCreateNode(array('type' => 'page', 'status' => 0));
- $this->assertEqual($node->status, 0, 'Rule has not been triggered.');
- $node = $this->drupalCreateNode(array('type' => 'article', 'status' => 0));
- $this->assertEqual($node->status, 1, 'Rule has been triggered.');
- RulesLog::logger()->checkLog();
-
- // Make sure an invalid bundle raises integrity problems.
- $rule->event('node_presave', array('bundle' => 'invalid'));
- try {
- $rule->integrityCheck();
- $this->fail('Integrity check failed.');
- }
- catch (RulesIntegrityException $e) {
- $this->pass('Integrity check failed: ' . $e);
- }
- }
-}
-
-/**
- * Tests provided module integration.
- */
-class RulesIntegrationTestCase extends DrupalWebTestCase {
-
- static function getInfo() {
- return array(
- 'name' => 'Rules Core Integration',
- 'description' => 'Tests provided integration for drupal core.',
- 'group' => 'Rules',
- );
- }
-
- function setUp() {
- parent::setUp('rules', 'rules_test', 'php', 'path');
- RulesLog::logger()->clear();
- variable_set('rules_debug_log', 1);
- }
-
- /**
- * Just make sure the access callback run without errors.
- */
- function testAccessCallbacks() {
- $cache = rules_get_cache();
- foreach (array('action', 'condition', 'event') as $type) {
- foreach (rules_fetch_data($type . '_info') as $name => $info) {
- if (isset($info['access callback'])) {
- $info['access callback']($type, $name);
- }
- }
- }
- }
-
- /**
- * Test data integration.
- */
- function testDataIntegration() {
- // Test data_create action.
- $action = rules_action('data_create', array(
- 'type' => 'log_entry',
- 'param_type' => 'rules_test',
- 'param_message' => 'Rules test log message',
- 'param_severity' => WATCHDOG_WARNING,
- 'param_request_uri' => 'http://example.com',
- 'param_link' => '',
- ));
- $action->access();
- $action->execute();
- $text = RulesLog::logger()->render();
- $pos = strpos($text, RulesTestCase::t('Added the provided variable %data_created of type %log_entry', array('data_created', 'log_entry')));
- $this->assertTrue($pos !== FALSE, 'Data of type log entry has been created.');
-
-
- // Test variable_add action.
- $action = rules_action('variable_add', array(
- 'type' => 'text_formatted',
- 'value' => array(
- 'value' => 'test text',
- 'format' => 1,
- )
- ));
- $action->access();
- $action->execute();
- $text = RulesLog::logger()->render();
- $pos = strpos($text, RulesTestCase::t('Added the provided variable %variable_added of type %text_formatted', array('variable_added', 'text_formatted')));
- $this->assertTrue($pos !== FALSE, 'Data of type text formatted has been created.');
-
-
- // Test using the list actions.
- $rule = rule(array(
- 'list' => array(
- 'type' => 'list',
- 'label' => 'A list of text',
- )
- ));
- $rule->action('list_add', array('list:select' => 'list', 'item' => 'bar2'));
- $rule->action('list_add', array('list:select' => 'list', 'item' => 'bar', 'pos' => 'start'));
- $rule->action('list_add', array('list:select' => 'list', 'item' => 'bar', 'unique' => TRUE));
- $rule->action('list_remove', array('list:select' => 'list', 'item' => 'bar2'));
- $list = entity_metadata_wrapper('list', array('foo', 'foo2'));
- $rule->execute($list);
- RulesLog::logger()->checkLog();
- $this->assertEqual($list->value(), array('bar', 'foo', 'foo2'), 'List items removed and added.');
- $this->assertFalse(rules_condition('list_contains')->execute($list, 'foo-bar'), 'Condition "List item contains" evaluates to FALSE');
- $this->assertTrue(rules_condition('list_contains')->execute($list, 'foo'), 'Condition "List item contains" evaluates to TRUE');
- //debug(RulesLog::logger()->render());
-
- // Test data_is condition with IN operation.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('data_is', array('data:select' => 'node:title', 'op' => 'IN', 'value' => array('foo', 'bar')));
- $rule->action('data_set', array('data:select' => 'node:title', 'value' => 'bar'));
- $rule->integrityCheck();
-
- $node = $this->drupalCreateNode(array('title' => 'foo'));
- $rule->execute($node);
- $this->assertEqual($node->title, 'bar', "Data comparison using IN operation evaluates to TRUE.");
-
-
- // Test Condition: Data is empty.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('data_is_empty', array('data:select' => 'node:title'));
- $rule->action('data_set', array('data:select' => 'node:title', 'value' => 'bar'));
- $rule->integrityCheck();
-
- // Data is empty condition evaluates to TRUE
- // for node with empty title, action sets title to 'bar'.
- $node = $this->drupalCreateNode(array('title' => '', 'type' => 'article'));
- $rule->execute($node);
- $this->assertEqual($node->title, 'bar', "Data is empty condition evaluates to TRUE for node with empty title, action sets title to 'bar'.");
-
- // Data is empty condition evaluates to FALSE
- // for node with title 'foo', action is not executed.
- $node = $this->drupalCreateNode(array('title' => 'foo', 'type' => 'article'));
- $rule->execute($node);
- $this->assertEqual($node->title, 'foo', "Data is empty condition evaluates to FALSE for node with title 'foo', action is not executed.");
-
- // Data is empty condition evaluates to TRUE for the parent of a
- // not existing term in the tags field of the node.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('node_is_of_type', array('type' => array('article')));
- $rule->condition('data_is_empty', array('data:select' => 'node:field-tags:0:parent'));
- $rule->action('data_set', array('data:select' => 'node:title', 'value' => 'bar'));
- $rule->integrityCheck();
- $node = $this->drupalCreateNode(array('title' => 'foo', 'type' => 'article'));
- $rule->execute($node);
- $this->assertEqual($node->title, 'bar', "Data is empty condition evaluates to TRUE for not existing data structures");
-
- // Test Action: Calculate a value.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->action('data_calc', array('input_1:select' => 'node:nid', 'op' => '*', 'input_2' => 2));
- $rule->action('data_set', array('data:select' => 'node:title', 'value:select' => 'result'));
- $rule->integrityCheck();
- $rule->execute($node);
- $this->assertEqual($node->title, $node->nid * 2, "Value has been calculated.");
-
- // Test moving a date.
- $action_set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
- $action_set->action('data_calc', array('input_1:select' => 'date', 'op' => '+', 'input_2' => 3600))
- ->action('data_set', array('data:select' => 'date', 'value:select' => 'result'));
- $action_set->integrityCheck();
- list($result) = $action_set->execute(REQUEST_TIME);
- $this->assertEqual($result, REQUEST_TIME + 3600, 'Used data calculation action to move a date by an hour.');
-
- // Test data type conversion action.
- $set = rules_action_set(array('result' => array('type' => 'text', 'parameter' => FALSE)), array('result'));
- $set->action('data_convert', array('type' => 'text', 'value:select' => 'site:login-url'));
- $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
- list($result) = $set->execute();
- $set->integrityCheck();
- $this->assertEqual($result, url('user', array('absolute' => TRUE)), 'Converted URI to text.');
-
- $set = rules_action_set(array(
- 'result' => array('type' => 'integer', 'parameter' => FALSE),
- 'source' => array('type' => 'text'),
- ), array('result'));
- $set->action('data_convert', array('type' => 'integer', 'value:select' => 'source'));
- $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
- list($result) = $set->execute('9.4');
- $this->assertEqual($result, 9, 'Converted decimal to integer using rounding.');
-
- $set = rules_action_set(array(
- 'result' => array('type' => 'integer', 'parameter' => FALSE),
- 'source' => array('type' => 'text'),
- ), array('result'));
- $set->action('data_convert', array('type' => 'integer', 'value:select' => 'source', 'rounding_behavior' => 'down'));
- $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
- list($result) = $set->execute('9.6');
- $this->assertEqual($result, 9, 'Converted decimal to integer using roundin behavio down.');
-
- $set = rules_action_set(array(
- 'result' => array('type' => 'integer', 'parameter' => FALSE),
- 'source' => array('type' => 'text'),
- ), array('result'));
- $set->action('data_convert', array('type' => 'integer', 'value:select' => 'source', 'rounding_behavior' => 'up'));
- $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
- list($result) = $set->execute('9.4');
- $this->assertEqual($result, 10, 'Converted decimal to integer using rounding behavior up.');
-
- // Test text matching condition.
- $result = rules_condition('text_matches')->execute('my-text', 'text', 'contains');
- $result2 = rules_condition('text_matches')->execute('my-text', 'tex2t', 'contains');
- $this->assertTrue($result && !$result2, 'Text matching condition using operation contain evaluated.');
-
- $result = rules_condition('text_matches')->execute('my-text', 'my', 'starts');
- $result2 = rules_condition('text_matches')->execute('my-text', 'text', 'starts');
- $this->assertTrue($result && !$result2, 'Text matching condition using operation starts evaluated.');
-
- $result = rules_condition('text_matches')->execute('my-text', 'text', 'ends');
- $result2 = rules_condition('text_matches')->execute('my-text', 'my', 'ends');
- $this->assertTrue($result && !$result2, 'Text matching condition using operation ends evaluated.');
-
- $result = rules_condition('text_matches')->execute('my-text', 'me?y-texx?t', 'regex');
- $result2 = rules_condition('text_matches')->execute('my-text', 'me+y-texx?t', 'regex');
- $this->assertTrue($result && !$result2, 'Text matching condition using operation regex evaluated.');
- }
-
- /**
- * Tests entity related integration.
- */
- function testEntityIntegration() {
- global $user;
-
- $page = $this->drupalCreateNode(array('type' => 'page'));
- $article = $this->drupalCreateNode(array('type' => 'article'));
-
- $result = rules_condition('entity_field_access')
- ->execute(entity_metadata_wrapper('node', $article), 'field_tags');
- $this->assertTrue($result);
-
- // Test entiy_is_of_bundle condition.
- $result = rules_condition('entity_is_of_bundle', array(
- 'type' => 'node',
- 'bundle' => array('article'),
- ))->execute(entity_metadata_wrapper('node', $page));
- $this->assertFalse($result, 'Entity is of bundle condition has not been met.');
- $result = rules_condition('entity_is_of_bundle', array(
- 'type' => 'node',
- 'bundle' => array('article'),
- ))->execute(entity_metadata_wrapper('node', $article));
- $this->assertTrue($result, 'Entity is of bundle condition has been met.');
-
- // Also test a full rule so the integrity check must work.
- $term_wrapped = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => 1,
- ))->save();
- $rule = rule(array(
- 'node' => array('type' => 'node'),
- ));
- $rule->condition('entity_is_of_bundle', array(
- 'entity:select' => 'node',
- 'bundle' => array('article'),
- ));
- $rule->action('data_set', array('data:select' => 'node:field_tags', 'value' => array($term_wrapped->getIdentifier())));
- $rule->integrityCheck();
- $rule->execute($article);
- $this->assertEqual($term_wrapped->getIdentifier(), $article->field_tags[LANGUAGE_NONE][0]['tid'], 'Entity is of bundle condition has been met.');
-
- // Test again using an entity variable.
- $article = $this->drupalCreateNode(array('type' => 'article'));
- $rule = rule(array(
- 'entity' => array('type' => 'entity'),
- ));
- $rule->condition('entity_is_of_bundle', array(
- 'entity:select' => 'entity',
- 'type' => 'node',
- 'bundle' => array('article'),
- ));
- $rule->action('data_set', array('data:select' => 'entity:field_tags', 'value' => array($term_wrapped->getIdentifier())));
- $rule->integrityCheck();
- $rule->execute(entity_metadata_wrapper('node', $article));
- $this->assertEqual($term_wrapped->getIdentifier(), $article->field_tags[LANGUAGE_NONE][0]['tid'], 'Entity is of bundle condition has been met.');
-
- // Test CRUD actions.
- $action = rules_action('entity_create', array(
- 'type' => 'node',
- 'param_type' => 'page',
- 'param_title' => 'foo',
- 'param_author' => $GLOBALS['user'],
- ));
- $action->access();
- $action->execute();
- $text = RulesLog::logger()->render();
- $pos = strpos($text, RulesTestCase::t('Added the provided variable %entity_created of type %node', array('entity_created', 'node')));
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Saved %entity_created of type %node.', array('entity_created', 'node')), $pos) : FALSE;
- $this->assertTrue($pos !== FALSE, 'Data has been created and saved.');
-
- $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
- $rule = rule();
- $rule->action('entity_fetch', array('type' => 'node', 'id' => $node->nid, 'entity_fetched:var' => 'node'));
- $rule->action('entity_save', array('data:select' => 'node', 'immediate' => TRUE));
- $rule->action('entity_delete', array('data:select' => 'node'));
- $rule->access();
- $rule->integrityCheck()->execute();
-
- $text = RulesLog::logger()->render();
- $pos = strpos($text, RulesTestCase::t('Evaluating the action %entity_fetch.', array('entity_fetch')));
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Added the provided variable %node of type %node', array('node')), $pos) : FALSE;
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Saved %node of type %node.', array('node')), $pos) : FALSE;
- $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Evaluating the action %entity_delete.', array('entity_delete')), $pos) : FALSE;
- $this->assertTrue($pos !== FALSE, 'Data has been fetched, saved and deleted.');
- //debug(RulesLog::logger()->render());
-
-
-
- $node = entity_property_values_create_entity('node', array(
- 'type' => 'article',
- 'author' => $user,
- 'title' => 'foo',
- ))->value();
- $term_wrapped = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => 1,
- ))->save();
-
- // Test asserting the field and using it afterwards.
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->condition('entity_has_field', array('entity:select' => 'node', 'field' => 'field_tags'));
- $rule->condition('entity_is_new', array('entity:select' => 'node'));
- $rule->action('list_add', array('list:select' => 'node:field-tags', 'item' => $term_wrapped));
- $rule->integrityCheck();
- $rule->execute($node);
-
- $tid = $term_wrapped->getIdentifier();
- $this->assertEqual(array_values($node->field_tags[LANGUAGE_NONE]), array(0 => array('tid' => $tid)), 'Entity has field conditions evaluted.');
-
- // Test loading a non-node entity.
- $action = rules_action('entity_fetch', array('type' => 'taxonomy_term', 'id' => $tid));
- list($term) = $action->execute();
- $this->assertEqual($term->tid, $tid, 'Fetched a taxonomy term using "entity_fetch".');
-
- // Test the entity is of type condition.
- $rule = rule(array('entity' => array('type' => 'entity', 'label' => 'entity')));
- $rule->condition('entity_is_of_type', array('type' => 'node'));
- $rule->action('data_set', array('data:select' => 'entity:title', 'value' => 'bar'));
- $rule->integrityCheck();
- $rule->execute(entity_metadata_wrapper('node', $node));
-
- $this->assertEqual(entity_metadata_wrapper('node', $node->nid)->title->value(), 'bar', 'Entity is of type condition correctly asserts the entity type.');
-
-
- // Test the entity_query action.
- $node = $this->drupalCreateNode(array('type' => 'page', 'title' => 'foo2'));
- $rule = rule();
- $rule->action('entity_query', array('type' => 'node', 'property' => 'title', 'value' => 'foo2'))
- ->action('data_set', array('data:select' => 'entity_fetched:0:title', 'value' => 'bar'));
- $rule->access();
- $rule->integrityCheck();
- $rule->execute();
- $node = node_load($node->nid);
- $this->assertEqual('bar', $node->title, 'Fetched a node by title and modified it.');
-
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test integration for the taxonomy module.
- */
- function testTaxonomyIntegration() {
- $term = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => 1,
- ))->value();
- $term2 = clone $term;
- taxonomy_term_save($term);
- taxonomy_term_save($term2);
-
- $tags[LANGUAGE_NONE][0]['tid'] = $term->tid;
- $node = $this->drupalCreateNode(array('title' => 'foo', 'type' => 'article', 'field_tags' => $tags));
-
- // Test assigning and remove a term from an article.
- $rule = rule(array('node' => array('type' => 'node', 'bundle' => 'article')));
- $term_wrapped = rules_wrap_data($term->tid, array('type' => 'taxonomy_term'));
- $term_wrapped2 = rules_wrap_data($term2->tid, array('type' => 'taxonomy_term'));
- $rule->action('list_add', array('list:select' => 'node:field-tags', 'item' => $term_wrapped2));
- $rule->action('list_remove', array('list:select' => 'node:field-tags', 'item' => $term_wrapped));
- $rule->execute($node);
- RulesLog::logger()->checkLog();
- $this->assertEqual(array_values($node->field_tags[LANGUAGE_NONE]), array(0 => array('tid' => $term2->tid)), 'Term removed and added from a node.');
-
- // Test using the taxonomy term reference field on a term object.
- $field_name = drupal_strtolower($this->randomName() . '_field_name');
- $field = field_create_field(array(
- 'field_name' => $field_name,
- 'type' => 'taxonomy_term_reference',
- // Set cardinality to unlimited for tagging.
- 'cardinality' => FIELD_CARDINALITY_UNLIMITED,
- 'settings' => array(
- 'allowed_values' => array(
- array(
- 'vocabulary' => 'tags',
- 'parent' => 0,
- ),
- ),
- ),
- ));
- $instance = array(
- 'field_name' => $field_name,
- 'entity_type' => 'taxonomy_term',
- 'bundle' => 'tags', // Machine name of vocabulary.
- 'label' => $this->randomName() . '_label',
- 'description' => $this->randomName() . '_description',
- 'weight' => mt_rand(0, 127),
- 'widget' => array(
- 'type' => 'taxonomy_autocomplete',
- 'weight' => -4,
- ),
- 'display' => array(
- 'default' => array(
- 'type' => 'taxonomy_term_reference_link',
- 'weight' => 10,
- ),
- ),
- );
- field_create_instance($instance);
-
- $term1 = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => 1,
- ))->save();
- $term2 = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => 1,
- ))->save();
-
- // Test asserting the term reference field and using it afterwards.
- $rule = rule(array('taxonomy_term' => array('type' => 'taxonomy_term')));
- $rule->condition('entity_has_field', array('entity:select' => 'taxonomy-term', 'field' => $field_name));
- // Add $term2 to $term1 using the term reference field.
- $selector = str_replace('_', '-', 'taxonomy_term:' . $field_name);
- $rule->action('list_add', array('list:select' => $selector, 'item' => $term2));
- $rule->integrityCheck();
- $rule->execute($term1);
-
- RulesLog::logger()->checkLog();
- $this->assertEqual($term1->{$field_name}[0]->getIdentifier(), $term2->getIdentifier(), 'Rule appended a term to the term reference field on a term.');
-
- // Test an action set for merging term parents, which is provided as default
- // config.
- $term = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => 1,
- 'parent' => array($term1->value()),
- ))->save();
-
- $action = rules_action('component_rules_retrieve_term_parents');
- list($parents) = $action->execute(array($term->getIdentifier()));
- $this->assertTrue($parents[0]->tid == $term1->getIdentifier(), 'Invoked component to retrieve term parents.');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test integration for the node module.
- */
- function testNodeIntegration() {
- $tests = array(
- array('node_unpublish', 'node_is_published', 'node_publish', 'status'),
- array('node_make_unsticky', 'node_is_sticky', 'node_make_sticky', 'sticky'),
- array('node_unpromote', 'node_is_promoted', 'node_promote', 'promote'),
- );
- $node = $this->drupalCreateNode(array('type' => 'page', 'status' => 1, 'sticky' => 1, 'promote' => 1));
-
- foreach ($tests as $info) {
- list($action1, $condition, $action2, $property) = $info;
- rules_action($action1)->execute($node);
-
- $node = node_load($node->nid, NULL, TRUE);
- $this->assertFalse($node->$property, 'Action has permanently disabled node '. $property);
- $return = rules_condition($condition)->execute($node);
- $this->assertFalse($return, 'Condition determines node '. $property . ' is disabled.');
-
- rules_action($action2)->execute($node);
- $node = node_load($node->nid, NULL, TRUE);
- $this->assertTrue($node->$property, 'Action has permanently enabled node '. $property);
- $return = rules_condition($condition)->execute($node);
- $this->assertTrue($return, 'Condition determines node '. $property . ' is enabled.');
- }
-
- $return = rules_condition('node_is_of_type', array('type' => array('page', 'article')))->execute($node);
- $this->assertTrue($return, 'Condition determines node is of type page.');
- $return = rules_condition('node_is_of_type', array('type' => array('article')))->execute($node);
- $this->assertFalse($return, 'Condition determines node is not of type article.');
-
-
- // Test auto saving of a new node after it has been inserted into the DB.
- $rule = rules_reaction_rule();
- $rand = $this->randomName();
- $rule->event('node_insert')
- ->action('data_set', array('data:select' => 'node:title', 'value' => $rand));
- $rule->save('test');
- $node = $this->drupalCreateNode();
- $node = node_load($node->nid);
- $this->assertEqual($node->title, $rand, 'Node title is correct.');
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test integration for the user module.
- */
- function testUserIntegration() {
- $rid = $this->drupalCreateRole(array('administer nodes'), 'foo');
- $user = $this->drupalCreateUser();
-
- // Test assigning a role with the list_add action.
- $rule = rule(array('user' => array('type' => 'user')));
- $rule->action('list_add', array('list:select' => 'user:roles', 'item' => $rid));
- $rule->execute($user);
- $this->assertTrue(isset($user->roles[$rid]), 'Role assigned to user.');
-
- // Test removing a role with the list_remove action.
- $rule = rule(array('user' => array('type' => 'user')));
- $rule->action('list_remove', array('list:select' => 'user:roles', 'item' => $rid));
- $rule->execute($user);
- $this->assertTrue(!isset($user->roles[$rid]), 'Role removed from user.');
-
- // Test assigning a role with user_add_role action.
- $rule = rule(array('user' => array('type' => 'user')));
- $rule->action('user_add_role', array('account:select' => 'user', 'roles' => array($rid)));
- $rule->execute($user);
-
- $user = user_load($user->uid, TRUE);
- $result = rules_condition('user_has_role', array('roles' => array($rid)))->execute($user);
- $this->assertTrue($result, 'Role assigned to user.');
-
- // Test removing a role with the user_remove_role action.
- $rule = rule(array('user' => array('type' => 'user')));
- $rule->action('user_remove_role', array('account:select' => 'user', 'roles' => array($rid)));
- $rule->execute($user);
-
- $user = user_load($user->uid, TRUE);
- $result = rules_condition('user_has_role', array('roles' => array($rid)))->execute($user);
- $this->assertFalse($result, 'Role removed from user.');
-
- // Test user blocking.
- rules_action('user_block')->execute($user);
- $user = user_load($user->uid, TRUE);
- $this->assertTrue(rules_condition('user_is_blocked')->execute($user), 'User has been blocked.');
-
- rules_action('user_unblock')->execute($user);
- $user = user_load($user->uid, TRUE);
- $this->assertFalse(rules_condition('user_is_blocked')->execute($user), 'User has been unblocked.');
-
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test integration for the php module.
- */
- function testPHPIntegration() {
- $node = $this->drupalCreateNode(array('title' => 'foo'));
- $rule = rule(array('var_name' => array('type' => 'node')));
- $rule->condition('php_eval', array('code' => 'return TRUE;'))
- ->action('php_eval', array('code' => 'drupal_set_message("Executed-" . $var_name->title);'))
- ->action('drupal_message', array('message' => 'Title: title; ?> Token: [var_name:title]'));
-
- $rule->execute($node);
- $rule->access();
- RulesLog::logger()->checkLog();
- $msg = drupal_get_messages();
- $this->assertEqual(array_pop($msg['status']), "Title: foo Token: foo", 'PHP input evaluation has been applied.');
- $this->assertEqual(array_pop($msg['status']), "Executed-foo", 'PHP code condition and action have been evaluated.');
-
- // Test PHP data processor
- $rule = rule(array('var_name' => array('type' => 'node')));
- $rule->action('drupal_message', array(
- 'message:select' => 'var_name:title',
- 'message:process' => array(
- 'php' => array('code' => 'return "Title: $value";')
- ),
- ));
- $rule->execute($node);
- $rule->access();
- RulesLog::logger()->checkLog();
- $msg = drupal_get_messages();
- $this->assertEqual(array_pop($msg['status']), "Title: foo", 'PHP data processor has been applied.');
- }
-
- /**
- * Test the "rules_core" integration.
- */
- function testRulesCoreIntegration() {
- // Make sure the date input evaluator evaluates properly using strtotime().
- $node = $this->drupalCreateNode(array('title' => 'foo'));
- $rule = rule(array('node' => array('type' => 'node')));
- $rule->action('data_set', array('data:select' => 'node:created', 'value' => '+1 day'));
-
- $rule->execute($node);
- RulesLog::logger()->checkLog();
- $node = node_load($node->nid, NULL, TRUE);
- $now = RulesDateInputEvaluator::gmstrtotime('now');
- // Tolerate a difference of a second.
- $this->assertTrue(abs($node->created - $now - 86400) <= 1, 'Date input has been evaluated.');
-
- // Test using a numeric offset.
- $rule = rule(array('number' => array('type' => 'decimal')), array('number'));
- $rule->action('data_set', array(
- 'data:select' => 'number',
- 'value:select' => 'number',
- 'value:process' => array(
- 'num_offset' => array('value' => 1),
- ),
- ));
- $rule->integrityCheck();
- list($result) = $rule->execute(10);
- $this->assertTrue($result == 11, 'Numeric offset has been applied');
-
- // Test using a date offset.
- $set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
- $set->action('data_set', array(
- 'data:select' => 'date',
- 'value:select' => 'date',
- 'value:process' => array(
- 'date_offset' => array('value' => 1000),
- ),
- ));
- $date = date_create("14 Mar 1984 10:19:23 +01:00")->format('U');
- list($result) = $set->execute($date);
- $this->assertEqual($result, $date + 1000, 'Date offset in seconds has been added.');
-
- // Test using a negative offset of 2 months.
- $set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
- $set->action('data_set', array(
- 'data:select' => 'date',
- 'value:select' => 'date',
- 'value:process' => array(
- 'date_offset' => array('value' => - 86400 * 30 * 2),
- ),
- ));
- $date = date_create("14 Mar 1984 10:19:23 +01:00")->format('U');
- list($result) = $set->execute($date);
- $this->assertEqual($result, date_create("14 Jan 1984 10:19:23 +01:00")->format('U'), 'Date offset of -2 months has been added.');
-
- // Test using a positive offset of 1 year 6 months and 30 minutes.
- $set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
- $set->action('data_set', array(
- 'data:select' => 'date',
- 'value:select' => 'date',
- 'value:process' => array(
- 'date_offset' => array('value' => 86400 * 30 * 18 + 30 * 60),
- ),
- ));
- $date = date_create("14 Mar 1984 10:19:23 +01:00")->format('U');
- list($result) = $set->execute($date);
- $this->assertEqual($result, date_create("14 Sep 1985 10:49:23 +01:00")->format('U'), 'Date offset of 1 year 6 months and 30 minutes has been added.');
-
- RulesLog::logger()->checkLog();
- }
-
- /**
- * Test site/system integration.
- */
- function testSystemIntegration() {
- // Test using the 'site' variable.
- $condition = rules_condition('data_is', array('data:select' => 'site:current-user:name', 'value' => $GLOBALS['user']->name));
- $this->assertTrue($condition->execute(), 'Retrieved the current user\'s name.');
- // Another test using a token replacement.
- $condition = rules_condition('data_is', array('data:select' => 'site:current-user:name', 'value' => '[site:current-user:name]'));
- $this->assertTrue($condition->execute(), 'Replaced the token for the current user\'s name.');
-
- // Test breadcrumbs and drupal set message.
- $rule = rules_reaction_rule();
- $rule->event('init')
- ->action('breadcrumb_set', array('titles' => array('foo'), 'paths' => array('bar')))
- ->action('drupal_message', array('message' => 'A message.'));
- $rule->save('test');
-
- $this->drupalGet('node');
- $this->assertLink('foo', 0, 'Breadcrumb has been set.');
- $this->assertText('A message.', 'Drupal message has been shown.');
-
- // Test the page redirect.
- $node = $this->drupalCreateNode();
- $rule = rules_reaction_rule();
- $rule->event('node_view')
- ->action('redirect', array('url' => 'user'));
- $rule->save('test2');
-
- $this->drupalGet('node/' . $node->nid);
- $this->assertEqual($this->getUrl(), url('user', array('absolute' => TRUE)), 'Redirect has been issued.');
-
- // Also test using a url including a fragment.
- $actions = $rule->actions();
- $actions[0]->settings['url'] = 'user#fragment';
- $rule->save();
-
- $this->drupalGet('node/' . $node->nid);
- $this->assertEqual($this->getUrl(), url('user', array('absolute' => TRUE, 'fragment' => 'fragment')), 'Redirect has been issued.');
-
-
- // Test sending mail.
- $settings = array('to' => 'mail@example.com', 'subject' => 'subject', 'message' => 'hello.');
- rules_action('mail', $settings)->execute();
- $this->assertMail('to', 'mail@example.com', 'Mail has been sent.');
- $this->assertMail('from', variable_get('site_mail', ini_get('sendmail_from')), 'Default from address has been used');
-
- rules_action('mail', $settings + array('from' => 'sender@example.com'))->execute();
- $this->assertMail('from', 'sender@example.com', 'Specified from address has been used');
-
- // Test sending mail to all users of a role. First make sure there is a
- // custom role and a user for it.
- $user = $this->drupalCreateUser(array('administer nodes'));
- $roles = $user->roles;
- // Remove the authenticate role so we only use the new role created by
- // drupalCreateUser().
- unset($roles[DRUPAL_AUTHENTICATED_RID]);
- rules_action('mail_to_users_of_role', $settings + array('roles' => array_keys($roles)))->execute();
- $this->assertMail('to', $user->mail, 'Mail to users of a role has been sent.');
-
- // Test reacting on new log entries and make sure the log entry is usable.
- $rule = rules_reaction_rule();
- $rule->event('watchdog');
- $rule->action('drupal_message', array('message:select' => 'log_entry:message'));
- $rule->integrityCheck()->save('test_watchdog');
-
- watchdog('php', 'test %message', array('%message' => 'message'));
- $msg = drupal_get_messages();
- $this->assertEqual(array_pop($msg['status']), t('test %message', array('%message' => 'message')), 'Watchdog event occurred and log entry properties can be used.');
- }
-
- /**
- * Tests the path module integration.
- */
- function testPathIntegration() {
- rules_action('path_alias')->execute('foo', 'bar');
- $path = path_load('foo');
- $this->assertTrue($path['alias'] == 'bar', 'URL alias has been created.');
-
- $alias_exists = rules_condition('path_alias_exists', array('alias' => 'bar'))->execute();
- $this->assertTrue($alias_exists, 'Created URL alias exists.');
-
- $has_alias = rules_condition('path_has_alias', array('source' => 'foo'))->execute();
- $this->assertTrue($has_alias, 'System path has an alias.');
-
- // Test node alias action.
- $node = $this->drupalCreateNode();
- rules_action('node_path_alias')->execute($node, 'test');
- $path = path_load("node/$node->nid");
- $this->assertTrue($path['alias'] == 'test', 'Node URL alias has been created.');
-
- // Test term alias action.
- $term = entity_property_values_create_entity('taxonomy_term', array(
- 'name' => $this->randomName(),
- 'vocabulary' => 1,
- ))->value();
- rules_action('taxonomy_term_path_alias')->execute($term, 'term-test');
- $path = path_load("taxonomy/term/$term->tid");
- $this->assertTrue($path['alias'] == 'term-test', 'Term URL alias has been created.');
-
- RulesLog::logger()->checkLog();
- }
-}
-
-/**
- * Test event dispatcher functionality.
- */
-class RulesEventDispatcherTestCase extends DrupalWebTestCase {
-
- static function getInfo() {
- return array(
- 'name' => 'Rules event dispatchers',
- 'description' => 'Tests event dispatcher functionality.',
- 'group' => 'Rules',
- );
- }
-
- function setUp() {
- parent::setUp('rules', 'rules_test');
- }
-
- /**
- * Tests start and stop functionality.
- */
- public function testStartAndStop() {
- $handler = rules_get_event_handler('rules_test_event');
- $rule = rules_reaction_rule();
- $rule->event('rules_test_event');
-
- // The handler should not yet be watching.
- $this->assertFalse($handler->isWatching());
-
- // Once saved, the event cache rebuild should start the watcher.
- $rule->save();
- RulesEventSet::rebuildEventCache();
- $this->assertTrue($handler->isWatching());
-
- // Deleting should stop the watcher.
- $rule->delete();
- $this->assertFalse($handler->isWatching());
- }
-
- /**
- * Tests start and stop functionality when used with multiple events.
- */
- public function testStartAndStopMultiple() {
- $handler = rules_get_event_handler('rules_test_event');
-
- // Initially, the task handler should not be watching.
- $this->assertFalse($handler->isWatching());
-
- // Set up five rules that all use the same event.
- $rules = array();
- foreach (array(1, 2, 3, 4, 5) as $key) {
- $rules[$key] = rules_reaction_rule();
- $rules[$key]->event('rules_test_event');
- $rules[$key]->save();
- }
-
- // Once saved, the event cache rebuild should start the watcher.
- RulesEventSet::rebuildEventCache();
- $this->assertTrue($handler->isWatching());
-
- // It should continue watching until all events are deleted.
- foreach ($rules as $key => $rule) {
- $rule->delete();
- $this->assertEqual($key !== 5, $handler->isWatching());
- }
- }
-}
diff --git a/modules/rules/js/autocomplete.js b/modules/rules/js/autocomplete.js
deleted file mode 100644
index a521f62..0000000
--- a/modules/rules/js/autocomplete.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * @file
- * Forked from core's autocomplete.
- */
-
-(function ($, Drupal) {
-
- 'use strict';
-
- var autocomplete;
-
- /**
- * JQuery UI autocomplete source callback.
- *
- * @param {object} request
- * The request object.
- * @param {function} response
- * The function to call with the response.
- */
- function sourceData(request, response) {
- var elementId = this.element.attr('id');
-
- if (!(elementId in autocomplete.cache)) {
- autocomplete.cache[elementId] = {};
- }
-
- /**
- * Transforms the data object into an array and update autocomplete results.
- *
- * @param {object} data
- * The data sent back from the server.
- */
- function sourceCallbackHandler(data) {
- autocomplete.cache[elementId][term] = data;
-
- response(data);
- }
-
- // Get the desired term and construct the autocomplete URL for it.
- var term = request.term;
-
- // Check if the term is already cached.
- if (autocomplete.cache[elementId].hasOwnProperty(term)) {
- response(autocomplete.cache[elementId][term]);
- }
- else {
- var options = $.extend({success: sourceCallbackHandler, data: {q: term}}, autocomplete.ajax);
- $.ajax(this.element.attr('data-autocomplete-path'), options);
- }
- }
-
- /**
- * Handles an autocompletefocus event.
- *
- * @return {bool}
- * Always returns false.
- */
- function focusHandler() {
- return false;
- }
-
- /**
- * Handles the autocomplete selection event.
- *
- * Restarts autocompleting when the selection ends in a dot, for nested data
- * selectors.
- *
- * @param {object} event
- * The event object.
- * @param {object} ui
- * The UI object holding the selected value.
- */
- function selectHandler(event, ui) {
- var input_value = ui.item.value;
- if (input_value.substr(input_value.length - 1) === '.') {
- $(event.target).trigger('keydown');
- }
- }
-
- /**
- * Override jQuery UI _renderItem function to output HTML by default.
- *
- * @param {jQuery} ul
- * jQuery collection of the ul element.
- * @param {object} item
- * The list item to append.
- *
- * @return {jQuery}
- * jQuery collection of the ul element.
- */
- function renderItem(ul, item) {
- return $('')
- .append($('').html(item.label))
- .appendTo(ul);
- }
-
- /**
- * Attaches the autocomplete behavior to all required fields.
- *
- * @type {Drupal~behavior}
- *
- * @prop {Drupal~behaviorAttach} attach
- * Attaches the autocomplete behaviors.
- * @prop {Drupal~behaviorDetach} detach
- * Detaches the autocomplete behaviors.
- */
- Drupal.behaviors.rules_autocomplete = {
- attach: function (context) {
- // Act on textfields with the "rules-autocomplete" class.
- var $autocomplete = $(context).find('input.rules-autocomplete').once('autocomplete');
- if ($autocomplete.length) {
-
- var closing = false;
-
- $.extend(autocomplete.options, {
- close: function() {
- // Avoid double-pop-up issue.
- closing = true;
- setTimeout(function() {
- closing = false;
- }, 300);
- }
- });
- // Use jQuery UI Autocomplete on the textfield.
- $autocomplete.autocomplete(autocomplete.options)
- .each(function() {
- $(this).data('ui-autocomplete')._renderItem = autocomplete.options.renderItem;
- // Immediately pop out the autocomplete when the field gets focus.
- $(this).focus(function() {
- if (!closing) {
- $(this).autocomplete('search');
- }
- });
- });
- }
- },
- detach: function (context, settings, trigger) {
- if (trigger === 'unload') {
- $(context).find('input.rules-autocomplete')
- .removeOnce('autocomplete')
- .autocomplete('destroy');
- }
- }
- };
-
- /**
- * Autocomplete object implementation.
- *
- * @namespace Drupal.autocomplete
- */
- autocomplete = {
- cache: {},
-
- /**
- * JQuery UI option object.
- *
- * @name Drupal.autocomplete.options
- */
- options: {
- source: sourceData,
- focus: focusHandler,
- select: selectHandler,
- renderItem: renderItem,
- minLength: 0
- },
- ajax: {
- dataType: 'json'
- }
- };
-
-})(jQuery, Drupal);
diff --git a/modules/rules/phpcs.xml.dist b/modules/rules/phpcs.xml.dist
deleted file mode 100644
index 9760f2c..0000000
--- a/modules/rules/phpcs.xml.dist
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
- Default PHP CodeSniffer configuration for Rules.
- .
-
- ./d7-tests/
- ./vendor/
- ./config/
-
-
-
- src/Annotation
- src/Core/Annotation
- src/Ui/RulesUiDefinition.php
-
-
-
-
- README.md
-
-
-
-
- ./src/Core/ConditionManager.php
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/rules/rules.info.yml b/modules/rules/rules.info.yml
deleted file mode 100644
index 467730a..0000000
--- a/modules/rules/rules.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Rules
-type: module
-description: 'React on events and conditionally evaluate actions.'
-package: Rules
-# core: 8.x
-configure: entity.rules_reaction_rule.collection
-dependencies:
- - typed_data:typed_data
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/rules.libraries.yml b/modules/rules/rules.libraries.yml
deleted file mode 100644
index c61e6d7..0000000
--- a/modules/rules/rules.libraries.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-rules.autocomplete:
- js:
- js/autocomplete.js: { weight: -1 }
- dependencies:
- - core/jquery
- - core/drupal
- - core/drupalSettings
- - core/drupal.ajax
- - core/jquery.ui.autocomplete
diff --git a/modules/rules/rules.links.action.yml b/modules/rules/rules.links.action.yml
deleted file mode 100644
index 9307b2e..0000000
--- a/modules/rules/rules.links.action.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Action links for Rules.
-
-# Rules reaction related actions.
-rules_reaction_rule_add_action:
- route_name: entity.rules_reaction_rule.add_form
- title: 'Add reaction rule'
- appears_on:
- - entity.rules_reaction_rule.collection
-
-# Rules component related actions.
-rules_component_add_action:
- route_name: entity.rules_component.add_form.rule
- title: 'Add rule'
- appears_on:
- - entity.rules_component.collection
diff --git a/modules/rules/rules.links.menu.yml b/modules/rules/rules.links.menu.yml
deleted file mode 100644
index 569de90..0000000
--- a/modules/rules/rules.links.menu.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Menu links for Rules.
-
-rules.reactions:
- title: 'Rules'
- route_name: entity.rules_reaction_rule.collection
- parent: system.admin_config_workflow
- description: 'Reaction rules administration overview.'
diff --git a/modules/rules/rules.links.task.yml b/modules/rules/rules.links.task.yml
deleted file mode 100644
index db7ad07..0000000
--- a/modules/rules/rules.links.task.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Menu tasks for Rules.
-
-rules.reactions:
- title: 'Reaction rules'
- route_name: entity.rules_reaction_rule.collection
- base_route: entity.rules_reaction_rule.collection
- weight: 1
-
-rules.components:
- title: 'Components'
- route_name: entity.rules_component.collection
- base_route: entity.rules_reaction_rule.collection
- weight: 2
-
-rules.settings:
- title: 'Settings'
- route_name: rules.settings
- base_route: entity.rules_reaction_rule.collection
- weight: 3
diff --git a/modules/rules/rules.module b/modules/rules/rules.module
deleted file mode 100644
index ec2ed2d..0000000
--- a/modules/rules/rules.module
+++ /dev/null
@@ -1,159 +0,0 @@
-actions , and may have any number of conditions that must be met for the actions to be executed. You can also set up components – stand-alone sets of Rules configuration that can be used in Rules and other parts of your site. See the online documentation for an introduction on how to use Rules.', [
- ':url1' => Url::fromRoute('entity.rules_component.collection')->toString(),
- ':url2' => 'https://www.drupal.org/node/298480',
- ]);
- return $output;
-
- case 'help.page.rules':
- $output = '' . t('About') . ' ';
- $output .= '';
- $output .= t('The Rules module allows site administrators to define conditionally executed actions based on occurring events (ECA-rules). For more information, see the online documentation for the Rules module and the current Rules documentation for Drupal 8 on Gitbooks .', [
- ':url1' => 'https://www.drupal.org/project/rules',
- ':url2' => 'https://thefubhy.gitbooks.io/rules/content/',
- ]);
- $output .= '
';
- $output .= '' . t('Uses') . ' ';
- $output .= '';
- $output .= '' . t('Reaction rules') . ' ';
- $output .= '' . t('Reaction rules associate one or more reactions to one or more specific site events. Execution of a reaction rule actions can optionnally be tied to one or more conditions. To list and update existing reaction rules and to create a new one, visit the reaction rules overview page .', [':url' => Url::fromRoute('entity.rules_reaction_rule.collection')->toString()]) . ' ';
- $output .= '' . t('Components') . ' ';
- $output .= '' . t('Rule components allows to define reusable combined actions which can optionnaly be tied to one or more conditions. Components are useable as actions in reaction rules or in other components. To list and update existing rule components and to create a new one, visit the components overview pages .', [':url' => Url::fromRoute('entity.rules_component.collection')->toString()]) . ' ';
- $output .= '' . t('General settings') . ' ';
- $output .= '' . t('The Rules modules allows to set global settings settings, such as logging. Visit the rules settings page to view and update current settings.', [':url' => Url::fromRoute('rules.settings')->toString()]) . ' ';
- $output .= ' ';
- return $output;
- }
-}
-
-/**
- * Implements hook_user_login().
- */
-function rules_user_login($account) {
- // Set the account twice on the event: as the main subject but also in the
- // list of arguments.
- $event = new UserLoginEvent($account);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch(UserLoginEvent::EVENT_NAME, $event);
-}
-
-/**
- * Implements hook_user_logout().
- */
-function rules_user_logout($account) {
- // Set the account twice on the event: as the main subject but also in the
- // list of arguments.
- $event = new UserLogoutEvent($account, ['account' => $account]);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch(UserLogoutEvent::EVENT_NAME, $event);
-}
-
-/**
- * Implements hook_entity_view().
- */
-function rules_entity_view(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
- // Only handle content entities and ignore config entities.
- if ($entity instanceof ContentEntityInterface) {
- $entity_type_id = $entity->getEntityTypeId();
- $event = new EntityEvent($entity, [$entity_type_id => $entity]);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch("rules_entity_view:$entity_type_id", $event);
- }
-}
-
-/**
- * Implements hook_entity_presave().
- */
-function rules_entity_presave(EntityInterface $entity) {
- // Only handle content entities and ignore config entities.
- if ($entity instanceof ContentEntityInterface) {
- $entity_type_id = $entity->getEntityTypeId();
- $event = new EntityEvent($entity, [
- $entity_type_id => $entity,
- $entity_type_id . '_unchanged' => $entity->original,
- ]);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch("rules_entity_presave:$entity_type_id", $event);
- }
-}
-
-/**
- * Implements hook_entity_delete().
- */
-function rules_entity_delete(EntityInterface $entity) {
- // Only handle content entities and ignore config entities.
- if ($entity instanceof ContentEntityInterface) {
- $entity_type_id = $entity->getEntityTypeId();
- $event = new EntityEvent($entity, [$entity_type_id => $entity]);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch("rules_entity_delete:$entity_type_id", $event);
- }
-}
-
-/**
- * Implements hook_entity_insert().
- */
-function rules_entity_insert(EntityInterface $entity) {
- // Only handle content entities and ignore config entities.
- if ($entity instanceof ContentEntityInterface) {
- $entity_type_id = $entity->getEntityTypeId();
- $event = new EntityEvent($entity, [$entity_type_id => $entity]);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch("rules_entity_insert:$entity_type_id", $event);
- }
-}
-
-/**
- * Implements hook_entity_update().
- */
-function rules_entity_update(EntityInterface $entity) {
- // Only handle content entities and ignore config entities.
- if ($entity instanceof ContentEntityInterface) {
- $entity_type_id = $entity->getEntityTypeId();
- $event = new EntityEvent($entity, [
- $entity_type_id => $entity,
- $entity_type_id . '_unchanged' => $entity->original,
- ]);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch("rules_entity_update:$entity_type_id", $event);
- }
-}
-
-/**
- * Implements hook_cron().
- */
-function rules_cron() {
- $event = new SystemCronEvent();
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch(SystemCronEvent::EVENT_NAME, $event);
-}
-
-/**
- * Implements hook_mail().
- */
-function rules_mail($key, &$message, $params) {
- $message['subject'] .= str_replace(["\r", "\n"], '', $params['subject']);
- $message['body'][] = $params['message'];
-}
diff --git a/modules/rules/rules.permissions.yml b/modules/rules/rules.permissions.yml
deleted file mode 100644
index 0c61381..0000000
--- a/modules/rules/rules.permissions.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Most of the time administrators will be able to administer both reactions,
-# components and settings. But permissions are split up in such a way it
-# should be possible to have 'light' and 'root' rules administrators.
-administer rules:
- title: 'Administer Rules'
- description: 'Administer all Rules configurations and settings.'
-administer rules reactions:
- title: 'Administer Rules reactions'
- description: 'Administer Rules reaction configurations and settings.'
-administer rules components:
- title: 'Administer Rules components'
- description: 'Administer Rules component configurations and settings.'
-bypass rules access:
- title: 'Bypass Rules access control'
- description: 'Control all configurations regardless of permission restrictions of events, conditions or actions.'
- restrict access: true
-access rules debug:
- title: 'View Rules debug log'
- description: 'Access the Rules debug log.'
diff --git a/modules/rules/rules.routing.yml b/modules/rules/rules.routing.yml
deleted file mode 100644
index ce2b86c..0000000
--- a/modules/rules/rules.routing.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Declaration of Rules routings.
-
-
-### Rules settings form
-rules.settings:
- path: '/admin/config/workflow/rules/settings'
- defaults:
- _form: '\Drupal\rules\Form\RulesSettingsForm'
- _title: 'Rules settings'
- requirements:
- _permission: 'administer rules'
-
-
-### Rules Reactions
-entity.rules_reaction_rule.collection:
- path: '/admin/config/workflow/rules'
- defaults:
- _entity_list: 'rules_reaction_rule'
- _title: 'Rules'
- requirements:
- _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.add_form:
- path: '/admin/config/workflow/rules/reactions/add'
- defaults:
- _entity_form: 'rules_reaction_rule.add'
- _title: 'Add reaction rule'
- options:
- _rules_ui: rules.reaction_rules
- requirements:
- _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.edit_form:
- path: '/admin/config/workflow/rules/reactions/edit/{rules_reaction_rule}'
- defaults:
- _entity_form: 'rules_reaction_rule.edit'
- _title_callback: '\Drupal\rules\Form\ReactionRuleEditForm::getTitle'
- options:
- _rules_ui: rules.reaction_rules
- requirements:
- _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.delete_form:
- path: '/admin/config/workflow/rules/reactions/delete/{rules_reaction_rule}'
- defaults:
- _entity_form: 'rules_reaction_rule.delete'
- options:
- _rules_ui: rules.reaction_rules
- requirements:
- _permission: 'administer rules+administer rules reactions'
-
-### Rules Components
-entity.rules_component.collection:
- path: '/admin/config/workflow/rules/components'
- defaults:
- # Calls the list controller, defined in the annotation of the rules component entity.
- _entity_list: 'rules_component'
- _title: 'Rules components'
- requirements:
- _permission: 'administer rules+administer rules components'
-
-entity.rules_component.add_form.rule:
- path: '/admin/config/workflow/rules/components/add/rule'
- defaults:
- _entity_form: 'rules_component.add'
- _title: 'Add rule'
- options:
- _rules_ui: rules.components
- requirements:
- _permission: 'administer rules+administer rules components'
-
-entity.rules_component.edit_form:
- path: '/admin/config/workflow/rules/components/edit/{rules_component}'
- defaults:
- _entity_form: 'rules_component.edit'
- _title_callback: '\Drupal\rules\Form\RulesComponentEditForm::getTitle'
- options:
- _rules_ui: rules.components
- requirements:
- _permission: 'administer rules+administer rules components'
-
-entity.rules_component.delete_form:
- path: '/admin/config/workflow/rules/components/delete/{rules_component}'
- defaults:
- _entity_form: 'rules_component.delete'
- options:
- _rules_ui: rules.components
- requirements:
- _permission: 'administer rules+administer rules components'
diff --git a/modules/rules/rules.rules.events.yml b/modules/rules/rules.rules.events.yml
deleted file mode 100644
index ee4081e..0000000
--- a/modules/rules/rules.rules.events.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-rules_user_login:
- label: 'User has logged in'
- category: 'User'
- context:
- account:
- type: 'entity:user'
- label: 'Logged in user'
-rules_user_logout:
- label: 'User has logged out'
- category: 'User'
- context:
- account:
- type: 'entity:user'
- label: 'Logged out user'
-kernel.request:
- label: 'Drupal is initializing'
- category: 'System'
- # @todo Should this event have the request as context? Should we define a
- # request data type?
- help: "Be aware that some actions might initialize the theme system. After that, it's impossible for any module to change the used theme."
-rules_entity_presave:
- label: 'Before saving an entity'
- deriver: '\Drupal\rules\Plugin\RulesEvent\EntityPresaveDeriver'
- class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_delete:
- label: 'After deleting an entity'
- deriver: '\Drupal\rules\Plugin\RulesEvent\EntityDeleteDeriver'
- class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_insert:
- label: 'After saving a new entity'
- deriver: '\Drupal\rules\Plugin\RulesEvent\EntityInsertDeriver'
- class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_update:
- label: 'After updating an entity'
- deriver: '\Drupal\rules\Plugin\RulesEvent\EntityUpdateDeriver'
- class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_view:
- label: 'Viewing an entity'
- deriver: '\Drupal\rules\Plugin\RulesEvent\EntityViewDeriver'
- class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_system_cron:
- label: 'Cron maintenance tasks are performed'
- category: 'System'
-rules_system_logger_event:
- label: 'System log entry is created'
- category: 'System'
- context:
- # @todo: create a TypedData logger-entry object: https://www.drupal.org/node/2625238
- logger_entry:
- type: 'any'
- label: 'Logger entry'
diff --git a/modules/rules/rules.rules_ui.yml b/modules/rules/rules.rules_ui.yml
deleted file mode 100644
index e7b235e..0000000
--- a/modules/rules/rules.rules_ui.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-rules.reaction_rules:
- label: 'Manage reaction rules.'
- base_route: entity.rules_reaction_rule.edit_form
- component_type_label: rule
- settings:
- config_parameter: rules_reaction_rule
-rules.components:
- label: 'Manage re-usabe components.'
- base_route: entity.rules_component.edit_form
- component_type_label: rule
- settings:
- config_parameter: rules_component
diff --git a/modules/rules/rules.services.yml b/modules/rules/rules.services.yml
deleted file mode 100644
index 7812afc..0000000
--- a/modules/rules/rules.services.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-services:
- plugin.manager.rules_expression:
- class: Drupal\rules\Engine\ExpressionManager
- arguments: ['@container.namespaces', '@module_handler', '@uuid']
- plugin.manager.rules_action:
- class: Drupal\rules\Core\RulesActionManager
- parent: default_plugin_manager
- plugin.manager.rules_event:
- class: Drupal\rules\Core\RulesEventManager
- arguments: ['@module_handler']
- plugin.manager.rules_data_processor:
- class: Drupal\rules\Context\DataProcessorManager
- arguments: ['@container.namespaces', '@module_handler']
- plugin.manager.rules_ui:
- class: Drupal\rules\Ui\RulesUiManager
- arguments: ['@module_handler']
- logger.channel.rules:
- class: Drupal\rules\Logger\RulesLoggerChannel
- arguments: ['@config.factory']
- logger.ruleslog:
- class: Drupal\rules\Logger\RulesLog
- tags:
- - { name: logger }
- arguments: ['@event_dispatcher', '@logger.log_message_parser']
- rules.event_subscriber:
- class: Drupal\rules\EventSubscriber\GenericEventSubscriber
- arguments: ['@entity_type.manager', '@plugin.manager.rules_event', '@rules.component_repository']
- tags:
- - { name: 'event_subscriber' }
- rules.redirect_event_subscriber:
- class: Drupal\rules\EventSubscriber\RedirectEventSubscriber
- tags:
- - { name: 'event_subscriber' }
- rules.cache:
- class: Drupal\Core\Cache\CacheBackendInterface
- tags:
- - { name: cache.bin }
- factory: cache_factory:get
- arguments: [rules]
- rules.component_repository:
- class: Drupal\rules\Engine\RulesComponentRepository
- arguments: ['@rules.cache', '@language_manager']
- tags:
- - { name: service_collector, tag: 'rules.component_resolver', call: addComponentResolver }
- rules.component_resolver.component_config:
- class: Drupal\rules\ComponentResolver\ComponentConfigResolver
- arguments: ['@entity_type.manager']
- tags:
- - { name: rules.component_resolver, resolver_name: rules_component }
- rules.component_resolver.event_component:
- class: Drupal\rules\ComponentResolver\EventComponentResolver
- arguments: ['@entity_type.manager', '@plugin.manager.rules_expression']
- tags:
- - { name: rules.component_resolver, resolver_name: rules_event }
- rules.ui_route_enhancer:
- class: Drupal\rules\Routing\RulesUiRouteEnhancer
- arguments: ['@plugin.manager.rules_ui']
- tags:
- - { name: route_enhancer }
- rules.ui_route_subscriber:
- class: Drupal\rules\Routing\RulesUiRouteSubscriber
- arguments: ['@plugin.manager.rules_ui']
- tags:
- - { name: 'event_subscriber' }
diff --git a/modules/rules/src/Annotation/RulesDataProcessor.php b/modules/rules/src/Annotation/RulesDataProcessor.php
deleted file mode 100644
index f55f757..0000000
--- a/modules/rules/src/Annotation/RulesDataProcessor.php
+++ /dev/null
@@ -1,40 +0,0 @@
-entityStorage = $entity_type_manager->getStorage('rules_component');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getMultiple(array $ids) {
- return array_map(function (RulesComponentConfig $config) {
- return $config->getComponent();
- }, $this->entityStorage->loadMultiple($ids));
- }
-
-}
diff --git a/modules/rules/src/ComponentResolver/EventComponentResolver.php b/modules/rules/src/ComponentResolver/EventComponentResolver.php
deleted file mode 100644
index 7d7fe9f..0000000
--- a/modules/rules/src/ComponentResolver/EventComponentResolver.php
+++ /dev/null
@@ -1,62 +0,0 @@
-entityStorage = $entity_type_manager->getStorage('rules_reaction_rule');
- $this->expressionManager = $expression_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getMultiple(array $event_ids) {
- // @todo: Improve this by adding a custom expression plugin that clones
- // the state after each rule, such that added variables added by one rule
- // are not interfering with the variables of another rule.
- $results = [];
- foreach ($event_ids as $event_id) {
- $action_set = $this->expressionManager->createActionSet();
- // @todo Only load active reaction rules here.
- $configs = $this->entityStorage->loadByProperties(['events.*.event_name' => $event_id]);
- foreach ($configs as $config) {
- $action_set->addExpressionObject($config->getExpression());
- }
- $results[$event_id] = RulesComponent::create($action_set);
- }
- return $results;
- }
-
-}
diff --git a/modules/rules/src/Context/AnnotatedClassDiscovery.php b/modules/rules/src/Context/AnnotatedClassDiscovery.php
deleted file mode 100644
index 81fdff2..0000000
--- a/modules/rules/src/Context/AnnotatedClassDiscovery.php
+++ /dev/null
@@ -1,38 +0,0 @@
-annotationReader)) {
- // Do not call out the parent, but re-configure the simple annotation
- // reader on our own, so we can control the order of namespaces.
- $this->annotationReader = new SimpleAnnotationReader();
-
- // Make sure to add our namespace first, so our ContextDefinition and
- // Condition annotations gets picked.
- $this->annotationReader->addNamespace('Drupal\rules\Context\Annotation');
- $this->annotationReader->addNamespace('Drupal\rules\Core\Annotation');
- // Add the namespaces from the main plugin annotation, like @EntityType.
- $namespace = substr($this->pluginDefinitionAnnotationName, 0, strrpos($this->pluginDefinitionAnnotationName, '\\'));
- $this->annotationReader->addNamespace($namespace);
- // Add general core annotations like @Translation.
- $this->annotationReader->addNamespace('Drupal\Core\Annotation');
- }
- return $this->annotationReader;
- }
-
-}
diff --git a/modules/rules/src/Context/Annotation/ContextDefinition.php b/modules/rules/src/Context/Annotation/ContextDefinition.php
deleted file mode 100644
index 54b6df6..0000000
--- a/modules/rules/src/Context/Annotation/ContextDefinition.php
+++ /dev/null
@@ -1,51 +0,0 @@
- $value) {
- if ($value instanceof Translation) {
- $values[$key] = $value->get();
- }
- }
- $this->definition = RulesContextDefinition::createFromArray($values);
- }
-
- /**
- * Returns the value of an annotation.
- *
- * @return \Drupal\rules\Context\ContextDefinitionInterface
- * Return the Rules version of the ContextDefinitionInterface.
- */
- public function get() {
- return $this->definition;
- }
-
-}
diff --git a/modules/rules/src/Context/ContextAwarePluginInterface.php b/modules/rules/src/Context/ContextAwarePluginInterface.php
deleted file mode 100644
index 0cfb0b4..0000000
--- a/modules/rules/src/Context/ContextAwarePluginInterface.php
+++ /dev/null
@@ -1,60 +0,0 @@
- [],
- 'context_mapping' => [],
- 'context_processors' => [],
- 'provides_mapping' => [],
- ];
-
- /**
- * Creates a context config object.
- *
- * @param array $values
- * (optional) Some initial values to set. In the same format as returned
- * from static::toArray().
- *
- * @return $this
- */
- public static function create(array $values = []) {
- return new static($values);
- }
-
- /**
- * Constructs the object.
- *
- * @param array $values
- * Some initial values to set. In the same format as returned from
- * static::toArray().
- */
- protected function __construct(array $values) {
- $this->config = $values + $this->config;
- }
-
- /**
- * Maps the data specified by the selector to the given context.
- *
- * @param string $context_name
- * The name of the context.
- * @param string $property_path
- * A valid property path; e.g., "node.uid.target_id".
- *
- * @throws \Drupal\rules\Exception\LogicException
- * Thrown if a context value and map are set for a given context at the same
- * time.
- *
- * @return $this
- */
- public function map($context_name, $property_path) {
- if (isset($this->config['context_values'][$context_name])) {
- throw new LogicException("Cannot map a context value and pre-define it at the same time.");
- }
- $this->config['context_mapping'][$context_name] = $property_path;
- return $this;
- }
-
- /**
- * Sets a pre-defined value for the given context.
- *
- * @param string $context_name
- * The name of the context.
- * @param mixed $value
- * The value to set for the context. The value must he a valid value for the
- * context's data type, unless a data processor takes care of processing it
- * to a valid value.
- *
- * @throws \Drupal\rules\Exception\LogicException
- * Thrown if a context value and map are set for a given context at the same
- * time.
- *
- * @return $this
- */
- public function setValue($context_name, $value) {
- if (isset($this->config['context_mapping'][$context_name])) {
- throw new LogicException("Cannot map a context value and pre-define it at the same time.");
- }
- $this->config['context_values'][$context_name] = $value;
- return $this;
- }
-
- /**
- * Maps the name of a provided context.
- *
- * @param string $provided_context_name
- * The name of the provided context.
- * @param string $context_name
- * The context name under which the provided context should be registered.
- *
- * @return $this
- */
- public function provideAs($provided_context_name, $context_name) {
- $this->config['provides_mapping'][$provided_context_name] = $context_name;
- return $this;
- }
-
- /**
- * Sets an arbitrary configuration value under the given key.
- *
- * This may be used for setting any configuration options that are not making
- * use of the context system.
- *
- * @param string $key
- * The config key to set.
- * @param mixed $value
- * The value to set for the config key.
- *
- * @return $this
- */
- public function setConfigKey($key, $value) {
- $this->config[$key] = $value;
- return $this;
- }
-
- /**
- * Configures a data processor for the given context.
- *
- * @param string $context_name
- * The name of the context.
- * @param string $plugin_id
- * The id of the data processor plugin to use.
- * @param array $options
- * (optional) An array of plugin configuration, as used by the plugin.
- *
- * @return $this
- */
- public function process($context_name, $plugin_id, array $options = []) {
- $this->config['context_processors'][$context_name][$plugin_id] = $options;
- return $this;
- }
-
- /**
- * Negates the result of the plugin (or not).
- *
- * Only applicable to condition plugins.
- *
- * @param bool $bool
- * Whether to negate the result.
- *
- * @return $this
- */
- public function negateResult($bool = TRUE) {
- return $this->setConfigKey('negate', $bool);
- }
-
- /**
- * Exports the configuration to an array.
- *
- * @return array
- * The config array, with the following keys set:
- * - context_map: An array of data selectors, keyed by context name.
- * - context An array of context values, keyed by context.
- * - context_processors: An array of data processor config, keyed by context
- * name and process plugin id.
- * - provides_mapping: An array of context names to use for provided
- * context, keyed by provided context name.
- * - Any other other config keys that have been set.
- */
- public function toArray() {
- return $this->config;
- }
-
- /**
- * Checks the config for the given plugin.
- *
- * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
- * An instance of the plugin for which the config has been created.
- *
- * @todo: Implement.
- */
- public function checkConfig(CoreContextAwarePluginInterface $plugin) {
- // @todo.
- }
-
-}
diff --git a/modules/rules/src/Context/ContextDefinition.php b/modules/rules/src/Context/ContextDefinition.php
deleted file mode 100644
index 7122d6e..0000000
--- a/modules/rules/src/Context/ContextDefinition.php
+++ /dev/null
@@ -1,120 +0,0 @@
- 'dataType',
- 'label' => 'label',
- 'description' => 'description',
- 'multiple' => 'isMultiple',
- 'required' => 'isRequired',
- 'default_value' => 'defaultValue',
- 'constraints' => 'constraints',
- 'allow_null' => 'allowNull',
- 'assignment_restriction' => 'assignmentRestriction',
- ];
-
- /**
- * Whether the context value is allowed to be NULL or not.
- *
- * @var bool
- */
- protected $allowNull = FALSE;
-
- /**
- * The assignment restriction of this context.
- *
- * @var string|null
- *
- * @see \Drupal\rules\Context\ContextDefinitionInterface::getAssignmentRestriction()
- */
- protected $assignmentRestriction = NULL;
-
- /**
- * {@inheritdoc}
- */
- public function toArray() {
- $values = [];
- $defaults = get_class_vars(__CLASS__);
- foreach (static::$nameMap as $key => $property_name) {
- // Only export values for non-default properties.
- if ($this->$property_name !== $defaults[$property_name]) {
- $values[$key] = $this->$property_name;
- }
- }
- return $values;
- }
-
- /**
- * Creates a definition object from an exported array of values.
- *
- * @param array $values
- * The array of values, as returned by toArray().
- *
- * @return static
- * The created definition.
- *
- * @throws \Drupal\Component\Plugin\Exception\ContextException
- * If the required classes are not implemented.
- */
- public static function createFromArray(array $values) {
- if (isset($values['class']) && !in_array(ContextDefinitionInterface::class, class_implements($values['class']))) {
- throw new ContextException('ContextDefinition class must implement ' . ContextDefinitionInterface::class . '.');
- }
- // Default to Rules context definition class.
- $values['class'] = isset($values['class']) ? $values['class'] : ContextDefinition::class;
- if (!isset($values['value'])) {
- $values['value'] = 'any';
- }
-
- $definition = $values['class']::create($values['value']);
- foreach (array_intersect_key(static::$nameMap, $values) as $key => $name) {
- $definition->$name = $values[$key];
- }
- return $definition;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isAllowedNull() {
- return $this->allowNull;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setAllowNull($null_allowed) {
- $this->allowNull = $null_allowed;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAssignmentRestriction() {
- return $this->assignmentRestriction;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setAssignmentRestriction($restriction) {
- $this->assignmentRestriction = $restriction;
- return $this;
- }
-
-}
diff --git a/modules/rules/src/Context/ContextDefinitionInterface.php b/modules/rules/src/Context/ContextDefinitionInterface.php
deleted file mode 100644
index 118627c..0000000
--- a/modules/rules/src/Context/ContextDefinitionInterface.php
+++ /dev/null
@@ -1,71 +0,0 @@
-getContextDefinitions();
-
- // Make sure that all provided variables by this plugin are added to the
- // execution metadata state.
- $this->addProvidedContextDefinitions($plugin, $metadata_state);
-
- foreach ($context_definitions as $name => $context_definition) {
- // Check if a data selector is configured that maps to the state.
- if (isset($this->configuration['context_mapping'][$name])) {
- try {
- $data_definition = $this->getMappedDefinition($name, $metadata_state);
- $this->checkDataTypeCompatible($context_definition, $data_definition, $name, $violation_list);
- }
- catch (IntegrityException $e) {
- $violation = new IntegrityViolation();
- $violation->setMessage($this->t('Data selector %selector for context %context_name is invalid. @message', [
- '%selector' => $this->configuration['context_mapping'][$name],
- '%context_name' => $context_definition->getLabel(),
- '@message' => $e->getMessage(),
- ]));
- $violation->setContextName($name);
- $violation->setUuid($this->getUuid());
- $violation_list->add($violation);
- }
-
- if ($context_definition instanceof RulesContextDefinitionInterface
- && $context_definition->getAssignmentRestriction() === RulesContextDefinitionInterface::ASSIGNMENT_RESTRICTION_INPUT
- ) {
- $violation = new IntegrityViolation();
- $violation->setMessage($this->t('The context %context_name may not be configured using a selector.', [
- '%context_name' => $context_definition->getLabel(),
- ]));
- $violation->setContextName($name);
- $violation->setUuid($this->getUuid());
- $violation_list->add($violation);
- }
- }
- elseif (isset($this->configuration['context_values'][$name])) {
- if ($context_definition instanceof RulesContextDefinitionInterface
- && $context_definition->getAssignmentRestriction() === RulesContextDefinitionInterface::ASSIGNMENT_RESTRICTION_SELECTOR
- ) {
- $violation = new IntegrityViolation();
- $violation->setMessage($this->t('The context %context_name may only be configured using a selector.', [
- '%context_name' => $context_definition->getLabel(),
- ]));
- $violation->setContextName($name);
- $violation->setUuid($this->getUuid());
- $violation_list->add($violation);
- }
- }
- elseif ($context_definition->isRequired() && $context_definition->getDefaultValue() === NULL) {
- $violation = new IntegrityViolation();
- $violation->setMessage($this->t('The required context %context_name is missing.', [
- '%context_name' => $context_definition->getLabel(),
- ]));
- $violation->setContextName($name);
- $violation->setUuid($this->getUuid());
- $violation_list->add($violation);
- }
- }
-
- if ($plugin instanceof ContextProviderInterface) {
- $provided_context_definitions = $plugin->getProvidedContextDefinitions();
-
- foreach ($provided_context_definitions as $name => $context_definition) {
- if (isset($this->configuration['provides_mapping'][$name])
- && !preg_match('/^[0-9a-zA-Z_]*$/', $this->configuration['provides_mapping'][$name])
- ) {
- $violation = new IntegrityViolation();
- $violation->setMessage($this->t('Provided variable name %name contains not allowed characters.', [
- '%name' => $this->configuration['provides_mapping'][$name],
- ]));
- $violation->setContextName($name);
- $violation->setUuid($this->getUuid());
- $violation_list->add($violation);
- }
- }
- }
-
- return $violation_list;
- }
-
- /**
- * Checks that the data type of a mapped variable matches the expectation.
- *
- * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context_definition
- * The context definition of the context on the plugin.
- * @param \Drupal\Core\TypedData\DataDefinitionInterface $provided
- * The data definition of the mapped variable to the context.
- * @param string $context_name
- * The name of the context on the plugin.
- * @param \Drupal\rules\Engine\IntegrityViolationList $violation_list
- * The list of violations where new ones will be added.
- */
- protected function checkDataTypeCompatible(CoreContextDefinitionInterface $context_definition, DataDefinitionInterface $provided, $context_name, IntegrityViolationList $violation_list) {
- // Compare data types. For now, fail if they are not equal.
- // @todo: Add support for matching based upon type-inheritance.
- $target_type = $context_definition->getDataDefinition()->getDataType();
-
- // Special case any and entity target types for now.
- if ($target_type == 'any' || ($target_type == 'entity' && strpos($provided->getDataType(), 'entity:') !== FALSE)) {
- return;
- }
- if ($target_type != $provided->getDataType()) {
- $expected_type_problem = $context_definition->getDataDefinition()->getDataType();
- $violation = new IntegrityViolation();
- $violation->setMessage($this->t('Expected a @expected_type data type for context %context_name but got a @provided_type data type instead.', [
- '@expected_type' => $expected_type_problem,
- '%context_name' => $context_definition->getLabel(),
- '@provided_type' => $provided->getDataType(),
- ]));
- $violation->setContextName($context_name);
- $violation->setUuid($this->getUuid());
- $violation_list->add($violation);
- }
- }
-
-}
diff --git a/modules/rules/src/Context/ContextHandlerTrait.php b/modules/rules/src/Context/ContextHandlerTrait.php
deleted file mode 100644
index 6e617a4..0000000
--- a/modules/rules/src/Context/ContextHandlerTrait.php
+++ /dev/null
@@ -1,327 +0,0 @@
-configuration['context_values'])) {
- foreach ($this->configuration['context_values'] as $name => $value) {
- $plugin->setContextValue($name, $value);
- }
- }
-
- $selected_data = [];
- // Map context by applying data selectors and collected the definitions of
- // selected data for refining context definitions later. Note, that we must
- // refine context definitions on execution time also, such that provided
- // context gets the right metadata attached.
- if (isset($this->configuration['context_mapping'])) {
- foreach ($this->configuration['context_mapping'] as $name => $selector) {
- $typed_data = $state->fetchDataByPropertyPath($selector);
- $plugin->setContextValue($name, $typed_data);
- $selected_data[$name] = $typed_data->getDataDefinition();
- }
- }
-
- if ($plugin instanceof ContextAwarePluginInterface) {
- // Getting context values may lead to undocumented exceptions if context
- // is not set right now. So catch those exceptions.
- // @todo: Remove ones https://www.drupal.org/node/2677162 got fixed.
- try {
- $plugin->refineContextDefinitions($selected_data);
- }
- catch (ContextException $e) {
- if (strpos($e->getMessage(), 'context is required') === FALSE) {
- throw new EvaluationException($e->getMessage());
- }
- }
- }
-
- // Apply data processors.
- $this->processData($plugin, $state);
-
- // Finally, ensure all contexts are set as expected now.
- foreach ($plugin->getContextDefinitions() as $name => $definition) {
- if ($plugin->getContextValue($name) === NULL && $definition->isRequired()) {
- // If a context mapping has been specified, the value might end up NULL
- // but valid (e.g. a reference on an empty property). In that case
- // isAllowedNull determines whether the context is conform.
- if (!isset($this->configuration['context_mapping'][$name])) {
- throw new EvaluationException("Required context $name is missing for plugin "
- . $plugin->getPluginId() . '.');
- }
- elseif (!$definition->isAllowedNull()) {
- throw new EvaluationException("The context for $name is NULL, but the context $name in "
- . $plugin->getPluginId() . ' requires a value.');
- }
- }
- }
- }
-
- /**
- * Prepares plugin context based upon the set context configuration.
- *
- * The configuration is applied as far as possible without having execution
- * time data. That means, the configured context values are set and context is
- * refined while leveraging the definitions of selected data.
- *
- * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
- * The plugin that is prepared.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
- * The metadata state, prepared for the current expression.
- *
- * @throws \Drupal\Component\Plugin\Exception\ContextException
- * Thrown if the plugin tries to access some not-defined context. As this is
- * a developer error, this should not be caught.
- *
- * @see ::prepareContext()
- */
- protected function prepareContextWithMetadata(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
- if (isset($this->configuration['context_values'])) {
- foreach ($this->configuration['context_values'] as $name => $value) {
- $plugin->setContextValue($name, $value);
- }
- }
-
- if ($plugin instanceof ContextAwarePluginInterface) {
- $selected_data = $this->getSelectedData($metadata_state);
- // Getting context values may lead to undocumented exceptions if context
- // is not set right now. So catch those exceptions.
- // @todo: Remove ones https://www.drupal.org/node/2677162 got fixed.
- try {
- $plugin->refineContextDefinitions($selected_data);
- }
- catch (ContextException $e) {
- if (strpos($e->getMessage(), 'context is required') === FALSE) {
- throw $e;
- }
- }
- }
- }
-
- /**
- * Gets definitions of all selected data at configuration time.
- *
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
- * The metadata state.
- *
- * @return \Drupal\Core\TypedData\DataDefinitionInterface[]
- * An array of data definitions for context that is mapped using a data
- * selector, keyed by context name.
- */
- protected function getSelectedData(ExecutionMetadataStateInterface $metadata_state) {
- $selected_data = [];
- // Collected the definitions of selected data for refining context
- // definitions.
- if (isset($this->configuration['context_mapping'])) {
- // If no state is available, we need to fetch at least the definitions of
- // selected data for refining context.
- foreach ($this->configuration['context_mapping'] as $name => $selector) {
- try {
- $selected_data[$name] = $this->getMappedDefinition($name, $metadata_state);
- }
- catch (IntegrityException $e) {
- // Ignore invalid data selectors here, such that context gets refined
- // as far as possible still and can be respected by the UI when fixing
- // broken selectors.
- }
- }
- }
- return $selected_data;
- }
-
- /**
- * Gets the definition of the data that is mapped to the given context.
- *
- * @param string $context_name
- * The name of the context.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
- * The metadata state containing metadata about available variables.
- *
- * @return \Drupal\Core\TypedData\DataDefinitionInterface|null
- * A data definition if the property path could be applied, or NULL if the
- * context is not mapped.
- *
- * @throws \Drupal\rules\Exception\IntegrityException
- * Thrown if the data selector that is configured for the context is
- * invalid.
- */
- protected function getMappedDefinition($context_name, ExecutionMetadataStateInterface $metadata_state) {
- if (isset($this->configuration['context_mapping'][$context_name])) {
- return $metadata_state->fetchDefinitionByPropertyPath($this->configuration['context_mapping'][$context_name]);
- }
- }
-
- /**
- * Adds provided context values from the plugin to the execution state.
- *
- * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
- * The context aware plugin of which to add provided context.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $state
- * The Rules state where the context variables are added.
- */
- protected function addProvidedContext(CoreContextAwarePluginInterface $plugin, ExecutionStateInterface $state) {
- // If the plugin does not support providing context, there is nothing to do.
- if (!$plugin instanceof ContextProviderInterface) {
- return;
- }
- $provides = $plugin->getProvidedContextDefinitions();
- foreach ($provides as $name => $provided_definition) {
- // Avoid name collisions in the rules state: provided variables can be
- // renamed.
- if (isset($this->configuration['provides_mapping'][$name])) {
- $state->setVariableData($this->configuration['provides_mapping'][$name], $plugin->getProvidedContext($name)->getContextData());
- }
- else {
- $state->setVariableData($name, $plugin->getProvidedContext($name)->getContextData());
- }
- }
- }
-
- /**
- * Adds the definitions of provided context to the execution metadata state.
- *
- * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
- * The context aware plugin of which to add provided context.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
- * The execution metadata state to add variables to.
- */
- protected function addProvidedContextDefinitions(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
- // If the plugin does not support providing context, there is nothing to do.
- if (!$plugin instanceof ContextProviderInterface) {
- return;
- }
-
- foreach ($plugin->getProvidedContextDefinitions() as $name => $context_definition) {
- if (isset($this->configuration['provides_mapping'][$name])) {
- // Populate the state with the new variable that is provided by this
- // plugin. That is necessary so that the integrity check in subsequent
- // actions knows about the variable and does not throw violations.
- $metadata_state->setDataDefinition(
- $this->configuration['provides_mapping'][$name],
- $context_definition->getDataDefinition()
- );
- }
- else {
- $metadata_state->setDataDefinition($name, $context_definition->getDataDefinition());
- }
- }
- }
-
- /**
- * Asserts additional metadata.
- *
- * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
- * The context aware plugin.
- * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
- * The execution metadata state.
- */
- protected function assertMetadata(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
- // If the plugin does not implement the Rules-enhanced interface, skip this.
- if (!$plugin instanceof ContextAwarePluginInterface) {
- return;
- }
- $changed_definitions = $plugin->assertMetadata($this->getSelectedData($metadata_state));
-
- // Reverse the mapping and apply the changes.
- foreach ($changed_definitions as $context_name => $definition) {
- $selector = $this->configuration['context_mapping'][$context_name];
- // @todo: Deal with selectors matching not a context name.
- if (strpos($selector, '.') === FALSE) {
- $metadata_state->setDataDefinition($selector, $definition);
- }
- }
- }
-
- /**
- * Process data context on the plugin, usually before it gets executed.
- *
- * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
- * The plugin to process the context data on.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
- * The current Rules execution state with context variables.
- */
- protected function processData(CoreContextAwarePluginInterface $plugin, ExecutionStateInterface $rules_state) {
- if (isset($this->configuration['context_processors'])) {
- foreach ($this->configuration['context_processors'] as $context_name => $processors) {
- $definition = $plugin->getContextDefinition($context_name);
- $value = $plugin->getContextValue($context_name);
- if ($definition->isMultiple()) {
- foreach ($value as &$current) {
- $current = $this->processValue($current, $processors, $rules_state);
- }
- }
- else {
- $value = $this->processValue($value, $processors, $rules_state);
- }
- $plugin->setContextValue($context_name, $value);
- }
- }
- }
-
- /**
- * Processes a single value.
- *
- * @param mixed $value
- * The current value.
- * @param array $processors
- * An array mapping processor plugin IDs to their configuration.
- * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
- * The current Rules execution state with context variables.
- *
- * @return mixed
- * THe processed value.
- */
- protected function processValue($value, array $processors, ExecutionStateInterface $rules_state) {
- foreach ($processors as $processor_plugin_id => $configuration) {
- $data_processor = $this->processorManager->createInstance($processor_plugin_id, $configuration);
- $value = $data_processor->process($value, $rules_state);
- }
- return $value;
- }
-
-}
diff --git a/modules/rules/src/Context/ContextProviderInterface.php b/modules/rules/src/Context/ContextProviderInterface.php
deleted file mode 100644
index 610459a..0000000
--- a/modules/rules/src/Context/ContextProviderInterface.php
+++ /dev/null
@@ -1,65 +0,0 @@
-getProvidedContext($name);
- $new_context = Context::createFromContext($context, $value);
- $this->providedContext[$name] = $new_context;
- return $this;
- }
-
- /**
- * @see \Drupal\rules\Context\ContextProviderInterface
- */
- public function getProvidedContext($name) {
- // Check for a valid context value.
- if (!isset($this->providedContext[$name])) {
- $this->providedContext[$name] = new Context($this->getProvidedContextDefinition($name));
- }
- return $this->providedContext[$name];
- }
-
- /**
- * @see \Drupal\rules\Context\ContextProviderInterface
- */
- public function getProvidedContextDefinition($name) {
- $definition = $this->getPluginDefinition();
- if (empty($definition['provides'][$name])) {
- throw new ContextException(sprintf("The %s provided context is not valid.", $name));
- }
- return $definition['provides'][$name];
- }
-
- /**
- * @see \Drupal\rules\Context\ContextProviderInterface
- */
- public function getProvidedContextDefinitions() {
- $definition = $this->getPluginDefinition();
- return !empty($definition['provides']) ? $definition['provides'] : [];
- }
-
-}
diff --git a/modules/rules/src/Context/DataProcessorInterface.php b/modules/rules/src/Context/DataProcessorInterface.php
deleted file mode 100644
index 0fab75a..0000000
--- a/modules/rules/src/Context/DataProcessorInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-alterInfo('rules_data_processor');
- parent::__construct('Plugin/RulesDataProcessor', $namespaces, $module_handler, DataProcessorInterface::class, $plugin_definition_annotation_name);
- }
-
-}
diff --git a/modules/rules/src/Context/DataProcessorManagerTrait.php b/modules/rules/src/Context/DataProcessorManagerTrait.php
deleted file mode 100644
index ffda469..0000000
--- a/modules/rules/src/Context/DataProcessorManagerTrait.php
+++ /dev/null
@@ -1,45 +0,0 @@
-dataProcessorManager = $dataProcessorManager;
- return $this;
- }
-
- /**
- * Gets the data processor manager.
- *
- * @return \Drupal\rules\Context\DataProcessorManager
- * The data processor manager.
- */
- public function getDataProcessorManager() {
- if (empty($this->dataProcessorManager)) {
- $this->dataProcessorManager = \Drupal::service('plugin.manager.rules_data_processor');
- }
- return $this->dataProcessorManager;
- }
-
-}
diff --git a/modules/rules/src/Context/GlobalContextRepositoryTrait.php b/modules/rules/src/Context/GlobalContextRepositoryTrait.php
deleted file mode 100644
index 5a45c2f..0000000
--- a/modules/rules/src/Context/GlobalContextRepositoryTrait.php
+++ /dev/null
@@ -1,45 +0,0 @@
-contextRepository = $context_repository;
- return $this;
- }
-
- /**
- * Gets the global context repository.
- *
- * @return \Drupal\Core\Plugin\Context\ContextRepositoryInterface
- * The context repository.
- */
- public function getGlobalContextRepository() {
- if (empty($this->contextRepository)) {
- $this->contextRepository = \Drupal::service('context.repository');
- }
- return $this->contextRepository;
- }
-
-}
diff --git a/modules/rules/src/Controller/AutocompleteController.php b/modules/rules/src/Controller/AutocompleteController.php
deleted file mode 100644
index badc654..0000000
--- a/modules/rules/src/Controller/AutocompleteController.php
+++ /dev/null
@@ -1,46 +0,0 @@
-getComponent();
- $nested_expression = $component->getExpression()->getExpression($uuid);
- if ($nested_expression === FALSE) {
- // @todo We don't have a UUID when an expression is added. Just show all
- // variables available in that case. The correct solution would be to get
- // the form state of the expression form currently being added. That is
- // very complicated so we don't do it for now.
- $nested_expression = NULL;
- }
-
- $string = $request->query->get('q');
- $results = $component->autocomplete($string, $nested_expression);
-
- return new JsonResponse($results);
- }
-
-}
diff --git a/modules/rules/src/Controller/RulesComponentListBuilder.php b/modules/rules/src/Controller/RulesComponentListBuilder.php
deleted file mode 100644
index cbdbdbf..0000000
--- a/modules/rules/src/Controller/RulesComponentListBuilder.php
+++ /dev/null
@@ -1,43 +0,0 @@
-t('ID');
- $header['label'] = $this->t('Label');
- $header['description'] = $this->t('Description');
- $header['tags'] = $this->t('Tag');
- return $header + parent::buildHeader();
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- /* @var $entity \Drupal\rules\Entity\RulesComponentConfig */
- $row['id'] = $entity->id();
- $row['label'] = $this->getLabel($entity);
- $row['description'] = $entity->getDescription();
- $row['tags'] = implode(', ', $entity->getTags());
- return $row + parent::buildRow($entity);
- }
-
-}
diff --git a/modules/rules/src/Controller/RulesReactionListBuilder.php b/modules/rules/src/Controller/RulesReactionListBuilder.php
deleted file mode 100644
index a474e51..0000000
--- a/modules/rules/src/Controller/RulesReactionListBuilder.php
+++ /dev/null
@@ -1,43 +0,0 @@
-t('ID');
- $header['label'] = $this->t('Label');
- $header['description'] = $this->t('Description');
- $header['tags'] = $this->t('Tags');
- return $header + parent::buildHeader();
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- /* @var $entity \Drupal\rules\Entity\ReactionRuleConfig */
- $row['id'] = $entity->id();
- $row['label'] = $this->getLabel($entity);
- $row['description'] = $entity->getDescription();
- $row['tags'] = implode(', ', $entity->getTags());
- return $row + parent::buildRow($entity);
- }
-
-}
diff --git a/modules/rules/src/Core/Annotation/Condition.php b/modules/rules/src/Core/Annotation/Condition.php
deleted file mode 100644
index c882e46..0000000
--- a/modules/rules/src/Core/Annotation/Condition.php
+++ /dev/null
@@ -1,46 +0,0 @@
-discovery) {
- // Swap out the annotated class discovery used, so we can control the
- // annotation classes picked.
- $discovery = new AnnotatedClassDiscovery($this->subdir, $this->namespaces, $this->pluginDefinitionAnnotationName);
- $this->discovery = new ContainerDerivativeDiscoveryDecorator($discovery);
- }
- return $this->discovery;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDefinitions() {
- $definitions = parent::getDefinitions();
- // Make sure that all definitions have a category to avoid PHP notices in
- // CategorizingPluginManagerTrait.
- // @todo fix this in core in CategorizingPluginManagerTrait.
- foreach ($definitions as &$definition) {
- if (!isset($definition['category'])) {
- $definition['category'] = $this->t('Other');
- }
- }
- return $definitions;
- }
-
-}
diff --git a/modules/rules/src/Core/ConfigurationAccessControlInterface.php b/modules/rules/src/Core/ConfigurationAccessControlInterface.php
deleted file mode 100644
index 02b8b80..0000000
--- a/modules/rules/src/Core/ConfigurationAccessControlInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-hasPermission($perm)) {
- $access = TRUE;
- break;
- }
- }
-
- if (!$access) {
- // See if the plugin has a configuration_access annotation.
- $definition = $this->getPluginDefinition();
- if (!empty($definition['configure_permissions']) && is_array($definition['configure_permissions'])) {
- foreach ($definition['configure_permissions'] as $perm) {
- if ($account->hasPermission($perm)) {
- $access = TRUE;
- break;
- }
- }
- }
- }
-
- if ($return_as_object) {
- return $access ? AccessResult::allowed() : AccessResult::neutral();
- }
- return $access;
- }
-
-}
diff --git a/modules/rules/src/Core/ExecutablePluginTrait.php b/modules/rules/src/Core/ExecutablePluginTrait.php
deleted file mode 100644
index d0c5c17..0000000
--- a/modules/rules/src/Core/ExecutablePluginTrait.php
+++ /dev/null
@@ -1,45 +0,0 @@
-getPluginDefinition();
- if (empty($definition['label'])) {
- throw new InvalidPluginDefinitionException('The label is not defined for plugin ' . $this->getPluginId() . ' (' . __CLASS__ . ').');
- }
- // The label can be an instance of
- // \Drupal\Core\StringTranslation\TranslationWrapper here, so make sure to
- // always return a primitive string representation here.
- return (string) $definition['label'];
- }
-
- /**
- * Get the translated summary from the label annotation.
- *
- * @return string
- * The summary of the plugin.
- *
- * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
- * Thrown if a summary was not set.
- */
- public function summary() {
- return $this->getLabelValue();
- }
-
-}
diff --git a/modules/rules/src/Core/RulesActionBase.php b/modules/rules/src/Core/RulesActionBase.php
deleted file mode 100644
index 1abb893..0000000
--- a/modules/rules/src/Core/RulesActionBase.php
+++ /dev/null
@@ -1,129 +0,0 @@
-getMessage(), 'context is required') === FALSE) {
- throw $e;
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function refineContextDefinitions(array $selected_data) {
- // Do not refine anything by default.
- }
-
- /**
- * {@inheritdoc}
- */
- public function assertMetadata(array $selected_data) {
- // Nothing to assert by default.
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- return [
- 'id' => $this->getPluginId(),
- ] + $this->configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- $this->configuration = $configuration + $this->defaultConfiguration();
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function executeMultiple(array $objects) {
- // @todo: Remove this once it is removed from the interface.
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- // Per default no context parameters will be auto saved.
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
- // Just deny access per default for now.
- if ($return_as_object) {
- return AccessResult::forbidden();
- }
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function execute() {
- // Provide a reasonable default implementation that calls doExecute() while
- // passing the defined context as arguments.
- $args = [];
- foreach ($this->getContextDefinitions() as $name => $definition) {
- $args[$name] = $this->getContextValue($name);
- }
- call_user_func_array([$this, 'doExecute'], $args);
- }
-
-}
diff --git a/modules/rules/src/Core/RulesActionInterface.php b/modules/rules/src/Core/RulesActionInterface.php
deleted file mode 100644
index eb77f84..0000000
--- a/modules/rules/src/Core/RulesActionInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-alterInfo('rules_action_info');
- $this->setCacheBackend($cache_backend, 'rules_action_info');
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getDiscovery() {
- if (!$this->discovery) {
- // Swap out the annotated class discovery used, so we can control the
- // annotation classes picked.
- $discovery = new AnnotatedClassDiscovery($this->subdir, $this->namespaces, $this->pluginDefinitionAnnotationName);
- $this->discovery = new ContainerDerivativeDiscoveryDecorator($discovery);
- }
- return $this->discovery;
- }
-
-}
diff --git a/modules/rules/src/Core/RulesActionManagerInterface.php b/modules/rules/src/Core/RulesActionManagerInterface.php
deleted file mode 100644
index 4b1d08c..0000000
--- a/modules/rules/src/Core/RulesActionManagerInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-getMessage(), 'context is required') === FALSE) {
- throw $e;
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function negate($negate = TRUE) {
- $this->configuration['negate'] = $negate;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function evaluate() {
- // Provide a reasonable default implementation that calls doEvaluate() while
- // passing the defined context as arguments.
- $args = [];
- foreach ($this->getContextDefinitions() as $name => $definition) {
- $args[$name] = $this->getContextValue($name);
- }
- return call_user_func_array([$this, 'doEvaluate'], $args);
- }
-
-}
diff --git a/modules/rules/src/Core/RulesConditionInterface.php b/modules/rules/src/Core/RulesConditionInterface.php
deleted file mode 100644
index bc565bb..0000000
--- a/modules/rules/src/Core/RulesConditionInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-getPluginDefinition();
- if ($this instanceof RulesConfigurableEventHandlerInterface) {
- $this->refineContextDefinitions();
- }
- return !empty($definition['context']) ? $definition['context'] : [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getContextDefinition($name) {
- $definitions = $this->getContextDefinitions();
- if (empty($definitions[$name])) {
- throw new ContextException(sprintf("The %s context is not a valid context.", $name));
- }
- return $definitions[$name];
- }
-
-}
diff --git a/modules/rules/src/Core/RulesEventHandlerInterface.php b/modules/rules/src/Core/RulesEventHandlerInterface.php
deleted file mode 100644
index 3769bd1..0000000
--- a/modules/rules/src/Core/RulesEventHandlerInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
- RulesDefaultEventHandler::class,
- ];
-
- /**
- * {@inheritdoc}
- */
- public function __construct(ModuleHandlerInterface $module_handler) {
- $this->alterInfo('rules_event');
- $this->discovery = new ContainerDerivativeDiscoveryDecorator(new YamlDiscovery('rules.events', $module_handler->getModuleDirectories()));
- $this->factory = new ContainerFactory($this, RulesEventHandlerInterface::class);
- $this->moduleHandler = $module_handler;
- }
-
- /**
- * {@inheritdoc}
- */
- public function createInstance($plugin_id, array $configuration = []) {
- // If a fully qualified event name is passed, be sure to get the base name
- // first.
- $plugin_id = $this->getEventBaseName($plugin_id);
- return parent::createInstance($plugin_id, $configuration);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDefinition($plugin_id, $exception_on_invalid = TRUE) {
- // If a fully qualified event name is passed, be sure to get the base name
- // first.
- $plugin_id = $this->getEventBaseName($plugin_id);
- return parent::getDefinition($plugin_id, $exception_on_invalid);
- }
-
- /**
- * {@inheritdoc}
- */
- public function processDefinition(&$definition, $plugin_id) {
- parent::processDefinition($definition, $plugin_id);
- if (!isset($definition['context'])) {
- $definition['context'] = [];
- }
- // Convert the flat context arrays into ContextDefinition objects.
- foreach ($definition['context'] as $context_name => $values) {
- $definition['context'][$context_name] = ContextDefinition::createFromArray($values);
- }
- }
-
- /**
- * Gets the base name of a configured event name.
- *
- * For a configured event name like {EVENT_NAME}--{SUFFIX}, the base event
- * name {EVENT_NAME} is returned.
- *
- * @return string
- * The event base name.
- *
- * @see \Drupal\rules\Core\RulesConfigurableEventHandlerInterface::getEventNameSuffix()
- */
- public function getEventBaseName($event_name) {
- // Cut off any suffix from a configured event name.
- if (strpos($event_name, '--') !== FALSE) {
- $parts = explode('--', $event_name, 2);
- return $parts[0];
- }
- return $event_name;
- }
-
-}
diff --git a/modules/rules/src/Engine/ActionExpressionContainer.php b/modules/rules/src/Engine/ActionExpressionContainer.php
deleted file mode 100644
index 0bfc195..0000000
--- a/modules/rules/src/Engine/ActionExpressionContainer.php
+++ /dev/null
@@ -1,136 +0,0 @@
-expressionManager = $expression_manager;
-
- $configuration += ['actions' => []];
- foreach ($configuration['actions'] as $action_config) {
- $action = $expression_manager->createInstance($action_config['id'], $action_config);
- $this->actions[] = $action;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function addExpressionObject(ExpressionInterface $expression) {
- if (!$expression instanceof ActionExpressionInterface) {
- throw new InvalidExpressionException('Only action expressions can be added to an action container.');
- }
- if ($this->getExpression($expression->getUuid())) {
- throw new InvalidExpressionException('An action with the same UUID already exists in the container.');
- }
- $this->actions[] = $expression;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addAction($action_id, ContextConfig $config = NULL) {
- return $this->addExpressionObject(
- $this->expressionManager
- ->createAction($action_id)
- ->setConfiguration($config ? $config->toArray() : [])
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- $configuration = parent::getConfiguration();
- // We need to update the configuration in case actions have been added or
- // changed.
- $configuration['actions'] = [];
- foreach ($this->actions as $action) {
- $configuration['actions'][] = $action->getConfiguration();
- }
- return $configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getIterator() {
- return new \ArrayIterator($this->actions);
- }
-
- /**
- * PHP magic __clone function.
- */
- public function __clone() {
- // Implement a deep clone.
- foreach ($this->actions as &$action) {
- $action = clone $action;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getExpression($uuid) {
- foreach ($this->actions as $action) {
- if ($action->getUuid() === $uuid) {
- return $action;
- }
- if ($action instanceof ExpressionContainerInterface) {
- $nested_action = $action->getExpression($uuid);
- if ($nested_action) {
- return $nested_action;
- }
- }
- }
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function deleteExpression($uuid) {
- foreach ($this->actions as $index => $action) {
- if ($action->getUuid() === $uuid) {
- unset($this->actions[$index]);
- return TRUE;
- }
- if ($action instanceof ExpressionContainerInterface
- && $action->deleteExpression($uuid)
- ) {
- return TRUE;
- }
- }
- return FALSE;
- }
-
-}
diff --git a/modules/rules/src/Engine/ActionExpressionContainerInterface.php b/modules/rules/src/Engine/ActionExpressionContainerInterface.php
deleted file mode 100644
index 1abbeaa..0000000
--- a/modules/rules/src/Engine/ActionExpressionContainerInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-expressionManager = $expression_manager;
-
- $configuration += ['conditions' => []];
- foreach ($configuration['conditions'] as $condition_config) {
- $condition = $this->expressionManager->createInstance($condition_config['id'], $condition_config);
- $this->conditions[] = $condition;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function addExpressionObject(ExpressionInterface $expression) {
- if (!$expression instanceof ConditionExpressionInterface) {
- throw new InvalidExpressionException('Only condition expressions can be added to a condition container.');
- }
- if ($this->getExpression($expression->getUuid())) {
- throw new InvalidExpressionException('A condition with the same UUID already exists in the container.');
- }
- $this->conditions[] = $expression;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addCondition($condition_id, ContextConfig $config = NULL) {
- return $this->addExpressionObject(
- $this->expressionManager
- ->createCondition($condition_id)
- ->setConfiguration($config ? $config->toArray() : [])
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function executeWithState(ExecutionStateInterface $rules_state) {
- $result = $this->evaluate($rules_state);
- return $this->isNegated() ? !$result : $result;
- }
-
- /**
- * Returns the final result after executing the conditions.
- */
- abstract public function evaluate(ExecutionStateInterface $rules_state);
-
- /**
- * {@inheritdoc}
- */
- public function negate($negate = TRUE) {
- $this->configuration['negate'] = $negate;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isNegated() {
- return !empty($this->configuration['negate']);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- $configuration = parent::getConfiguration();
- // We need to update the configuration in case conditions have been added or
- // changed.
- $configuration['conditions'] = [];
- foreach ($this->conditions as $condition) {
- $configuration['conditions'][] = $condition->getConfiguration();
- }
- return $configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getIterator() {
- return new \ArrayIterator($this->conditions);
- }
-
- /**
- * PHP magic __clone function.
- */
- public function __clone() {
- // Implement a deep clone.
- foreach ($this->conditions as &$condition) {
- $condition = clone $condition;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getExpression($uuid) {
- foreach ($this->conditions as $condition) {
- if ($condition->getUuid() === $uuid) {
- return $condition;
- }
- if ($condition instanceof ExpressionContainerInterface) {
- $nested_condition = $condition->getExpression($uuid);
- if ($nested_condition) {
- return $nested_condition;
- }
- }
- }
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function deleteExpression($uuid) {
- foreach ($this->conditions as $index => $condition) {
- if ($condition->getUuid() === $uuid) {
- unset($this->conditions[$index]);
- return TRUE;
- }
- if ($condition instanceof ExpressionContainerInterface
- && $condition->deleteExpression($uuid)
- ) {
- return TRUE;
- }
- }
- return FALSE;
- }
-
-}
diff --git a/modules/rules/src/Engine/ConditionExpressionContainerInterface.php b/modules/rules/src/Engine/ConditionExpressionContainerInterface.php
deleted file mode 100644
index 63b05d3..0000000
--- a/modules/rules/src/Engine/ConditionExpressionContainerInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-dataDefinitions = $data_definitions;
- // Add definitions of all global contexts.
- $contexts = $this->getGlobalContextRepository()->getAvailableContexts();
- foreach ($contexts as $name => $context) {
- $this->setDataDefinition($name, $context
- ->getContextDefinition()
- ->getDataDefinition()
- );
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function setDataDefinition($name, DataDefinitionInterface $definition) {
- $this->dataDefinitions[$name] = $definition;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDataDefinition($name) {
- if (!array_key_exists($name, $this->dataDefinitions)) {
- throw new IntegrityException("Unable to get variable $name, it is not defined.");
- }
- return $this->dataDefinitions[$name];
- }
-
- /**
- * {@inheritdoc}
- */
- public function hasDataDefinition($name) {
- return array_key_exists($name, $this->dataDefinitions);
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeDataDefinition($name) {
- if (array_key_exists($name, $this->dataDefinitions)) {
- unset($this->dataDefinitions[$name]);
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function fetchDefinitionByPropertyPath($property_path, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED) {
- try {
- // Support global context names as variable name by ignoring points in
- // the service name; e.g. @user.current_user_context:current_user.name.
- if (isset($property_path[0]) && $property_path[0] == '@') {
- list($service, $property_path) = explode(':', $property_path, 2);
- }
- $parts = explode('.', $property_path);
- $var_name = array_shift($parts);
- if (isset($service)) {
- $var_name = $service . ':' . $var_name;
- }
- return $this
- ->getDataFetcher()
- ->fetchDefinitionBySubPaths($this->getDataDefinition($var_name), $parts, $langcode);
- }
- catch (TypedDataException $e) {
- // Pass on the original exception in the exception trace.
- throw new IntegrityException($e->getMessage(), 0, $e);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function autocomplete($partial_property_path) {
- return $this
- ->getDataFetcher()
- ->autocompletePropertyPath($this->dataDefinitions, $partial_property_path);
- }
-
-}
diff --git a/modules/rules/src/Engine/ExecutionMetadataStateInterface.php b/modules/rules/src/Engine/ExecutionMetadataStateInterface.php
deleted file mode 100644
index 350a49e..0000000
--- a/modules/rules/src/Engine/ExecutionMetadataStateInterface.php
+++ /dev/null
@@ -1,87 +0,0 @@
-variables = $variables;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setVariable($name, ContextDefinitionInterface $definition, $value) {
- $data = $this->getTypedDataManager()->create(
- $definition->getDataDefinition(),
- $value
- );
- $this->setVariableData($name, $data);
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setVariableData($name, TypedDataInterface $data) {
- $this->variables[$name] = $data;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getVariable($name) {
- if (!$this->hasVariable($name)) {
- throw new EvaluationException("Unable to get variable $name, it is not defined.");
- }
- return $this->variables[$name];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getVariableValue($name) {
- return $this->getVariable($name)->getValue();
- }
-
- /**
- * {@inheritdoc}
- */
- public function hasVariable($name) {
- if (!array_key_exists($name, $this->variables)) {
- // If there is no such variable, lazy-add global context variables. That
- // way can safe time fetching global context if its not needed.
- if (!($name[0] === '@' && strpos($name, ':') !== FALSE)) {
- return FALSE;
- }
- $contexts = $this->getGlobalContextRepository()->getRuntimeContexts([$name]);
- if (!array_key_exists($name, $contexts)) {
- return FALSE;
- }
- $this->setVariableData($name, $contexts[$name]->getContextData());
- }
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeVariable($name) {
- if (array_key_exists($name, $this->variables)) {
- unset($this->variables[$name]);
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function fetchDataByPropertyPath($property_path, $langcode = NULL) {
- try {
- // Support global context names as variable name by ignoring points in
- // the service name; e.g. @user.current_user_context:current_user.name.
- if ($property_path[0] == '@') {
- list($service, $property_path) = explode(':', $property_path, 2);
- }
- $parts = explode('.', $property_path);
- $var_name = array_shift($parts);
- if (isset($service)) {
- $var_name = $service . ':' . $var_name;
- }
- return $this
- ->getDataFetcher()
- ->fetchDataBySubPaths($this->getVariable($var_name), $parts, $langcode);
- }
- catch (InvalidArgumentException $e) {
- // Pass on the original exception in the exception trace.
- throw new EvaluationException($e->getMessage(), 0, $e);
- }
- catch (MissingDataException $e) {
- // Pass on the original exception in the exception trace.
- throw new EvaluationException($e->getMessage(), 0, $e);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function saveChangesLater($selector) {
- $this->saveLater[$selector] = TRUE;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAutoSaveSelectors() {
- return array_keys($this->saveLater);
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSave() {
- // Make changes permanent.
- foreach ($this->saveLater as $selector => $flag) {
- $typed_data = $this->fetchDataByPropertyPath($selector);
- // Things that can be saved must have a save() method, right?
- // Saving is always done at the root of the typed data tree, for example
- // on the entity level.
- $typed_data->getRoot()->getValue()->save();
- }
- return $this;
- }
-
-}
diff --git a/modules/rules/src/Engine/ExecutionStateInterface.php b/modules/rules/src/Engine/ExecutionStateInterface.php
deleted file mode 100644
index 5a2d411..0000000
--- a/modules/rules/src/Engine/ExecutionStateInterface.php
+++ /dev/null
@@ -1,135 +0,0 @@
-setConfiguration($configuration);
- }
-
- /**
- * Executes a rules expression.
- */
- public function execute() {
- // If there is no state given, we have to assume no required context.
- $state = ExecutionState::create();
- $result = $this->executeWithState($state);
- // Save specifically registered variables in the end after execution.
- $state->autoSave();
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- return [
- 'id' => $this->getPluginId(),
- 'uuid' => $this->uuid,
- ] + $this->configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- $this->configuration = $configuration + $this->defaultConfiguration();
- if (isset($configuration['uuid'])) {
- $this->uuid = $configuration['uuid'];
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormHandler() {
- if (isset($this->pluginDefinition['form_class'])) {
- $class_name = $this->pluginDefinition['form_class'];
- return new $class_name($this);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getRoot() {
- if (isset($this->root)) {
- // @todo: This seems to be the parent, not root.
- return $this->root->getRoot();
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setRoot(ExpressionInterface $root) {
- $this->root = $root;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getLabel() {
- return $this->pluginDefinition['label'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getUuid() {
- return $this->uuid;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setUuid($uuid) {
- $this->uuid = $uuid;
- }
-
-}
diff --git a/modules/rules/src/Engine/ExpressionContainerBase.php b/modules/rules/src/Engine/ExpressionContainerBase.php
deleted file mode 100644
index 3486b33..0000000
--- a/modules/rules/src/Engine/ExpressionContainerBase.php
+++ /dev/null
@@ -1,105 +0,0 @@
-get('plugin.manager.rules_expression')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function addExpression($plugin_id, ContextConfig $config = NULL) {
- return $this->addExpressionObject(
- $this->expressionManager->createInstance($plugin_id, $config ? $config->toArray() : [])
- );
- }
-
- /**
- * Determines whether child-expressions are allowed to assert metadata.
- *
- * @return bool
- * Whether child-expressions are allowed to assert metadata.
- *
- * @see \Drupal\rules\Engine\ExpressionInterface::prepareExecutionMetadataState()
- */
- abstract protected function allowsMetadataAssertions();
-
- /**
- * {@inheritdoc}
- */
- public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
- $violation_list = new IntegrityViolationList();
- $this->prepareExecutionMetadataStateBeforeTraversal($metadata_state);
- $apply_assertions = $apply_assertions && $this->allowsMetadataAssertions();
- foreach ($this as $child_expression) {
- $child_violations = $child_expression->checkIntegrity($metadata_state, $apply_assertions);
- $violation_list->addAll($child_violations);
- }
- $this->prepareExecutionMetadataStateAfterTraversal($metadata_state);
- return $violation_list;
- }
-
- /**
- * {@inheritdoc}
- */
- public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
- if ($until && $this->getUuid() === $until->getUuid()) {
- return TRUE;
- }
- $this->prepareExecutionMetadataStateBeforeTraversal($metadata_state);
- $apply_assertions = $apply_assertions && $this->allowsMetadataAssertions();
- foreach ($this as $child_expression) {
- $found = $child_expression->prepareExecutionMetadataState($metadata_state, $until, $apply_assertions);
- // If the expression was found, we need to stop.
- if ($found) {
- return TRUE;
- }
- }
- $this->prepareExecutionMetadataStateAfterTraversal($metadata_state);
- }
-
- /**
- * Prepares execution metadata state before traversing through children.
- *
- * @see ::prepareExecutionMetadataState()
- * @see ::checkIntegrity()
- */
- protected function prepareExecutionMetadataStateBeforeTraversal(ExecutionMetadataStateInterface $metadata_state) {
- // Any pre-traversal preparations need to be added here.
- }
-
- /**
- * Prepares execution metadata state after traversing through children.
- *
- * @see ::prepareExecutionMetadataState()
- * @see ::checkIntegrity()
- */
- protected function prepareExecutionMetadataStateAfterTraversal(ExecutionMetadataStateInterface $metadata_state) {
- // Any post-traversal preparations need to be added here.
- }
-
-}
diff --git a/modules/rules/src/Engine/ExpressionContainerInterface.php b/modules/rules/src/Engine/ExpressionContainerInterface.php
deleted file mode 100644
index 56b4101..0000000
--- a/modules/rules/src/Engine/ExpressionContainerInterface.php
+++ /dev/null
@@ -1,70 +0,0 @@
-alterInfo('rules_expression');
- parent::__construct('Plugin/RulesExpression', $namespaces, $module_handler, ExpressionInterface::class, $plugin_definition_annotation_name);
- $this->uuidService = $uuid_service;
- }
-
- /**
- * {@inheritdoc}
- */
- public function createInstance($plugin_id, array $configuration = []) {
- $instance = parent::createInstance($plugin_id, $configuration);
-
- // Make sure that the instance has a UUID and generate one if necessary.
- if (!$instance->getUuid()) {
- $instance->setUuid($this->uuidService->generate());
- }
- return $instance;
- }
-
- /**
- * {@inheritdoc}
- */
- public function createRule(array $configuration = []) {
- return $this->createInstance('rules_rule', $configuration);
- }
-
- /**
- * {@inheritdoc}
- */
- public function createActionSet(array $configuration = []) {
- return $this->createInstance('rules_action_set', $configuration);
- }
-
- /**
- * {@inheritdoc}
- */
- public function createAction($id, array $configuration = []) {
- return $this->createInstance('rules_action', [
- 'action_id' => $id,
- ] + $configuration);
- }
-
- /**
- * {@inheritdoc}
- */
- public function createCondition($id, array $configuration = []) {
- return $this->createInstance('rules_condition', [
- 'condition_id' => $id,
- ] + $configuration);
- }
-
- /**
- * {@inheritdoc}
- */
- public function createAnd() {
- return $this->createInstance('rules_and');
- }
-
- /**
- * {@inheritdoc}
- */
- public function createOr() {
- return $this->createInstance('rules_or');
- }
-
-}
diff --git a/modules/rules/src/Engine/ExpressionManagerInterface.php b/modules/rules/src/Engine/ExpressionManagerInterface.php
deleted file mode 100644
index 8b95ff9..0000000
--- a/modules/rules/src/Engine/ExpressionManagerInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-message = $message;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getMessage() {
- return $this->message;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setContextName($context_name) {
- $this->contextName = $context_name;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getContextName() {
- return $this->contextName;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setUuid($uuid) {
- $this->uuid = $uuid;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getUuid() {
- return $this->uuid;
- }
-
-}
diff --git a/modules/rules/src/Engine/IntegrityViolationInterface.php b/modules/rules/src/Engine/IntegrityViolationInterface.php
deleted file mode 100644
index b619f73..0000000
--- a/modules/rules/src/Engine/IntegrityViolationInterface.php
+++ /dev/null
@@ -1,73 +0,0 @@
-offsetGet($offset);
- }
- catch (\OutOfBoundsException $e) {
- throw new OutOfBoundsException();
- }
- }
-
- /**
- * Returns whether the given offset exists.
- *
- * @param int $offset
- * The violation offset.
- *
- * @return bool
- * Whether the offset exists.
- */
- public function has($offset) {
- return $this->offsetExists($offset);
- }
-
- /**
- * Creates a new violation with the message and adds it to this list.
- *
- * @param \Drupal\Core\StringTranslation\TranslatableMarkup $message
- * The violation message.
- * @param string $uuid
- * (Optional) UUID of the expression where the violation occurred.
- */
- public function addViolationWithMessage(TranslatableMarkup $message, $uuid = NULL) {
- $violation = new IntegrityViolation();
- $violation->setMessage($message);
- $violation->setUuid($uuid);
- $this[] = $violation;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFor($uuid) {
- $uuid_violations = [];
- foreach ($this as $violation) {
- if ($violation->getUuid() === $uuid) {
- $uuid_violations[] = $violation;
- }
- }
- return $uuid_violations;
- }
-
-}
diff --git a/modules/rules/src/Engine/RulesComponent.php b/modules/rules/src/Engine/RulesComponent.php
deleted file mode 100644
index aed6dd1..0000000
--- a/modules/rules/src/Engine/RulesComponent.php
+++ /dev/null
@@ -1,348 +0,0 @@
- [],
- 'provided_context_definitions' => [],
- ];
- // @todo: Can we improve this use dependency injection somehow?
- $expression_manager = \Drupal::service('plugin.manager.rules_expression');
- $expression = $expression_manager->createInstance($configuration['expression']['id'], $configuration['expression']);
- $component = static::create($expression);
- foreach ($configuration['context_definitions'] as $name => $definition) {
- $component->addContextDefinition($name, ContextDefinition::createFromArray($definition));
- }
- foreach ($configuration['provided_context_definitions'] as $name => $definition) {
- $component->provideContext($name);
- }
- return $component;
- }
-
- /**
- * Constructs the object.
- *
- * @param \Drupal\rules\Engine\ExpressionInterface $expression
- * The expression of the component.
- */
- protected function __construct(ExpressionInterface $expression) {
- $this->state = ExecutionState::create();
- $this->expression = $expression;
- }
-
- /**
- * Gets the expression of the component.
- *
- * @return \Drupal\rules\Engine\ExpressionInterface
- * The expression.
- */
- public function getExpression() {
- return $this->expression;
- }
-
- /**
- * Gets the configuration array of this component.
- *
- * @return array
- * The configuration of this component. It contains the following keys:
- * - expression: The configuration of the contained expression, including a
- * nested 'id' key.
- * - context_definitions: Array of context definition arrays, keyed by
- * context name.
- * - provided_context: The names of the context that is provided back.
- */
- public function getConfiguration() {
- return [
- 'expression' => $this->expression->getConfiguration(),
- 'context_definitions' => array_map(function (ContextDefinitionInterface $definition) {
- return $definition->toArray();
- }, $this->contextDefinitions),
- 'provided_context_definitions' => $this->providedContext,
- ];
- }
-
- /**
- * Gets the execution state.
- *
- * @return \Drupal\rules\Engine\ExecutionStateInterface
- * The execution state for this component.
- */
- public function getState() {
- return $this->state;
- }
-
- /**
- * Adds a context definition.
- *
- * @param string $name
- * The name of the context to add.
- * @param \Drupal\rules\Context\ContextDefinitionInterface $definition
- * The definition to add.
- *
- * @return $this
- */
- public function addContextDefinition($name, ContextDefinitionInterface $definition) {
- $this->contextDefinitions[$name] = $definition;
- return $this;
- }
-
- /**
- * Gets definitions for the context used by this component.
- *
- * @return \Drupal\rules\Context\ContextDefinitionInterface[]
- * The array of context definitions, keyed by context name.
- */
- public function getContextDefinitions() {
- return $this->contextDefinitions;
- }
-
- /**
- * Adds the available event context for the given events.
- *
- * @param string[] $event_names
- * The (fully qualified) event names; e.g., as configured for a reaction
- * rule.
- *
- * @return $this
- */
- public function addContextDefinitionsForEvents(array $event_names) {
- foreach ($event_names as $event_name) {
- // @todo: Correctly handle multiple events to intersect available context.
- // @todo Use setter injection for the service.
- $event_definition = \Drupal::service('plugin.manager.rules_event')->getDefinition($event_name);
- foreach ($event_definition['context'] as $context_name => $context_definition) {
- $this->addContextDefinition($context_name, $context_definition);
- }
- }
- return $this;
- }
-
- /**
- * Marks the given context to be provided back to the caller.
- *
- * @param string $name
- * The name of the context to provide.
- *
- * @return $this
- */
- public function provideContext($name) {
- $this->providedContext[] = $name;
- return $this;
- }
-
- /**
- * Returns the names of context that is provided back to the caller.
- *
- * @return string[]
- * The names of the context that is provided back.
- */
- public function getProvidedContext() {
- return $this->providedContext;
- }
-
- /**
- * Sets the value of a context.
- *
- * @param string $name
- * The name.
- * @param mixed $value
- * The context value.
- *
- * @return $this
- *
- * @throws \Drupal\rules\Exception\LogicException
- * Thrown if the passed context is not defined.
- */
- public function setContextValue($name, $value) {
- if (!isset($this->contextDefinitions[$name])) {
- throw new LogicException("The specified context '$name' is not defined.");
- }
- $this->state->setVariable($name, $this->contextDefinitions[$name], $value);
- return $this;
- }
-
- /**
- * Executes the component with the previously set context.
- *
- * @return mixed[]
- * The array of provided context values, keyed by context name.
- *
- * @throws \Drupal\rules\Exception\EvaluationException
- * Thrown if the Rules expression triggers errors during execution.
- */
- public function execute() {
- $this->expression->executeWithState($this->state);
- $this->state->autoSave();
- $result = [];
- foreach ($this->providedContext as $name) {
- $result[$name] = $this->state->getVariableValue($name);
- }
- return $result;
- }
-
- /**
- * Executes the component with the given values.
- *
- * @param mixed[] $arguments
- * The array of arguments; i.e., an array keyed by name of the defined
- * context and the context value as argument.
- *
- * @return mixed[]
- * The array of provided context values, keyed by context name.
- *
- * @throws \Drupal\rules\Exception\LogicException
- * Thrown if the context is not defined.
- * @throws \Drupal\rules\Exception\EvaluationException
- * Thrown if the Rules expression triggers errors during execution.
- */
- public function executeWithArguments(array $arguments) {
- $this->state = ExecutionState::create();
- foreach ($arguments as $name => $value) {
- $this->setContextValue($name, $value);
- }
- return $this->execute();
- }
-
- /**
- * Verifies that the given expression is valid with the defined context.
- *
- * @return \Drupal\rules\Engine\IntegrityViolationList
- * A list object containing \Drupal\rules\Engine\IntegrityViolation objects.
- */
- public function checkIntegrity() {
- $metadata_state = $this->getMetadataState();
- return $this->expression->checkIntegrity($metadata_state);
- }
-
- /**
- * Gets the metadata state with all context definitions as variables in it.
- *
- * Describes the metadata state before execution - only context definitions
- * are set as variables.
- *
- * @return \Drupal\rules\Engine\ExecutionMetadataStateInterface
- * The execution metadata state populated with context definitions.
- */
- public function getMetadataState() {
- $data_definitions = [];
- foreach ($this->contextDefinitions as $name => $context_definition) {
- $data_definitions[$name] = $context_definition->getDataDefinition();
- }
-
- return ExecutionMetadataState::create($data_definitions);
- }
-
- /**
- * Calculates dependencies for the component.
- *
- * @return array
- * An array of dependencies grouped by type (config, content, module,
- * theme).
- *
- * @see \Drupal\Component\Plugin\DependentPluginInterface::calculateDependencies()
- */
- public function calculateDependencies() {
- // @todo: Complete implementation and add test coverage.
- $this->addDependency('module', 'rules');
- $this->addDependencies($this->getExpression()->calculateDependencies());
- return $this->dependencies;
- }
-
- /**
- * PHP magic __clone function.
- */
- public function __clone() {
- // Implement a deep clone.
- $this->state = clone $this->state;
- $this->expression = clone $this->expression;
- }
-
- /**
- * Returns autocomplete results for the given partial selector.
- *
- * Example: "node.uid.e" will return ["node.uid.entity"].
- *
- * @param string $partial_selector
- * The partial data selector.
- * @param \Drupal\rules\Engine\ExpressionInterface $until
- * The expression in which the autocompletion will be executed. All
- * variables in the exection metadata state up to that point are available.
- *
- * @return array[]
- * A list of autocomplete suggestions - valid property paths for one of the
- * provided data definitions. Each entry is an array with the following
- * keys:
- * - value: the data selecor property path.
- * - label: the human readable label suggestion.
- */
- public function autocomplete($partial_selector, ExpressionInterface $until = NULL) {
- // We use the integrity check to populate the execution metadata state with
- // available variables.
- $metadata_state = $this->getMetadataState();
- $this->expression->prepareExecutionMetadataState($metadata_state, $until);
-
- return $metadata_state->autocomplete($partial_selector);
- }
-
-}
diff --git a/modules/rules/src/Engine/RulesComponentRepository.php b/modules/rules/src/Engine/RulesComponentRepository.php
deleted file mode 100644
index f89a851..0000000
--- a/modules/rules/src/Engine/RulesComponentRepository.php
+++ /dev/null
@@ -1,118 +0,0 @@
-cacheBackend = $cache_backend;
- $this->languageManager = $language_manager;
- $this->langcode = $this->languageManager->getCurrentLanguage()->getId();
- }
-
- /**
- * {@inheritdoc}
- */
- public function addComponentResolver(RulesComponentResolverInterface $resolver, $resolver_name) {
- $this->resolvers[$resolver_name] = $resolver;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($id, $provider = 'rules_component') {
- $result = $this->getMultiple([$id], $provider);
- return reset($result) ?: NULL;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getMultiple(array $ids, $provider = 'rules_component') {
- if (!isset($this->resolvers[$provider])) {
- throw new InvalidArgumentException("Invalid component provider $provider given.");
- }
- $cids = [];
- foreach ($ids as $id) {
- $cids[$id] = "$provider:$id:$this->langcode";
- }
- $results = array_intersect_key($this->components, array_flip($cids));
- $cids_missing = array_diff_assoc($cids, array_keys($results));
-
- if ($cids_missing) {
- // Note that the cache backend removes resolved IDs.
- $cache_results = $this->cacheBackend->getMultiple($cids_missing);
- foreach ($cache_results as $cid => $cache_result) {
- $this->components[$cid] = $cache_result->data;
- $results[$cid] = $cache_result->data;
- }
- if ($cids_missing) {
- $resolved_results = $this->resolvers[$provider]->getMultiple(array_keys($cids_missing));
- $cache_items = [];
- foreach ($resolved_results as $id => $component) {
- $cid = $cids[$id];
- $this->components[$cid] = $component;
- $results[$cid] = $component;
- $cache_items[$cid]['data'] = $component;
- }
- // Cache entries to speed up future lookups.
- $this->cacheBackend->setMultiple($cache_items);
- }
- }
- return $results;
- }
-
-}
diff --git a/modules/rules/src/Engine/RulesComponentRepositoryInterface.php b/modules/rules/src/Engine/RulesComponentRepositoryInterface.php
deleted file mode 100644
index 7f21f1a..0000000
--- a/modules/rules/src/Engine/RulesComponentRepositoryInterface.php
+++ /dev/null
@@ -1,69 +0,0 @@
- 'rules_rule',
- ];
-
- /**
- * Stores a reference to the executable expression version of this component.
- *
- * @var \Drupal\rules\Engine\ExpressionInterface
- */
- protected $expressionObject;
-
- /**
- * The events this reaction rule is reacting on.
- *
- * Events array. The array is numerically indexed and contains arrays with the
- * following structure:
- * - event_name: String with the event machine name.
- * - configuration: An array containing the event configuration.
- *
- * @var array
- */
- protected $events = [];
-
- /**
- * Sets a Rules expression instance for this Reaction rule.
- *
- * @param \Drupal\rules\Engine\ExpressionInterface $expression
- * The expression to set.
- *
- * @return $this
- */
- public function setExpression(ExpressionInterface $expression) {
- $this->expressionObject = $expression;
- $this->expression = $expression->getConfiguration();
- return $this;
- }
-
- /**
- * Gets a Rules expression instance for this Reaction rule.
- *
- * @return \Drupal\rules\Engine\ExpressionInterface
- * A Rules expression instance.
- */
- public function getExpression() {
- // Ensure that an executable Rules expression is available.
- if (!isset($this->expressionObject)) {
- $this->expressionObject = $this->getExpressionManager()->createInstance($this->expression['id'], $this->expression);
- }
- return $this->expressionObject;
- }
-
- /**
- * {@inheritdoc}
- *
- * Gets the Rules component that is invoked when the events are dispatched.
- * The returned component has the definitions of the available event context
- * set.
- */
- public function getComponent() {
- $component = RulesComponent::create($this->getExpression());
- $component->addContextDefinitionsForEvents($this->getEventNames());
- return $component;
- }
-
- /**
- * {@inheritdoc}
- */
- public function updateFromComponent(RulesComponent $component) {
- // Note that the available context definitions stem from the configured
- // events, which are handled separately.
- $this->setExpression($component->getExpression());
- return $this;
- }
-
- /**
- * Returns the Rules expression manager.
- *
- * @todo Actually we should use dependency injection here, but is that even
- * possible with config entities? How?
- *
- * @return \Drupal\rules\Engine\ExpressionManager
- * The Rules expression manager.
- */
- protected function getExpressionManager() {
- return \Drupal::service('plugin.manager.rules_expression');
- }
-
- /**
- * {@inheritdoc}
- */
- public function createDuplicate() {
- $duplicate = parent::createDuplicate();
- unset($duplicate->expressionObject);
- return $duplicate;
- }
-
- /**
- * Overrides \Drupal\Core\Entity\Entity::label().
- *
- * When a certain component does not have a label return the ID.
- */
- public function label() {
- if (!$label = $this->get('label')) {
- $label = $this->id();
- }
- return $label;
- }
-
- /**
- * Returns the description.
- */
- public function getDescription() {
- return $this->description;
- }
-
- /**
- * Returns the tags associated with this config.
- *
- * @return string[]
- * The numerically indexed array of tag names.
- */
- public function getTags() {
- return $this->tags;
- }
-
- /**
- * Gets configuration of all events the rule is reacting on.
- *
- * @return array
- * The events array. The array is numerically indexed and contains arrays
- * with the following structure:
- * - event_name: String with the event machine name.
- * - configuration: An array containing the event configuration.
- */
- public function getEvents() {
- return $this->events;
- }
-
- /**
- * Gets fully qualified names of all events the rule is reacting on.
- *
- * @return string[]
- * The array of fully qualified event names of the rule.
- */
- public function getEventNames() {
- $names = [];
- foreach ($this->events as $event) {
- $names[] = $event['event_name'];
- }
- return $names;
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- parent::calculateDependencies();
- $this->addDependencies($this->getComponent()->calculateDependencies());
- return $this->dependencies;
- }
-
- /**
- * Magic clone method.
- */
- public function __clone() {
- // Remove the reference to the expression object in the clone so that the
- // expression object tree is created from scratch.
- unset($this->expressionObject);
- }
-
-}
diff --git a/modules/rules/src/Entity/ReactionRuleStorage.php b/modules/rules/src/Entity/ReactionRuleStorage.php
deleted file mode 100644
index b931bba..0000000
--- a/modules/rules/src/Entity/ReactionRuleStorage.php
+++ /dev/null
@@ -1,153 +0,0 @@
-stateService = $state_service;
- $this->drupalKernel = $drupal_kernel;
- $this->eventManager = $event_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
- return new static(
- $entity_type,
- $container->get('config.factory'),
- $container->get('uuid'),
- $container->get('language_manager'),
- $container->get('state'),
- $container->get('kernel'),
- $container->get('plugin.manager.rules_event')
- );
- }
-
- /**
- * Returns a list of event names that are used by active reaction rules.
- *
- * @return string[]
- * The list of event names keyed by event name.
- */
- protected function getRegisteredEvents() {
- $events = [];
- foreach ($this->loadMultiple() as $rules_config) {
- foreach ($rules_config->getEventNames() as $event_name) {
- $event_name = $this->eventManager->getEventBaseName($event_name);
- if (!isset($events[$event_name])) {
- $events[$event_name] = $event_name;
- }
- }
- }
- return $events;
- }
-
- /**
- * {@inheritdoc}
- */
- public function save(EntityInterface $entity) {
- // We need to get the registered events before the rule is saved, in order
- // to be able to check afterwards if we need to rebuild the container or
- // not.
- $events_before = $this->getRegisteredEvents();
- $return = parent::save($entity);
-
- // Update the state of registered events.
- $this->stateService->set('rules.registered_events', $this->getRegisteredEvents());
-
- // After the reaction rule is saved, we need to rebuild the container,
- // otherwise the reaction rule will not fire. However, we can do an
- // optimization: if every event was already registered before, we do not
- // have to rebuild the container.
- foreach ($entity->getEventNames() as $event_name) {
- if (empty($events_before[$event_name])) {
- $this->drupalKernel->rebuildContainer();
- break;
- }
- }
-
- return $return;
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete(array $entities) {
- // After deleting a set of reaction rules, sometimes we may need to rebuild
- // the container, to clean it up, so that the generic subscriber is not
- // registered in the container for the rule events which we do not use
- // anymore. So we do that if there is any change in the registered events,
- // after the reaction rules are deleted.
- $events_before = $this->getRegisteredEvents();
- $return = parent::delete($entities);
- $events_after = $this->getRegisteredEvents();
-
- // Update the state of registered events and rebuild the container.
- if ($events_before != $events_after) {
- $this->stateService->set('rules.registered_events', $events_after);
- $this->drupalKernel->rebuildContainer();
- }
-
- return $return;
- }
-
-}
diff --git a/modules/rules/src/Entity/RulesComponentConfig.php b/modules/rules/src/Entity/RulesComponentConfig.php
deleted file mode 100644
index dd4921a..0000000
--- a/modules/rules/src/Entity/RulesComponentConfig.php
+++ /dev/null
@@ -1,264 +0,0 @@
-getComponent()->getExpression();
- }
-
- /**
- * Sets a Rules expression instance for this Rules component.
- *
- * @param \Drupal\rules\Engine\ExpressionInterface $expression
- * The expression to set.
- *
- * @return $this
- */
- public function setExpression(ExpressionInterface $expression) {
- $this->component['expression'] = $expression->getConfiguration();
- unset($this->componentObject);
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getComponent() {
- if (!isset($this->componentObject)) {
- $this->componentObject = RulesComponent::createFromConfiguration($this->component);
- }
- return $this->componentObject;
- }
-
- /**
- * {@inheritdoc}
- */
- public function updateFromComponent(RulesComponent $component) {
- $this->component = $component->getConfiguration();
- $this->componentObject = $component;
- return $this;
- }
-
- /**
- * Gets the definitions of the used context.
- *
- * @return \Drupal\rules\Context\ContextDefinitionInterface[]
- * The array of context definition, keyed by context name.
- */
- public function getContextDefinitions() {
- $definitions = [];
- if (!empty($this->component['context_definitions'])) {
- foreach ($this->component['context_definitions'] as $name => $definition) {
- $definitions[$name] = ContextDefinition::createFromArray($definition);
- }
- }
- return $definitions;
- }
-
- /**
- * Sets the definitions of the used context.
- *
- * @param \Drupal\rules\Context\ContextDefinitionInterface[] $definitions
- * The array of context definitions, keyed by context name.
- *
- * @return $this
- */
- public function setContextDefinitions(array $definitions) {
- $this->component['context_definitions'] = [];
- foreach ($definitions as $name => $definition) {
- $this->component['context_definitions'][$name] = $definition->toArray();
- }
- return $this;
- }
-
- /**
- * Gets the definitions of the provided context.
- *
- * @return \Drupal\rules\Context\ContextDefinitionInterface[]
- * The array of context definition, keyed by context name.
- */
- public function getProvidedContextDefinitions() {
- $definitions = [];
- if (!empty($this->component['provided_context_definitions'])) {
- foreach ($this->component['provided_context_definitions'] as $name => $definition) {
- $definitions[$name] = ContextDefinition::createFromArray($definition);
- }
- }
- return $definitions;
- }
-
- /**
- * Sets the definitions of the provided context.
- *
- * @param \Drupal\rules\Context\ContextDefinitionInterface[] $definitions
- * The array of context definitions, keyed by context name.
- *
- * @return $this
- */
- public function setProvidedContextDefinitions(array $definitions) {
- $this->component['provided_context_definitions'] = [];
- foreach ($definitions as $name => $definition) {
- $this->component['provided_context_definitions'][$name] = $definition->toArray();
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function createDuplicate() {
- $duplicate = parent::createDuplicate();
- unset($duplicate->componentObject);
- return $duplicate;
- }
-
- /**
- * Overrides \Drupal\Core\Entity\Entity::label().
- *
- * When a certain component does not have a label return the ID.
- */
- public function label() {
- if (!$label = $this->get('label')) {
- $label = $this->id();
- }
- return $label;
- }
-
- /**
- * Returns the description.
- */
- public function getDescription() {
- return $this->description;
- }
-
- /**
- * Returns the tags associated with this config.
- *
- * @return string[]
- * The numerically indexed array of tag names.
- */
- public function getTags() {
- return $this->tags;
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- parent::calculateDependencies();
- $this->addDependencies($this->getComponent()->calculateDependencies());
- return $this->dependencies;
- }
-
- /**
- * Magic clone method.
- */
- public function __clone() {
- // Remove the reference to the expression object in the clone so that the
- // expression object tree is created from scratch.
- unset($this->expression);
- }
-
-}
diff --git a/modules/rules/src/Event/EntityEvent.php b/modules/rules/src/Event/EntityEvent.php
deleted file mode 100644
index 67ed8a9..0000000
--- a/modules/rules/src/Event/EntityEvent.php
+++ /dev/null
@@ -1,14 +0,0 @@
-account = $account;
- }
-
-}
diff --git a/modules/rules/src/Event/UserLogoutEvent.php b/modules/rules/src/Event/UserLogoutEvent.php
deleted file mode 100644
index a056df1..0000000
--- a/modules/rules/src/Event/UserLogoutEvent.php
+++ /dev/null
@@ -1,16 +0,0 @@
-defaultConfiguration() as $key => $configuration) {
- $this->configuration[$key] = $form_state->hasValue($key) ? $form_state->getValue($key) : $configuration;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- return $this->configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- $this->configuration = $configuration + $this->defaultConfiguration();
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- return [];
- }
-
-}
diff --git a/modules/rules/src/EventHandler/ConfigurableEventHandlerEntityBundle.php b/modules/rules/src/EventHandler/ConfigurableEventHandlerEntityBundle.php
deleted file mode 100644
index e479042..0000000
--- a/modules/rules/src/EventHandler/ConfigurableEventHandlerEntityBundle.php
+++ /dev/null
@@ -1,67 +0,0 @@
-getSubject()->bundle();
- }
- return $events_suffixes;
- }
-
- /**
- * {@inheritdoc}
- */
- public function summary() {
- // Nothing to do by default.
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- // Nothing to do by default.
- }
-
- /**
- * {@inheritdoc}
- */
- public function validate() {
- // Nothing to check by default.
- }
-
- /**
- * {@inheritdoc}
- */
- public function getEventNameSuffix() {
- // Nothing to do by default.
- }
-
- /**
- * {@inheritdoc}
- */
- public function refineContextDefinitions() {
- // Nothing to refine by default.
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- // Nothing to calculate by default.
- }
-
-}
diff --git a/modules/rules/src/EventSubscriber/GenericEventSubscriber.php b/modules/rules/src/EventSubscriber/GenericEventSubscriber.php
deleted file mode 100644
index c0e5b3f..0000000
--- a/modules/rules/src/EventSubscriber/GenericEventSubscriber.php
+++ /dev/null
@@ -1,136 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->eventManager = $event_manager;
- $this->componentRepository = $component_repository;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function getSubscribedEvents() {
- // Register this listener for every event that is used by a reaction rule.
- $events = [];
- $callback = ['onRulesEvent', 100];
-
- // If there is no state service there is nothing we can do here. This static
- // method could be called early when the container is built, so the state
- // service might no always be available.
- if (!\Drupal::hasService('state')) {
- return [];
- }
-
- // Since we cannot access the reaction rule config storage here we have to
- // use the state system to provide registered Rules events. The Reaction
- // Rule storage is responsible for keeping the registered events up to date
- // in the state system.
- // @see \Drupal\rules\Entity\ReactionRuleStorage
- $state = \Drupal::state();
- $registered_event_names = $state->get('rules.registered_events');
- if (!empty($registered_event_names)) {
- foreach ($registered_event_names as $event_name) {
- $events[$event_name][] = $callback;
- }
- }
- return $events;
- }
-
- /**
- * Reacts on the given event and invokes configured reaction rules.
- *
- * @param \Symfony\Component\EventDispatcher\Event $event
- * The event object containing context for the event.
- * @param string $event_name
- * The event name.
- */
- public function onRulesEvent(Event $event, $event_name) {
- // Get event metadata and the to be triggered events.
- $event_definition = $this->eventManager->getDefinition($event_name);
- $handler_class = $event_definition['class'];
- $triggered_events = [$event_name];
- if (is_subclass_of($handler_class, RulesConfigurableEventHandlerInterface::class)) {
- $qualified_event_suffixes = $handler_class::determineQualifiedEvents($event, $event_name, $event_definition);
- foreach ($qualified_event_suffixes as $qualified_event_suffix) {
- $triggered_events[] = "$event_name--$qualified_event_suffix";
- }
- }
-
- // Setup the execution state.
- $state = ExecutionState::create();
- foreach ($event_definition['context'] as $context_name => $context_definition) {
- // If this is a GenericEvent get the context for the rule from the event
- // arguments.
- if ($event instanceof GenericEvent) {
- $value = $event->getArgument($context_name);
- }
- // Else there must be a getter method or public property.
- // @todo: Add support for the getter method.
- else {
- $value = $event->$context_name;
- }
- $state->setVariable(
- $context_name,
- $context_definition,
- $value
- );
- }
-
- $components = $this->componentRepository
- ->getMultiple($triggered_events, 'rules_event');
-
- foreach ($components as $component) {
- $component->getExpression()
- ->executeWithState($state);
- }
- $state->autoSave();
- }
-
-}
diff --git a/modules/rules/src/EventSubscriber/RedirectEventSubscriber.php b/modules/rules/src/EventSubscriber/RedirectEventSubscriber.php
deleted file mode 100644
index e3a48cc..0000000
--- a/modules/rules/src/EventSubscriber/RedirectEventSubscriber.php
+++ /dev/null
@@ -1,42 +0,0 @@
-getRequest();
- $redirect_url = $request->attributes->get('_rules_redirect_action_url');
- if (isset($redirect_url)) {
- $event->setResponse(new RedirectResponse($redirect_url));
- }
- }
-
- /**
- * Registers the methods in this class that should be listeners.
- *
- * @return array
- * An array of event listener definitions.
- */
- public static function getSubscribedEvents() {
- $events[KernelEvents::RESPONSE][] = ['checkRedirectIssued'];
- return $events;
- }
-
-}
diff --git a/modules/rules/src/Exception/EvaluationException.php b/modules/rules/src/Exception/EvaluationException.php
deleted file mode 100644
index 50adc71..0000000
--- a/modules/rules/src/Exception/EvaluationException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-expressionManager = $expression_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static($container->get('plugin.manager.rules_expression'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, RulesUiHandlerInterface $rules_ui_handler = NULL, $uuid = NULL, $expression_id = NULL) {
- $this->expressionId = $expression_id;
- $this->uuid = $uuid;
-
- // When initially adding the expression, we have to initialize the object
- // and add the expression.
- if (!$this->uuid) {
- // Before we add our edited expression to the component's expression,
- // we clone it such that we do not change the source component until
- // the form has been successfully submitted.
- $component = clone $rules_ui_handler->getComponent();
- $this->uuid = $this->getEditedExpression($component)->getUuid();
- $form_state->set('component', $component);
- $form_state->set('uuid', $this->uuid);
- }
-
- return parent::buildForm($form, $form_state, $rules_ui_handler, $this->uuid);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditedExpression(RulesComponent $component) {
- $component_expression = $component->getExpression();
- if (!$component_expression instanceof ExpressionContainerInterface) {
- throw new LogicException('Cannot add expression to expression of type ' . $component_expression->getPluginId());
- }
- if ($this->uuid && $expression = $component_expression->getExpression($this->uuid)) {
- return $expression;
- }
- else {
- $expression = $this->expressionManager->createInstance($this->expressionId);
- $rule_expression = $component->getExpression();
- $rule_expression->addExpressionObject($expression);
- return $expression;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- parent::submitForm($form, $form_state);
- $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
- }
-
- /**
- * Provides the page title on the form.
- */
- public function getTitle(RulesUiHandlerInterface $rules_ui_handler, $expression_id) {
- $this->expressionId = $expression_id;
- $expression = $this->expressionManager->createInstance($this->expressionId);
- return $this->t('Add @expression', ['@expression' => $expression->getLabel()]);
- }
-
-}
diff --git a/modules/rules/src/Form/BreakLockForm.php b/modules/rules/src/Form/BreakLockForm.php
deleted file mode 100644
index 2a559d2..0000000
--- a/modules/rules/src/Form/BreakLockForm.php
+++ /dev/null
@@ -1,122 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->renderer = $renderer;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('entity_type.manager'),
- $container->get('renderer')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'rules_break_lock_confirm';
- }
-
- /**
- * {@inheritdoc}
- */
- public function getQuestion() {
- return $this->t('Do you want to break the lock on %label?', ['%label' => $this->rulesUiHandler->getComponentLabel()]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDescription() {
- $locked = $this->rulesUiHandler->getLockMetaData();
- $account = $this->entityTypeManager->getStorage('user')->load($locked->owner);
- $username = [
- '#theme' => 'username',
- '#account' => $account,
- ];
- return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', [
- '@user' => $this->renderer->render($username),
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return $this->rulesUiHandler->getBaseRouteUrl();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return $this->t('Break lock');
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, RulesUiHandlerInterface $rules_ui_handler = NULL) {
- $this->rulesUiHandler = $rules_ui_handler;
- if (!$rules_ui_handler->isLocked()) {
- $form['message']['#markup'] = $this->t('There is no lock on %label to break.', ['%label' => $rules_ui_handler->getComponentLabel()]);
- return $form;
- }
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->rulesUiHandler->clearTemporaryStorage();
- $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
- drupal_set_message($this->t('The lock has been broken and you may now edit this @component_type.', [
- '@component_type' => $this->rulesUiHandler->getPluginDefinition()->component_type_label,
- ]));
- }
-
-}
diff --git a/modules/rules/src/Form/DeleteExpressionForm.php b/modules/rules/src/Form/DeleteExpressionForm.php
deleted file mode 100644
index 3bcb754..0000000
--- a/modules/rules/src/Form/DeleteExpressionForm.php
+++ /dev/null
@@ -1,85 +0,0 @@
-rulesUiHandler = $rules_ui_handler;
- $this->uuid = $uuid;
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return $this->t('Delete');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getQuestion() {
- $rule_expression = $this->rulesUiHandler->getComponent()->getExpression();
- $expression_inside = $rule_expression->getExpression($this->uuid);
- if (!$expression_inside) {
- throw new NotFoundHttpException();
- }
-
- return $this->t('Are you sure you want to delete %title from %rule?', [
- '%title' => $expression_inside->getLabel(),
- '%rule' => $this->rulesUiHandler->getComponentLabel(),
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return $this->rulesUiHandler->getBaseRouteUrl();
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $component = $this->rulesUiHandler->getComponent();
- $component->getExpression()->deleteExpression($this->uuid);
- $this->rulesUiHandler->updateComponent($component);
- $form_state->setRedirectUrl($this->getCancelUrl());
- }
-
-}
diff --git a/modules/rules/src/Form/EditExpressionForm.php b/modules/rules/src/Form/EditExpressionForm.php
deleted file mode 100644
index f754b46..0000000
--- a/modules/rules/src/Form/EditExpressionForm.php
+++ /dev/null
@@ -1,145 +0,0 @@
-getExpression();
- return $rule_expression->getExpression($this->uuid);
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, RulesUiHandlerInterface $rules_ui_handler = NULL, $uuid = NULL) {
- $this->rulesUiHandler = $rules_ui_handler;
- $this->component = is_object($form_state->get('component')) ? $form_state->get('component') : $this->rulesUiHandler->getComponent();
- $this->uuid = $form_state->get('uuid') ?: $uuid;
-
- // During form rebuilds, keep track of changes using form state.
- $form_state->set('rules_ui_handler', $this->rulesUiHandler);
- $form_state->set('component', $this->component);
- $form_state->set('uuid', $this->uuid);
-
- $expression = $this->getEditedExpression($this->component, $form_state);
-
- if (!$expression) {
- throw new NotFoundHttpException();
- }
- $form_handler = $expression->getFormHandler();
- $form = $form_handler->form($form, $form_state);
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'rules_expression_edit';
- }
-
- /**
- * Builds an updated component object based upon the submitted form values.
- *
- * @param array $form
- * An associative array containing the structure of the form.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The current state of the form.
- *
- * @return \Drupal\rules\Engine\RulesComponent
- * The updated component.
- */
- protected function buildComponent(array $form, FormStateInterface $form_state) {
- $component = clone $this->component;
-
- // In order to update the whole component we need to invoke the submission
- // handler of the expression form. That way the expression gets changed
- // accordingly.
- $expression = $this->getEditedExpression($component);
- $form_handler = $expression->getFormHandler();
- $form_handler->submitForm($form, $form_state);
- return $component;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- // Ensure the object properties are initialized, see
- // https://www.drupal.org/node/2669032.
- $this->rulesUiHandler = $form_state->get('rules_ui_handler');
- $this->component = is_object($form_state->get('component')) ? $form_state->get('component') : $this->rulesUiHandler->getComponent();
- $this->uuid = $form_state->get('uuid');
-
- $this->rulesUiHandler->validateLock($form, $form_state);
-
- // @todo: This ignores ExpressionFormInterface::validateForm().
-
- $component = $this->buildComponent($form, $form_state);
- $violations = $component->checkIntegrity();
-
- // Only show the violations caused by the edited expression.
- foreach ($violations->getFor($this->uuid) as $violation) {
- $form_state->setError($form, $violation->getMessage());
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->component = $this->buildComponent($form, $form_state);
- $this->rulesUiHandler->updateComponent($this->component);
- $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
- }
-
- /**
- * Provides the page title on the form.
- */
- public function getTitle(RulesUiHandlerInterface $rules_ui_handler, $uuid) {
- $this->uuid = $uuid;
- $expression = $this->getEditedExpression($rules_ui_handler->getComponent());
- return $this->t('Edit @expression', ['@expression' => $expression->getLabel()]);
- }
-
-}
diff --git a/modules/rules/src/Form/EmbeddedComponentForm.php b/modules/rules/src/Form/EmbeddedComponentForm.php
deleted file mode 100644
index 328d660..0000000
--- a/modules/rules/src/Form/EmbeddedComponentForm.php
+++ /dev/null
@@ -1,77 +0,0 @@
-rulesUiHandler = $rules_ui_handler;
- }
-
- /**
- * Gets the form handler for the component's expression.
- *
- * @return \Drupal\rules\Form\Expression\ExpressionFormInterface|null
- * The form handling object if there is one, NULL otherwise.
- */
- protected function getFormHandler() {
- return $this->rulesUiHandler
- ->getComponent()
- ->getExpression()
- ->getFormHandler();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'rules_embedded_component_' . $this->rulesUiHandler->getPluginId();
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $form['locked'] = $this->rulesUiHandler->addLockInformation();
- return $this->getFormHandler()->form($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- $this->rulesUiHandler->validateLock($form, $form_state);
- $this->getFormHandler()->validateForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->getFormHandler()->submitForm($form, $form_state);
- }
-
-}
diff --git a/modules/rules/src/Form/Expression/ActionContainerForm.php b/modules/rules/src/Form/Expression/ActionContainerForm.php
deleted file mode 100644
index eb0b934..0000000
--- a/modules/rules/src/Form/Expression/ActionContainerForm.php
+++ /dev/null
@@ -1,89 +0,0 @@
-actionSet = $action_set;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $form['action_table'] = [
- '#type' => 'container',
- ];
-
- $form['action_table']['table'] = [
- '#theme' => 'table',
- '#caption' => $this->t('Actions'),
- '#header' => [$this->t('Elements'), $this->t('Operations')],
- '#empty' => t('None'),
- ];
-
- foreach ($this->actionSet as $action) {
- $form['action_table']['table']['#rows'][] = [
- 'element' => $action->getLabel(),
- 'operations' => [
- 'data' => [
- '#type' => 'dropbutton',
- '#links' => [
- 'edit' => [
- 'title' => $this->t('Edit'),
- 'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.edit', [
- 'uuid' => $action->getUuid(),
- ]),
- ],
- 'delete' => [
- 'title' => $this->t('Delete'),
- 'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.delete', [
- 'uuid' => $action->getUuid(),
- ]),
- ],
- ],
- ],
- ],
- ];
- }
-
- // @todo Put this into the table as last row and style it like it was in
- // Drupal 7 Rules.
- $form['add_action'] = [
- '#attributes' => ['class' => ['action-links']],
- '#theme' => 'menu_local_action',
- '#link' => [
- 'title' => $this->t('Add action'),
- 'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.add', [
- 'expression_id' => 'rules_action',
- ]),
- ],
- ];
-
- return $form;
- }
-
-}
diff --git a/modules/rules/src/Form/Expression/ActionForm.php b/modules/rules/src/Form/Expression/ActionForm.php
deleted file mode 100644
index e93e6a0..0000000
--- a/modules/rules/src/Form/Expression/ActionForm.php
+++ /dev/null
@@ -1,143 +0,0 @@
-actionManager = $action_manager;
- $this->actionExpression = $action_expression;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $action_id = $form_state->get('action_id');
- $configuration = $this->actionExpression->getConfiguration();
- if (empty($action_id) && !empty($configuration['action_id'])) {
- $action_id = $configuration['action_id'];
- $form_state->set('action_id', $action_id);
- }
-
- // Step 1 of the multistep form.
- if (!$action_id) {
- $action_definitions = $this->actionManager->getGroupedDefinitions();
- $options = [];
- foreach ($action_definitions as $group => $definitions) {
- foreach ($definitions as $id => $definition) {
- $options[$group][$id] = $definition['label'];
- }
- }
-
- $form['action_id'] = [
- '#type' => 'select',
- '#title' => $this->t('Action'),
- '#options' => $options,
- '#required' => TRUE,
- ];
- $form['continue'] = [
- '#type' => 'submit',
- '#value' => $this->t('Continue'),
- '#name' => 'continue',
- // Only validate the selected action in the first step.
- '#limit_validation_errors' => [['action_id']],
- '#submit' => [static::class . '::submitFirstStep'],
- ];
-
- return $form;
- }
-
- // Step 2 of the form.
- $action = $this->actionManager->createInstance($action_id);
-
- $form['summary'] = [
- '#markup' => $action->summary(),
- ];
-
- $context_definitions = $action->getContextDefinitions();
-
- $form['context']['#tree'] = TRUE;
- foreach ($context_definitions as $context_name => $context_definition) {
- $form = $this->buildContextForm($form, $form_state, $context_name, $context_definition, $configuration);
- }
-
- $form['save'] = [
- '#type' => 'submit',
- '#value' => $this->t('Save'),
- '#name' => 'save',
- ];
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array $form, FormStateInterface $form_state) {
- // Only if there is an action selected already we can validate something.
- if ($form_state->get('action_id')) {
- // Invoke the submission handler which will setup the expression being
- // edited in the form. That way the expression is ready for other
- // validation handlers.
- $this->submitForm($form, $form_state);
- }
- }
-
- /**
- * Submit callback: save the selected action in the first step.
- */
- public static function submitFirstStep(array &$form, FormStateInterface $form_state) {
- $form_state->set('action_id', $form_state->getValue('action_id'));
- $form_state->setRebuild();
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $action_id = $form_state->get('action_id');
- // Nothing todo as long as the first step is not completed.
- if (!$action_id) {
- return;
- }
-
- $action_definition = $this->actionManager->getDefinition($action_id);
- $context_config = $this->getContextConfigFromFormValues($form_state, $action_definition['context']);
-
- $configuration = $context_config->toArray();
- $configuration['action_id'] = $action_id;
- $this->actionExpression->setConfiguration($configuration);
- }
-
-}
diff --git a/modules/rules/src/Form/Expression/ConditionContainerForm.php b/modules/rules/src/Form/Expression/ConditionContainerForm.php
deleted file mode 100644
index 58d0347..0000000
--- a/modules/rules/src/Form/Expression/ConditionContainerForm.php
+++ /dev/null
@@ -1,89 +0,0 @@
-conditionContainer = $condition_container;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $form['conditions'] = [
- '#type' => 'container',
- ];
-
- $form['conditions']['table'] = [
- '#theme' => 'table',
- '#caption' => $this->t('Conditions'),
- '#header' => [$this->t('Elements'), $this->t('Operations')],
- '#empty' => t('None'),
- ];
-
- foreach ($this->conditionContainer as $condition) {
- $form['conditions']['table']['#rows'][] = [
- 'element' => $condition->getLabel(),
- 'operations' => [
- 'data' => [
- '#type' => 'dropbutton',
- '#links' => [
- 'edit' => [
- 'title' => $this->t('Edit'),
- 'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.edit', [
- 'uuid' => $condition->getUuid(),
- ]),
- ],
- 'delete' => [
- 'title' => $this->t('Delete'),
- 'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.delete', [
- 'uuid' => $condition->getUuid(),
- ]),
- ],
- ],
- ],
- ],
- ];
- }
-
- // @todo Put this into the table as last row and style it like it was in
- // Drupal 7 Rules.
- $form['add_condition'] = [
- '#attributes' => ['class' => ['action-links']],
- '#theme' => 'menu_local_action',
- '#link' => [
- 'title' => $this->t('Add condition'),
- 'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.add', [
- 'expression_id' => 'rules_condition',
- ]),
- ],
- ];
-
- return $form;
- }
-
-}
diff --git a/modules/rules/src/Form/Expression/ConditionForm.php b/modules/rules/src/Form/Expression/ConditionForm.php
deleted file mode 100644
index c6ed139..0000000
--- a/modules/rules/src/Form/Expression/ConditionForm.php
+++ /dev/null
@@ -1,158 +0,0 @@
-conditionManager = $condition_manager;
- $this->conditionExpression = $condition_expression;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $condition_id = $form_state->get('condition_id');
-
- $configuration = $this->conditionExpression->getConfiguration();
- if (empty($condition_id) && !empty($configuration['condition_id'])) {
- $condition_id = $configuration['condition_id'];
- $form_state->set('condition_id', $condition_id);
- }
-
- // Step 1 of the multistep form.
- if (!$condition_id) {
- $condition_definitions = $this->conditionManager->getGroupedDefinitions();
- $options = [];
- foreach ($condition_definitions as $group => $definitions) {
- foreach ($definitions as $id => $definition) {
- $options[$group][$id] = $definition['label'];
- }
- }
-
- $form['condition_id'] = [
- '#type' => 'select',
- '#title' => $this->t('Condition'),
- '#options' => $options,
- '#required' => TRUE,
- ];
- $form['continue'] = [
- '#type' => 'submit',
- '#value' => $this->t('Continue'),
- '#name' => 'continue',
- // Only validate the selected condition in the first step.
- '#limit_validation_errors' => [['condition_id']],
- '#submit' => [static::class . '::submitFirstStep'],
- ];
-
- return $form;
- }
-
- // Step 2 of the form.
- /** @var \Drupal\rules\Core\RulesConditionInterface $condition */
- $condition = $this->conditionManager->createInstance($condition_id);
-
- $form['summary'] = [
- '#markup' => $condition->summary(),
- ];
-
- $context_definitions = $condition->getContextDefinitions();
-
- $form['context']['#tree'] = TRUE;
- foreach ($context_definitions as $context_name => $context_definition) {
- $form = $this->buildContextForm($form, $form_state, $context_name, $context_definition, $configuration);
- }
-
- $form['negate_wrapper'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Negate'),
- ];
-
- $form['negate_wrapper']['negate'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Negate this condition'),
- '#default_value' => $configuration['negate'] ?: 0,
- '#description' => $this->t('If checked, the condition result is negated such that it returns TRUE if it evaluates to FALSE.'),
- ];
-
- $form['save'] = [
- '#type' => 'submit',
- '#value' => $this->t('Save'),
- '#name' => 'save',
- ];
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array $form, FormStateInterface $form_state) {
- // Only if there is a condition selected already we can validate something.
- if ($form_state->get('condition_id')) {
- // Invoke the submission handler which will setup the expression being
- // edited in the form. That way the expression is ready for other
- // validation handlers.
- $this->submitForm($form, $form_state);
- }
- }
-
- /**
- * Submit callback: save the selected condition in the first step.
- */
- public static function submitFirstStep(array &$form, FormStateInterface $form_state) {
- $form_state->set('condition_id', $form_state->getValue('condition_id'));
- $form_state->setRebuild();
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $condition_id = $form_state->get('condition_id');
- // Nothing todo as long as the first step is not completed.
- if (!$condition_id) {
- return;
- }
-
- $condition_definition = $this->conditionManager->getDefinition($condition_id);
- $context_config = $this->getContextConfigFromFormValues($form_state, $condition_definition['context']);
-
- $configuration = $context_config->toArray();
- $configuration['condition_id'] = $form_state->get('condition_id');
- $configuration['negate'] = $form_state->getValue('negate');
- $this->conditionExpression->setConfiguration($configuration);
- }
-
-}
diff --git a/modules/rules/src/Form/Expression/ContextFormTrait.php b/modules/rules/src/Form/Expression/ContextFormTrait.php
deleted file mode 100644
index 65aeacc..0000000
--- a/modules/rules/src/Form/Expression/ContextFormTrait.php
+++ /dev/null
@@ -1,147 +0,0 @@
- 'fieldset',
- '#title' => $context_definition->getLabel(),
- ];
- $form['context'][$context_name]['description'] = [
- '#markup' => $context_definition->getDescription(),
- ];
-
- // If the form has been submitted already take the mode from the submitted
- // values, otherwise default to existing configuration. And if that does not
- // exist default to the "input" mode.
- $mode = $form_state->get('context_' . $context_name);
- if (!$mode) {
- if (isset($configuration['context_mapping'][$context_name])) {
- $mode = 'selector';
- }
- else {
- $mode = 'input';
- }
- $form_state->set('context_' . $context_name, $mode);
- }
-
- $title = $mode == 'selector' ? $this->t('Data selector') : $this->t('Value');
-
- if (isset($configuration['context_values'][$context_name])) {
- $default_value = $configuration['context_values'][$context_name];
- }
- elseif (isset($configuration['context_mapping'][$context_name])) {
- $default_value = $configuration['context_mapping'][$context_name];
- }
- else {
- $default_value = $context_definition->getDefaultValue();
- }
- $form['context'][$context_name]['setting'] = [
- '#type' => 'textfield',
- '#title' => $title,
- '#required' => $context_definition->isRequired(),
- '#default_value' => $default_value,
- ];
-
- $element = &$form['context'][$context_name]['setting'];
-
- if ($mode == 'selector') {
- $element['#description'] = $this->t("The data selector helps you drill down into the data available to Rules. To make entity fields appear in the data selector, you may have to use the condition 'entity has field' (or 'content is of type'). More useful tips about data selection is available in the online documentation .", [
- ':url' => 'https://www.drupal.org/node/1300042',
- ]);
-
- $url = $this->getRulesUiHandler()->getUrlFromRoute('autocomplete', []);
- $element['#attributes']['class'][] = 'rules-autocomplete';
- $element['#attributes']['data-autocomplete-path'] = $url->toString();
- $element['#attached']['library'][] = 'rules/rules.autocomplete';
- }
- elseif ($context_definition->isMultiple()) {
- $element['#type'] = 'textarea';
- // @todo get a description for possible values that can be filled in.
- $element['#description'] = $this->t('Enter one value per line for this multi-valued context.');
-
- // Glue the list of values together as one item per line in the text area.
- if (is_array($default_value)) {
- $element['#default_value'] = implode("\n", $default_value);
- }
- }
-
- $value = $mode == 'selector' ? $this->t('Switch to the direct input mode') : $this->t('Switch to data selection');
- $form['context'][$context_name]['switch_button'] = [
- '#type' => 'submit',
- '#name' => 'context_' . $context_name,
- '#attributes' => ['class' => ['rules-switch-button']],
- '#parameter' => $context_name,
- '#value' => $value,
- '#submit' => [static::class . '::switchContextMode'],
- // Do not validate!
- '#limit_validation_errors' => [],
- ];
- return $form;
- }
-
- /**
- * Creates a context config object from the submitted form values.
- *
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The form state containing the submitted values.
- * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface[] $context_definitions
- * The context definitions of the plugin.
- *
- * @return \Drupal\rules\Context\ContextConfig
- * The context config object populated with context mappings/values.
- */
- protected function getContextConfigFromFormValues(FormStateInterface $form_state, array $context_definitions) {
- $context_config = ContextConfig::create();
- foreach ($form_state->getValue('context') as $context_name => $value) {
- if ($form_state->get("context_$context_name") == 'selector') {
- $context_config->map($context_name, $value['setting']);
- }
- else {
- // Each line of the textarea is one value for multiple contexts.
- if ($context_definitions[$context_name]->isMultiple()) {
- $values = explode("\n", $value['setting']);
- $context_config->setValue($context_name, $values);
- }
- else {
- $context_config->setValue($context_name, $value['setting']);
- }
- // For now, always add in the token context processor - if it's present.
- // @todo: Improve this in https://www.drupal.org/node/2804035.
- if ($this->getDataProcessorManager()->getDefinition('rules_tokens')) {
- $context_config->process($context_name, 'rules_tokens');
- }
- }
- }
-
- return $context_config;
- }
-
- /**
- * Submit callback: switch a context to data selecor or direct input mode.
- */
- public static function switchContextMode(array &$form, FormStateInterface $form_state) {
- $element_name = $form_state->getTriggeringElement()['#name'];
- $mode = $form_state->get($element_name);
- $switched_mode = $mode == 'selector' ? 'input' : 'selector';
- $form_state->set($element_name, $switched_mode);
-
- $form_state->setRebuild();
- }
-
-}
diff --git a/modules/rules/src/Form/Expression/ExpressionFormInterface.php b/modules/rules/src/Form/Expression/ExpressionFormInterface.php
deleted file mode 100644
index 5b5064c..0000000
--- a/modules/rules/src/Form/Expression/ExpressionFormInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-rule = $rule;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $conditions_form_handler = $this->rule->getConditions()->getFormHandler();
- $form = $conditions_form_handler->form($form, $form_state);
-
- $actions_form_handler = $this->rule->getActions()->getFormHandler();
- $form = $actions_form_handler->form($form, $form_state);
-
- return $form;
- }
-
-}
diff --git a/modules/rules/src/Form/ReactionRuleAddForm.php b/modules/rules/src/Form/ReactionRuleAddForm.php
deleted file mode 100644
index 0293e44..0000000
--- a/modules/rules/src/Form/ReactionRuleAddForm.php
+++ /dev/null
@@ -1,87 +0,0 @@
-eventManager = $event_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static($container->get('plugin.manager.rules_expression'), $container->get('plugin.manager.rules_event'));
- }
-
- /**
- * {@inheritdoc}
- */
- protected function actions(array $form, FormStateInterface $form_state) {
- $actions = parent::actions($form, $form_state);
- $actions['submit']['#value'] = $this->t('Save');
- return $actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $form = parent::form($form, $form_state);
-
- $event_definitions = $this->eventManager->getGroupedDefinitions();
- $options = [];
- foreach ($event_definitions as $group => $definitions) {
- foreach ($definitions as $id => $definition) {
- $options[$group][$id] = $definition['label'];
- }
- }
-
- $form['events']['#tree'] = TRUE;
- $form['events'][]['event_name'] = [
- '#type' => 'select',
- '#title' => $this->t('React on event'),
- '#options' => $options,
- '#required' => TRUE,
- '#description' => $this->t('Whenever the event occurs, rule evaluation is triggered.'),
- ];
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function save(array $form, FormStateInterface $form_state) {
- parent::save($form, $form_state);
-
- drupal_set_message($this->t('Reaction rule %label has been created.', ['%label' => $this->entity->label()]));
- $form_state->setRedirect('entity.rules_reaction_rule.edit_form', ['rules_reaction_rule' => $this->entity->id()]);
- }
-
-}
diff --git a/modules/rules/src/Form/ReactionRuleEditForm.php b/modules/rules/src/Form/ReactionRuleEditForm.php
deleted file mode 100644
index 1ef7235..0000000
--- a/modules/rules/src/Form/ReactionRuleEditForm.php
+++ /dev/null
@@ -1,142 +0,0 @@
-eventManager = $event_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static($container->get('plugin.manager.rules_expression'), $container->get('plugin.manager.rules_event'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, RulesUiConfigHandler $rules_ui_handler = NULL) {
- // Overridden such we can receive further route parameters.
- $this->rulesUiHandler = $rules_ui_handler;
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function prepareEntity() {
- parent::prepareEntity();
- // Replace the config entity with the latest entity from temp store, so any
- // interim changes are picked up.
- $this->entity = $this->rulesUiHandler->getConfig();
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- foreach ($this->entity->getEventNames() as $key => $event_name) {
- $event_definition = $this->eventManager->getDefinition($event_name);
- $form['event'][$key] = [
- '#type' => 'item',
- '#title' => $this->t('Events:'),
- '#markup' => $this->t('@label (@name)', [
- '@label' => $event_definition['label'],
- '@name' => $event_name,
- ]),
- ];
- }
- $form = $this->rulesUiHandler->getForm()->buildForm($form, $form_state);
- return parent::form($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- parent::validateForm($form, $form_state);
- $this->rulesUiHandler->getForm()->validateForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function actions(array $form, FormStateInterface $form_state) {
- $actions = parent::actions($form, $form_state);
- $actions['submit']['#value'] = $this->t('Save');
- $actions['cancel'] = [
- '#type' => 'submit',
- '#limit_validation_errors' => [['locked']],
- '#value' => $this->t('Cancel'),
- '#submit' => ['::cancel'],
- ];
- return $actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function save(array $form, FormStateInterface $form_state) {
- $this->rulesUiHandler->getForm()->submitForm($form, $form_state);
-
- // Persist changes by saving the entity.
- parent::save($form, $form_state);
-
- // Also remove the temporarily stored component, it has been persisted now.
- $this->rulesUiHandler->clearTemporaryStorage();
-
- drupal_set_message($this->t('Reaction rule %label has been updated.', ['%label' => $this->entity->label()]));
- }
-
- /**
- * Form submission handler for the 'cancel' action.
- */
- public function cancel(array $form, FormStateInterface $form_state) {
- $this->rulesUiHandler->clearTemporaryStorage();
- drupal_set_message($this->t('Canceled.'));
- $form_state->setRedirect('entity.rules_reaction_rule.collection');
- }
-
- /**
- * Title callback: also display the rule label.
- */
- public function getTitle($rules_reaction_rule) {
- return $this->t('Edit reaction rule "@label"', ['@label' => $rules_reaction_rule->label()]);
- }
-
-}
diff --git a/modules/rules/src/Form/RulesComponentAddForm.php b/modules/rules/src/Form/RulesComponentAddForm.php
deleted file mode 100644
index 29ca665..0000000
--- a/modules/rules/src/Form/RulesComponentAddForm.php
+++ /dev/null
@@ -1,50 +0,0 @@
-getRawParameter($entity_type_id) !== NULL) {
- $entity = $route_match->getParameter($entity_type_id);
- }
- else {
- $values = [];
- // @todo: Create the right expression depending on the route.
- $entity = $this->entityTypeManager->getStorage($entity_type_id)->create($values);
- $entity->setExpression($this->expressionManager->createRule());
-
- }
- return $entity;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function actions(array $form, FormStateInterface $form_state) {
- $actions = parent::actions($form, $form_state);
- $actions['submit']['#value'] = $this->t('Save');
- return $actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function save(array $form, FormStateInterface $form_state) {
- parent::save($form, $form_state);
-
- drupal_set_message($this->t('Component %label has been created.', ['%label' => $this->entity->label()]));
- $form_state->setRedirect('entity.rules_component.edit_form', ['rules_component' => $this->entity->id()]);
- }
-
-}
diff --git a/modules/rules/src/Form/RulesComponentEditForm.php b/modules/rules/src/Form/RulesComponentEditForm.php
deleted file mode 100644
index 8ffd615..0000000
--- a/modules/rules/src/Form/RulesComponentEditForm.php
+++ /dev/null
@@ -1,101 +0,0 @@
-rulesUiHandler = $rules_ui_handler;
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function prepareEntity() {
- parent::prepareEntity();
- // Replace the config entity with the latest entity from temp store, so any
- // interim changes are picked up.
- $this->entity = $this->rulesUiHandler->getConfig();
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $form = $this->rulesUiHandler->getForm()->buildForm($form, $form_state);
- return parent::form($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- parent::validateForm($form, $form_state);
- $this->rulesUiHandler->getForm()->validateForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function actions(array $form, FormStateInterface $form_state) {
- $actions = parent::actions($form, $form_state);
- $actions['submit']['#value'] = $this->t('Save');
- $actions['cancel'] = [
- '#type' => 'submit',
- '#limit_validation_errors' => [['locked']],
- '#value' => $this->t('Cancel'),
- '#submit' => ['::cancel'],
- ];
- return $actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function save(array $form, FormStateInterface $form_state) {
- $this->rulesUiHandler->getForm()->submitForm($form, $form_state);
-
- // Persist changes by saving the entity.
- parent::save($form, $form_state);
-
- // Also remove the temporarily stored component, it has been persisted now.
- $this->rulesUiHandler->clearTemporaryStorage();
-
- drupal_set_message($this->t('Rule component %label has been updated.', ['%label' => $this->entity->label()]));
- }
-
- /**
- * Form submission handler for the 'cancel' action.
- */
- public function cancel(array $form, FormStateInterface $form_state) {
- $this->rulesUiHandler->clearTemporaryStorage();
- drupal_set_message($this->t('Canceled.'));
- $form_state->setRedirect('entity.rules_component.collection');
- }
-
- /**
- * Title callback: also display the rule label.
- */
- public function getTitle($rules_component) {
- return $this->t('Edit rules component "@label"', ['@label' => $rules_component->label()]);
- }
-
-}
diff --git a/modules/rules/src/Form/RulesComponentFormBase.php b/modules/rules/src/Form/RulesComponentFormBase.php
deleted file mode 100644
index 590ea21..0000000
--- a/modules/rules/src/Form/RulesComponentFormBase.php
+++ /dev/null
@@ -1,112 +0,0 @@
-get('plugin.manager.rules_expression'));
- }
-
- /**
- * Creates a new object of this class.
- *
- * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
- * The expression manager.
- */
- public function __construct(ExpressionManagerInterface $expression_manager) {
- $this->expressionManager = $expression_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $form['settings'] = [
- '#type' => 'details',
- '#title' => $this->t('Settings'),
- '#open' => $this->entity->isNew(),
- ];
-
- $form['settings']['label'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Label'),
- '#default_value' => $this->entity->label(),
- '#required' => TRUE,
- ];
-
- $form['settings']['id'] = [
- '#type' => 'machine_name',
- '#description' => $this->t('A unique machine-readable name. Can only contain lowercase letters, numbers, and underscores.'),
- '#disabled' => !$this->entity->isNew(),
- '#default_value' => $this->entity->id(),
- '#machine_name' => [
- 'exists' => [$this, 'exists'],
- 'replace_pattern' => '([^a-z0-9_]+)|(^custom$)',
- 'source' => ['settings', 'label'],
- 'error' => $this->t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'),
- ],
- ];
-
- // @todo enter a real tag field here.
- $form['settings']['tags'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Tags'),
- '#default_value' => implode(', ', $this->entity->getTags()),
- '#description' => $this->t('Enter a list of comma-separated tags here; e.g., "notification, publishing".'),
- '#required' => FALSE,
- ];
-
- $form['settings']['description'] = [
- '#type' => 'textarea',
- '#default_value' => $this->entity->getDescription(),
- '#description' => $this->t('Enter a description for this component.'),
- '#title' => $this->t('Description'),
- ];
-
- return parent::form($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildEntity(array $form, FormStateInterface $form_state) {
- $entity = parent::buildEntity($form, $form_state);
- $tags = array_map('trim', explode(',', $entity->get('tags')));
- $entity->set('tags', $tags);
- return $entity;
- }
-
- /**
- * Machine name exists callback.
- *
- * @param string $id
- * The machine name ID.
- *
- * @return bool
- * TRUE if an entity with the same name already exists, FALSE otherwise.
- */
- public function exists($id) {
- $type = $this->entity->getEntityTypeId();
- return (bool) $this->entityTypeManager->getStorage($type)->load($id);
- }
-
-}
diff --git a/modules/rules/src/Form/RulesSettingsForm.php b/modules/rules/src/Form/RulesSettingsForm.php
deleted file mode 100644
index 6e3345e..0000000
--- a/modules/rules/src/Form/RulesSettingsForm.php
+++ /dev/null
@@ -1,101 +0,0 @@
-config('rules.settings');
- $form['log'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('System log'),
- ];
- $form['log']['log'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Log debug information'),
- '#default_value' => $config->get('log'),
- ];
- $form['log']['log_level_system'] = [
- '#type' => 'radios',
- '#title' => $this->t('Log level'),
- '#options' => [
- LogLevel::WARNING => $this->t('Log all warnings and errors'),
- LogLevel::ERROR => $this->t('Log errors only'),
- ],
- '#default_value' => $config->get('log_level_system') ? $config->get('log_level_system') : LogLevel::WARNING,
- '#description' => $this->t('Evaluations errors are logged to available loggers.'),
- '#states' => [
- // Hide the log_level radios when the debug log is disabled.
- 'invisible' => [
- 'input[name="log"]' => ['checked' => FALSE],
- ],
- ],
- ];
- $form['debug_screen_log'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Screen log'),
- ];
- $form['debug_screen_log']['debug_screen'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Show debug information on screen (in the HTML response)'),
- '#default_value' => $config->get('debug_screen'),
- ];
- $form['debug_screen_log']['log_level_screen'] = [
- '#type' => 'radios',
- '#title' => $this->t('Log level'),
- '#options' => [
- LogLevel::WARNING => $this->t('Log all warnings and errors'),
- LogLevel::ERROR => $this->t('Log errors only'),
- ],
- '#default_value' => $config->get('log_level_screen') ? $config->get('log_level_screen') : LogLevel::WARNING,
- '#description' => $this->t('Level of log messages shown on screen.'),
- '#states' => [
- // Hide the log_level radios when the debug log is disabled.
- 'invisible' => [
- 'input[name="debug_screen"]' => ['checked' => FALSE],
- ],
- ],
- ];
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->config('rules.settings')
- ->set('log', $form_state->getValue('log'))
- ->set('debug_screen', $form_state->getValue('debug_screen'))
- ->set('log_level_system', $form_state->getValue('log_level_system'))
- ->set('log_level_screen', $form_state->getValue('log_level_screen'))
- ->save();
-
- parent::submitForm($form, $form_state);
- }
-
-}
diff --git a/modules/rules/src/Logger/RulesLog.php b/modules/rules/src/Logger/RulesLog.php
deleted file mode 100644
index e61bebb..0000000
--- a/modules/rules/src/Logger/RulesLog.php
+++ /dev/null
@@ -1,75 +0,0 @@
-dispatcher = $dispatcher;
- $this->parser = $parser;
- }
-
- /**
- * {@inheritdoc}
- *
- * @todo: create a TypedData logger-entry object: https://www.drupal.org/node/2625238
- */
- public function log($level, $message, array $context = []) {
- // Remove any backtraces since they may contain an unserializable variable.
- unset($context['backtrace']);
-
- // Convert PSR3-style messages to SafeMarkup::format() style, so they can be
- // translated too in runtime.
- $message_placeholders = $this->parser->parseMessagePlaceholders($message, $context);
-
- $logger_entry = [
- 'uid' => $context['uid'],
- 'type' => $context['channel'],
- 'message' => $message,
- 'variables' => $message_placeholders,
- 'severity' => $level,
- 'link' => $context['link'],
- 'location' => $context['request_uri'],
- 'referer' => $context['referer'],
- 'hostname' => $context['ip'],
- 'timestamp' => $context['timestamp'],
- ];
-
- // Dispatch logger_entry event.
- $event = new SystemLoggerEvent($logger_entry, ['logger_entry' => $logger_entry]);
- $this->dispatcher->dispatch(SystemLoggerEvent::EVENT_NAME, $event);
- }
-
-}
diff --git a/modules/rules/src/Logger/RulesLoggerChannel.php b/modules/rules/src/Logger/RulesLoggerChannel.php
deleted file mode 100644
index ce2ab98..0000000
--- a/modules/rules/src/Logger/RulesLoggerChannel.php
+++ /dev/null
@@ -1,80 +0,0 @@
-config = $config_factory->get('rules.settings');
- }
-
- /**
- * {@inheritdoc}
- */
- public function log($level, $message, array $context = []) {
- $this->logs[] = [
- 'level' => $level,
- 'message' => $message,
- 'context' => $context,
- ];
-
- // Log message only if rules logging setting is enabled.
- if ($this->config->get('log')) {
- if ($this->levelTranslation[$this->config->get('log_level_system')] >= $this->levelTranslation[$level]) {
- parent::log($level, $message, $context);
- }
- }
- if ($this->config->get('debug_screen')) {
- if ($this->levelTranslation[$this->config->get('log_level_screen')] >= $this->levelTranslation[$level]) {
- drupal_set_message($message, $level);
- }
- }
- }
-
- /**
- * Returns the structured array of entries.
- *
- * @return array
- * Array of stored log entries.
- */
- public function getLogs() {
- return $this->logs;
- }
-
- /**
- * Clears the static logs entries cache.
- */
- public function clearLogs() {
- $this->logs = [];
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataComparison.php b/modules/rules/src/Plugin/Condition/DataComparison.php
deleted file mode 100644
index 3354d6b..0000000
--- a/modules/rules/src/Plugin/Condition/DataComparison.php
+++ /dev/null
@@ -1,92 +0,0 @@
-, CONTAINS (for strings or arrays) and IN (for arrays or lists)."),
- * default_value = "==",
- * ),
- * "value" = @ContextDefinition("any",
- * label = @Translation("Data value"),
- * description = @Translation("The value to compare the data with.")
- * )
- * }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- * @todo: Find a way to port rules_condition_data_is_operator_options() from Drupal 7.
- */
-class DataComparison extends RulesConditionBase {
-
- /**
- * Evaluate the data comparison.
- *
- * @param mixed $data
- * Supplied data to test.
- * @param string $operation
- * Data comparison operation. Typically one of:
- * - "=="
- * - "<"
- * - ">"
- * - "contains" (for strings or arrays)
- * - "IN" (for arrays or lists).
- * @param mixed $value
- * The value to be compared against $data.
- *
- * @return bool
- * The evaluation of the condition.
- */
- protected function doEvaluate($data, $operation, $value) {
- $operation = $operation ? strtolower($operation) : '==';
- switch ($operation) {
- case '<':
- return $data < $value;
-
- case '>':
- return $data > $value;
-
- case 'contains':
- return is_string($data) && strpos($data, $value) !== FALSE || is_array($data) && in_array($value, $data);
-
- case 'in':
- return is_array($value) && in_array($data, $value);
-
- case '==':
- default:
- // In case both values evaluate to FALSE, further differentiate between
- // NULL values and values evaluating to FALSE.
- if (!$data && !$value) {
- return (isset($data) && isset($value)) || (!isset($data) && !isset($value));
- }
- return $data == $value;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function refineContextDefinitions(array $selected_data) {
- if (isset($selected_data['data'])) {
- $this->pluginDefinition['context']['value']->setDataType($selected_data['data']->getDataType());
- if ($this->getContextValue('operation') == 'IN') {
- $this->pluginDefinition['context']['value']->setMultiple();
- }
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataIsEmpty.php b/modules/rules/src/Plugin/Condition/DataIsEmpty.php
deleted file mode 100644
index 7c6a8f6..0000000
--- a/modules/rules/src/Plugin/Condition/DataIsEmpty.php
+++ /dev/null
@@ -1,47 +0,0 @@
-getContext('data')->getContextData();
- if ($data instanceof ComplexDataInterface || $data instanceof ListInterface) {
- return $data->isEmpty();
- }
- $value = $data->getValue();
- // For some primitives we can rely on PHP's type casting to boolean.
- if ($data instanceof StringInterface || $data instanceof IntegerInterface || $data instanceof BooleanInterface) {
- return !isset($value) || !$value;
- }
- return !isset($value);
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataListContains.php b/modules/rules/src/Plugin/Condition/DataListContains.php
deleted file mode 100644
index 8e56a49..0000000
--- a/modules/rules/src/Plugin/Condition/DataListContains.php
+++ /dev/null
@@ -1,56 +0,0 @@
-id()) {
- // Check for equal items using the identifier if there is one.
- foreach ($list as $list_item) {
- if ($list_item->id() == $id) {
- return TRUE;
- }
- }
- return FALSE;
- }
-
- return in_array($item, $list);
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataListCountIs.php b/modules/rules/src/Plugin/Condition/DataListCountIs.php
deleted file mode 100644
index d8f98cc..0000000
--- a/modules/rules/src/Plugin/Condition/DataListCountIs.php
+++ /dev/null
@@ -1,64 +0,0 @@
-'.
- * @param int $value
- * The value of that the count is to compare to.
- *
- * @return bool
- * TRUE if the comparison returns true.
- */
- protected function doEvaluate(array $list, $operator, $value) {
- switch ($operator) {
- case '==':
- return count($list) == $value;
-
- case '<';
- return count($list) < $value;
-
- case '>';
- return count($list) > $value;
-
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityHasField.php b/modules/rules/src/Plugin/Condition/EntityHasField.php
deleted file mode 100644
index dfb5dbe..0000000
--- a/modules/rules/src/Plugin/Condition/EntityHasField.php
+++ /dev/null
@@ -1,46 +0,0 @@
-hasField($field);
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityIsNew.php b/modules/rules/src/Plugin/Condition/EntityIsNew.php
deleted file mode 100644
index 4255b84..0000000
--- a/modules/rules/src/Plugin/Condition/EntityIsNew.php
+++ /dev/null
@@ -1,40 +0,0 @@
-isNew();
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityIsOfBundle.php b/modules/rules/src/Plugin/Condition/EntityIsOfBundle.php
deleted file mode 100644
index 449b4e8..0000000
--- a/modules/rules/src/Plugin/Condition/EntityIsOfBundle.php
+++ /dev/null
@@ -1,72 +0,0 @@
-getEntityTypeId();
- $entity_bundle = $entity->bundle();
-
- // Check to see whether the entity's bundle and type match the specified
- // values.
- return $entity_bundle == $bundle && $entity_type == $type;
- }
-
- /**
- * {@inheritdoc}
- */
- public function assertMetadata(array $selected_data) {
- // Assert the checked bundle.
- $changed_definitions = [];
- if (isset($selected_data['entity']) && $bundle = $this->getContextValue('bundle')) {
- $changed_definitions['entity'] = clone $selected_data['entity'];
- $bundles = is_array($bundle) ? $bundle : [$bundle];
- $changed_definitions['entity']->setBundles($bundles);
- }
- return $changed_definitions;
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityIsOfType.php b/modules/rules/src/Plugin/Condition/EntityIsOfType.php
deleted file mode 100644
index f915172..0000000
--- a/modules/rules/src/Plugin/Condition/EntityIsOfType.php
+++ /dev/null
@@ -1,49 +0,0 @@
-getEntityTypeId();
-
- // Check to see whether the entity's type matches the specified value.
- return $entity_type == $type;
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsOfType.php b/modules/rules/src/Plugin/Condition/NodeIsOfType.php
deleted file mode 100644
index 9ee4ab8..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsOfType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-getType(), $types);
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsPromoted.php b/modules/rules/src/Plugin/Condition/NodeIsPromoted.php
deleted file mode 100644
index c5038c4..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsPromoted.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isPromoted();
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsPublished.php b/modules/rules/src/Plugin/Condition/NodeIsPublished.php
deleted file mode 100644
index 6ccd572..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsPublished.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isPublished();
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsSticky.php b/modules/rules/src/Plugin/Condition/NodeIsSticky.php
deleted file mode 100644
index 1bb4985..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsSticky.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isSticky();
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/PathAliasExists.php b/modules/rules/src/Plugin/Condition/PathAliasExists.php
deleted file mode 100644
index db2c16d..0000000
--- a/modules/rules/src/Plugin/Condition/PathAliasExists.php
+++ /dev/null
@@ -1,90 +0,0 @@
-aliasManager = $alias_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('path.alias_manager')
- );
- }
-
- /**
- * Check if a path alias exists.
- *
- * @param string $alias
- * The alias to see if exists.
- * @param \Drupal\Core\Language\LanguageInterface|null $language
- * The language to use.
- *
- * @return bool
- * TRUE if the system path does not match the given alias (ie: the alias
- * exists).
- */
- protected function doEvaluate($alias, LanguageInterface $language = NULL) {
- $lang_code = is_null($language) ? NULL : $language->getId();
- $path = $this->aliasManager->getPathByAlias($alias, $lang_code);
- return $path != $alias;
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/PathHasAlias.php b/modules/rules/src/Plugin/Condition/PathHasAlias.php
deleted file mode 100644
index bd94913..0000000
--- a/modules/rules/src/Plugin/Condition/PathHasAlias.php
+++ /dev/null
@@ -1,88 +0,0 @@
-aliasManager = $alias_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('path.alias_manager')
- );
- }
-
- /**
- * Check if a URL path has a URL alias.
- *
- * @param string $path
- * The path to check.
- * @param \Drupal\Core\Language\LanguageInterface|null $language
- * An optional language to look up the path in.
- *
- * @return bool
- * TRUE if the path has an alias in the given language.
- */
- protected function doEvaluate($path, LanguageInterface $language = NULL) {
- $langcode = is_null($language) ? NULL : $language->getId();
- $alias = $this->aliasManager->getAliasByPath($path, $langcode);
- return $alias != $path;
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/UserHasEntityFieldAccess.php b/modules/rules/src/Plugin/Condition/UserHasEntityFieldAccess.php
deleted file mode 100644
index a0bdf2e..0000000
--- a/modules/rules/src/Plugin/Condition/UserHasEntityFieldAccess.php
+++ /dev/null
@@ -1,106 +0,0 @@
-entityTypeManager = $entity_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager')
- );
- }
-
- /**
- * Evaluate if the user has access to the field of an entity.
- *
- * @param \Drupal\Core\Entity\ContentEntityInterface $entity
- * The entity to check access on.
- * @param string $field
- * The name of the field to check access on.
- * @param string $operation
- * The operation access should be checked for. Usually one of "view" or
- * "edit".
- * @param \Drupal\Core\Session\AccountInterface $user
- * The user account to test access against.
- *
- * @return bool
- * TRUE if the user has access to the field on the entity, FALSE otherwise.
- */
- protected function doEvaluate(ContentEntityInterface $entity, $field, $operation, AccountInterface $user) {
- if (!$entity->hasField($field)) {
- return FALSE;
- }
-
- $access = $this->entityTypeManager->getAccessControlHandler($entity->getEntityTypeId());
- if (!$access->access($entity, $operation, $user)) {
- return FALSE;
- }
-
- $definition = $entity->getFieldDefinition($field);
- $items = $entity->get($field);
- return $access->fieldAccess($operation, $definition, $user, $items);
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/UserHasRole.php b/modules/rules/src/Plugin/Condition/UserHasRole.php
deleted file mode 100644
index 46c1166..0000000
--- a/modules/rules/src/Plugin/Condition/UserHasRole.php
+++ /dev/null
@@ -1,70 +0,0 @@
-all the roles selected."),
- * default_value = "AND",
- * required = FALSE
- * )
- * }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class UserHasRole extends RulesConditionBase {
-
- /**
- * Evaluate if user has role(s).
- *
- * @param \Drupal\user\UserInterface $account
- * The account to check.
- * @param \Drupal\user\RoleInterface[] $roles
- * Array of user roles.
- * @param string $operation
- * Either "AND": user has all of roles.
- * Or "OR": user has at least one of all roles.
- * Defaults to "AND".
- *
- * @return bool
- * TRUE if the user has the role(s).
- */
- protected function doEvaluate(UserInterface $account, array $roles, $operation = 'AND') {
-
- $rids = array_map(function ($role) {
- return $role->id();
- }, $roles);
-
- switch ($operation) {
- case 'OR':
- return (bool) array_intersect($rids, $account->getRoles());
-
- case 'AND':
- return (bool) !array_diff($rids, $account->getRoles());
-
- default:
- throw new InvalidArgumentException('Either use "AND" or "OR". Leave empty for default "AND" behavior.');
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/UserIsBlocked.php b/modules/rules/src/Plugin/Condition/UserIsBlocked.php
deleted file mode 100644
index 7244f58..0000000
--- a/modules/rules/src/Plugin/Condition/UserIsBlocked.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isBlocked();
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/BanIP.php b/modules/rules/src/Plugin/RulesAction/BanIP.php
deleted file mode 100644
index bf54cc4..0000000
--- a/modules/rules/src/Plugin/RulesAction/BanIP.php
+++ /dev/null
@@ -1,97 +0,0 @@
-get('ban.ip_manager'),
- $container->get('request')
- );
- }
-
- /**
- * Constructs the BanIP object.
- *
- * @param array $configuration
- * A configuration array containing information about the plugin instance.
- * @param string $plugin_id
- * The plugin ID for the plugin instance.
- * @param mixed $plugin_definition
- * The plugin implementation definition.
- * @param \Drupal\ban\BanIpManagerInterface $ban_manager
- * The ban manager.
- * @param \Symfony\Component\HttpFoundation\Request $request
- * The corresponding request.
- */
- public function __construct(array $configuration, $plugin_id, $plugin_definition, BanIpManagerInterface $ban_manager, Request $request) {
- parent::__construct($configuration, $plugin_id, $plugin_definition);
- $this->banManager = $ban_manager;
- $this->request = $request;
- }
-
- /**
- * Executes the action with the given context.
- *
- * @param string $ip
- * (optional) The IP address that should be banned.
- */
- protected function doExecute($ip = NULL) {
- if (!isset($ip)) {
- $ip = $this->request->getClientIp();
- }
-
- $this->banManager->banIp($ip);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataCalculateValue.php b/modules/rules/src/Plugin/RulesAction/DataCalculateValue.php
deleted file mode 100644
index 4e40966..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataCalculateValue.php
+++ /dev/null
@@ -1,83 +0,0 @@
-setProvidedValue('result', $result);
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataConvert.php b/modules/rules/src/Plugin/RulesAction/DataConvert.php
deleted file mode 100644
index 28cf2dc..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataConvert.php
+++ /dev/null
@@ -1,101 +0,0 @@
-setProvidedValue('conversion_result', $result);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataListItemAdd.php b/modules/rules/src/Plugin/RulesAction/DataListItemAdd.php
deleted file mode 100644
index 044a504..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataListItemAdd.php
+++ /dev/null
@@ -1,72 +0,0 @@
-setContextValue('list', $list);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataListItemRemove.php b/modules/rules/src/Plugin/RulesAction/DataListItemRemove.php
deleted file mode 100644
index ecba633..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataListItemRemove.php
+++ /dev/null
@@ -1,46 +0,0 @@
-setContextValue('list', $list);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataSet.php b/modules/rules/src/Plugin/RulesAction/DataSet.php
deleted file mode 100644
index 84ed3a6..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataSet.php
+++ /dev/null
@@ -1,64 +0,0 @@
-getContext('data')->getContextData();
- $typed_data->setValue($value);
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- // Saving is done at the root of the typed data tree, for example on the
- // entity level.
- $typed_data = $this->getContext('data')->getContextData();
- $root = $typed_data->getRoot();
- $value = $root->getValue();
- // Only save things that are objects and have a save() method.
- if (is_object($value) && method_exists($value, 'save')) {
- return ['data'];
- }
- return [];
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityCreate.php b/modules/rules/src/Plugin/RulesAction/EntityCreate.php
deleted file mode 100644
index fdc9c9f..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityCreate.php
+++ /dev/null
@@ -1,98 +0,0 @@
-storage = $storage;
- $this->entityTypeId = $plugin_definition['entity_type_id'];
- $this->bundleKey = $plugin_definition['bundle_key'];
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager')->getStorage($plugin_definition['entity_type_id'])
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function refineContextDefinitions(array $selected_data) {
- if ($type = $this->entityTypeId) {
- $data_type = "entity:$type";
-
- if ($this->bundleKey && $bundle = $this->getContextValue($this->bundleKey)) {
- $data_type .= ":$bundle";
- }
-
- $this->pluginDefinition['provides']['entity']->setDataType($data_type);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function execute() {
- $values = $this->getContextValues();
- $entity = $this->storage->create($values);
- $this->setProvidedValue('entity', $entity);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityCreateDeriver.php b/modules/rules/src/Plugin/RulesAction/EntityCreateDeriver.php
deleted file mode 100644
index 7e3cb12..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityCreateDeriver.php
+++ /dev/null
@@ -1,123 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->entityFieldManager = $entity_field_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static($container->get('entity_type.manager'), $container->get('entity_field.manager'), $container->get('string_translation'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Only allow content entities and ignore configuration entities.
- if (!$entity_type instanceof ContentEntityTypeInterface) {
- continue;
- }
-
- $this->derivatives[$entity_type_id] = [
- 'label' => $this->t('Create a new @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
- 'category' => $entity_type->getLabel(),
- 'entity_type_id' => $entity_type_id,
- 'context' => [],
- 'provides' => [
- 'entity' => ContextDefinition::create("entity:$entity_type_id")
- ->setLabel($entity_type->getLabel())
- ->setRequired(TRUE),
- ],
- ] + $base_plugin_definition;
- // Add a required context for the bundle key, and optional contexts for
- // other required base fields. This matches the storage create() behavior,
- // where only the bundle requirement is enforced.
- $bundle_key = $entity_type->getKey('bundle');
- $this->derivatives[$entity_type_id]['bundle_key'] = $bundle_key;
-
- $base_field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
- foreach ($base_field_definitions as $field_name => $definition) {
- if ($field_name != $bundle_key && !$definition->isRequired()) {
- continue;
- }
-
- $item_definition = $definition->getItemDefinition();
- $type_definition = $item_definition->getPropertyDefinition($item_definition->getMainPropertyName());
-
- // If this is an entity reference then we expect the target type as
- // context.
- if ($type_definition instanceof DataReferenceDefinitionInterface) {
- $type_definition->getTargetDefinition();
- }
- $type = $type_definition->getDataType();
-
- $is_bundle = ($field_name == $bundle_key);
- $multiple = ($definition->getCardinality() === 1) ? FALSE : TRUE;
-
- $context_definition = ContextDefinition::create($type)
- ->setLabel($definition->getLabel())
- ->setRequired($is_bundle)
- ->setMultiple($multiple)
- ->setDescription($definition->getDescription());
-
- if ($is_bundle) {
- $context_definition->setAssignmentRestriction(ContextDefinition::ASSIGNMENT_RESTRICTION_INPUT);
- }
-
- $this->derivatives[$entity_type_id]['context'][$field_name] = $context_definition;
- }
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityDelete.php b/modules/rules/src/Plugin/RulesAction/EntityDelete.php
deleted file mode 100644
index b6869b4..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityDelete.php
+++ /dev/null
@@ -1,37 +0,0 @@
-delete();
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityFetchByField.php b/modules/rules/src/Plugin/RulesAction/EntityFetchByField.php
deleted file mode 100644
index 8c5aa7c..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityFetchByField.php
+++ /dev/null
@@ -1,119 +0,0 @@
-entityTypeManager = $entity_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function refineContextDefinitions(array $selected_data) {
- if ($type = $this->getContextValue('type')) {
- $this->pluginDefinition['provides']['entity_fetched']->setDataType("entity:$type");
- }
- }
-
- /**
- * Execute the action within the given context.
- */
- protected function doExecute($entity_type, $field_name, $field_value, $limit = NULL) {
- $storage = $this->entityTypeManager->getStorage($entity_type);
-
- // When retrieving entities, if $limit is not set there is no need to use
- // the query object directly.
- if (is_null($limit)) {
- $entities = $storage->loadByProperties([$field_name => $field_value]);
- }
- else {
- $query = $storage->getQuery();
- $entity_ids = $query
- ->condition($field_name, $field_value, '=')
- ->range(0, $limit)
- ->execute();
- $entities = $storage->loadMultiple($entity_ids);
- }
-
- // Set provided value.
- // @todo Ensure that the provided context has the correct entity type.
- $this->setProvidedValue('entity_fetched', $entities);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityFetchById.php b/modules/rules/src/Plugin/RulesAction/EntityFetchById.php
deleted file mode 100644
index 9ff05ad..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityFetchById.php
+++ /dev/null
@@ -1,100 +0,0 @@
-entityTypeManager = $entity_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function refineContextDefinitions(array $selected_data) {
- if ($type = $this->getContextValue('type')) {
- $this->pluginDefinition['provides']['entity_fetched']->setDataType("entity:$type");
- }
- }
-
- /**
- * Executes the action with the given context.
- *
- * @param string $entity_type
- * The entity type id.
- * @param int $entity_id
- * The entity id.
- */
- protected function doExecute($entity_type, $entity_id) {
- $storage = $this->entityTypeManager->getStorage($entity_type);
- $entity = $storage->load($entity_id);
-
- $this->setProvidedValue('entity_fetched', $entity);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreate.php b/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreate.php
deleted file mode 100644
index a9db98f..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreate.php
+++ /dev/null
@@ -1,86 +0,0 @@
-aliasStorage = $alias_storage;
- $this->entityTypeId = $plugin_definition['entity_type_id'];
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('path.alias_storage')
- );
- }
-
- /**
- * Creates entity path alias.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * The entity that should get an alias.
- * @param string $alias
- * The alias to be created.
- */
- protected function doExecute(EntityInterface $entity, $alias) {
- // We need to save the entity before we can get its internal path.
- if ($entity->isNew()) {
- $entity->save();
- }
-
- $path = $entity->urlInfo()->getInternalPath();
- $langcode = $entity->language()->getId();
- $this->aliasStorage->save($path, $alias, $langcode);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreateDeriver.php b/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreateDeriver.php
deleted file mode 100644
index 03dd31e..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreateDeriver.php
+++ /dev/null
@@ -1,80 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static($container->get('entity_type.manager'), $container->get('string_translation'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Only allow content entities and ignore configuration entities.
- if (!$entity_type instanceof ContentEntityTypeInterface) {
- continue;
- }
-
- $this->derivatives["entity:$entity_type_id"] = [
- 'label' => $this->t('Create @entity_type path alias', ['@entity_type' => $entity_type->getLowercaseLabel()]),
- 'category' => $this->t('Path'),
- 'entity_type_id' => $entity_type_id,
- 'context' => [
- 'entity' => ContextDefinition::create("entity:$entity_type_id")
- ->setLabel($entity_type->getLabel())
- ->setRequired(TRUE)
- ->setDescription($this->t('The @entity_type for which to create a path alias.', ['@entity_type' => $entity_type->getLowercaseLabel()])),
- 'alias' => ContextDefinition::create('string')
- ->setLabel($this->t('Path alias'))
- ->setRequired(TRUE)
- ->setDescription($this->t("Specify an alternative path by which the content can be accessed. For example, 'about' for an about page. Use a relative path and do not add a trailing slash.")),
- ],
- 'provides' => [],
- ] + $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntitySave.php b/modules/rules/src/Plugin/RulesAction/EntitySave.php
deleted file mode 100644
index 3479a57..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntitySave.php
+++ /dev/null
@@ -1,67 +0,0 @@
-save();
- $this->saveLater = FALSE;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- if ($this->saveLater) {
- return ['entity'];
- }
- return [];
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/PathAliasCreate.php b/modules/rules/src/Plugin/RulesAction/PathAliasCreate.php
deleted file mode 100644
index 03d0ac4..0000000
--- a/modules/rules/src/Plugin/RulesAction/PathAliasCreate.php
+++ /dev/null
@@ -1,91 +0,0 @@
-aliasStorage = $alias_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('path.alias_storage')
- );
- }
-
- /**
- * Creates an alias for an existing path.
- *
- * @param string $source
- * The existing path that should be aliased.
- * @param string $alias
- * The alias path that should be created.
- * @param \Drupal\Core\Language\LanguageInterface $language
- * (optional) The language.
- */
- protected function doExecute($source, $alias, LanguageInterface $language = NULL) {
- $langcode = isset($language) ? $language->getId() : LanguageInterface::LANGCODE_NOT_SPECIFIED;
- $this->aliasStorage->save($source, $alias, $langcode);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByAlias.php b/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByAlias.php
deleted file mode 100644
index 54f6715..0000000
--- a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByAlias.php
+++ /dev/null
@@ -1,75 +0,0 @@
-aliasStorage = $alias_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('path.alias_storage')
- );
- }
-
- /**
- * Delete an existing alias.
- *
- * @param string $alias
- * Alias to be deleted.
- */
- protected function doExecute($alias) {
- $this->aliasStorage->delete(['alias' => $alias]);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByPath.php b/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByPath.php
deleted file mode 100644
index c2310e1..0000000
--- a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByPath.php
+++ /dev/null
@@ -1,75 +0,0 @@
-aliasStorage = $alias_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('path.alias_storage')
- );
- }
-
- /**
- * Delete an existing alias by a given path.
- *
- * @param string $path
- * Existing system path.
- */
- protected function doExecute($path) {
- $this->aliasStorage->delete(['path' => $path]);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/RulesComponentAction.php b/modules/rules/src/Plugin/RulesAction/RulesComponentAction.php
deleted file mode 100644
index 8b9c9b7..0000000
--- a/modules/rules/src/Plugin/RulesAction/RulesComponentAction.php
+++ /dev/null
@@ -1,124 +0,0 @@
-storage = $storage;
- $this->componentId = $plugin_definition['component_id'];
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('entity_type.manager')->getStorage('rules_component')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function execute() {
- $rules_config = $this->storage->load($this->componentId);
-
- // Setup an isolated execution state for this expression and pass on the
- // necessary context.
- $rules_component = $rules_config->getComponent();
- foreach ($this->getContexts() as $context_name => $context) {
- // Pass through the already existing typed data objects to avoid creating
- // them from scratch.
- $rules_component->getState()->setVariableData($context_name, $context->getContextData());
- }
-
- // We don't use RulesComponent::execute() here since we don't want to
- // auto-save immediately.
- $state = $rules_component->getState();
- $expression = $rules_component->getExpression();
- $expression->executeWithState($state);
-
- // Postpone auto-saving to the parent expression triggering this action.
- foreach ($state->getAutoSaveSelectors() as $selector) {
- $parts = explode('.', $selector);
- $context_name = reset($parts);
- if (array_key_exists($context_name, $this->context)) {
- $this->saveLater[] = $context_name;
- }
- else {
- // Otherwise we need to save here since it will not happen in the parent
- // execution.
- $typed_data = $state->fetchDataByPropertyPath($selector);
- // Things that can be saved must have a save() method, right?
- // Saving is always done at the root of the typed data tree, for example
- // on the entity level.
- $typed_data->getRoot()->getValue()->save();
- }
- }
-
- foreach ($this->getProvidedContextDefinitions() as $name => $definition) {
- $this->setProvidedValue($name, $state->getVariable($name));
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- return $this->saveLater;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/RulesComponentActionDeriver.php b/modules/rules/src/Plugin/RulesAction/RulesComponentActionDeriver.php
deleted file mode 100644
index 88950f2..0000000
--- a/modules/rules/src/Plugin/RulesAction/RulesComponentActionDeriver.php
+++ /dev/null
@@ -1,77 +0,0 @@
-storage = $storage;
- $this->expressionManager = $expression_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static(
- $container->get('entity_type.manager')->getStorage('rules_component'),
- $container->get('plugin.manager.rules_expression')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- $rules_components = $this->storage->loadMultiple();
- foreach ($rules_components as $rules_component) {
-
- $component_config = $rules_component->get('component');
- $expression_definition = $this->expressionManager->getDefinition($component_config['expression']['id']);
-
- $this->derivatives[$rules_component->id()] = [
- 'label' => $this->t('@expression_type: @label', [
- '@expression_type' => $expression_definition['label'],
- '@label' => $rules_component->label(),
- ]),
- 'category' => $this->t('Components'),
- 'component_id' => $rules_component->id(),
- 'context' => $rules_component->getContextDefinitions(),
- 'provides' => $rules_component->getProvidedContextDefinitions(),
- ] + $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/SendAccountEmail.php b/modules/rules/src/Plugin/RulesAction/SendAccountEmail.php
deleted file mode 100644
index fa7f8d1..0000000
--- a/modules/rules/src/Plugin/RulesAction/SendAccountEmail.php
+++ /dev/null
@@ -1,43 +0,0 @@
-logger = $logger_factory->get('rules');
- $this->currentPathStack = $current_path_stack;
- $this->request = $request_stack->getCurrentRequest();
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('logger.factory'),
- $container->get('path.current'),
- $container->get('request_stack')
- );
- }
-
- /**
- * Redirect to a provided url at the end of the request.
- *
- * @param string $url
- * Redirect destination url.
- */
- protected function doExecute($url) {
- $current_path = $this->currentPathStack->getPath();
- $is_rules_admin_page = strpos($current_path, 'admin/config/workflow/rules') !== FALSE;
-
- // Make sure we do not redirect away from the rules admin pages.
- if ($is_rules_admin_page) {
- $this->logger->warning('Skipped page redirect on a rules admin page.');
- return;
- }
-
- // Make sure we do not redirect during batch processing.
- $batch = batch_get();
- if (isset($batch['current_set'])) {
- $this->logger->warning('Skipped page redirect during batch processing.');
- return;
- }
-
- $this->request->attributes->set('_rules_redirect_action_url', $url);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/SystemSendEmail.php b/modules/rules/src/Plugin/RulesAction/SystemSendEmail.php
deleted file mode 100644
index f0f6d9b..0000000
--- a/modules/rules/src/Plugin/RulesAction/SystemSendEmail.php
+++ /dev/null
@@ -1,129 +0,0 @@
-logger = $logger;
- $this->mailManager = $mail_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('logger.factory')->get('rules'),
- $container->get('plugin.manager.mail')
- );
- }
-
- /**
- * Send a system email.
- *
- * @param string[] $to
- * Email addresses of the recipients.
- * @param string $subject
- * Subject of the email.
- * @param string $message
- * Email message text.
- * @param string|null $reply
- * (optional) Reply to email address.
- * @param \Drupal\Core\Language\LanguageInterface|null $language
- * (optional) Language code.
- */
- protected function doExecute(array $to, $subject, $message, $reply = NULL, LanguageInterface $language = NULL) {
- $langcode = isset($language) ? $language->getId() : LanguageInterface::LANGCODE_SITE_DEFAULT;
- $params = [
- 'subject' => $subject,
- 'message' => $message,
- ];
- // Set a unique key for this mail.
- $key = 'rules_action_mail_' . $this->getPluginId();
-
- $recipients = implode(', ', $to);
- $message = $this->mailManager->mail('rules', $key, $recipients, $langcode, $params, $reply);
- if ($message['result']) {
- $this->logger->notice('Successfully sent email to %recipient', ['%recipient' => $recipients]);
- }
-
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserBlock.php b/modules/rules/src/Plugin/RulesAction/UserBlock.php
deleted file mode 100644
index f215483..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserBlock.php
+++ /dev/null
@@ -1,99 +0,0 @@
-sessionManager = $session_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('session_manager')
- );
- }
-
- /**
- * Flag that indicates if the entity should be auto-saved later.
- *
- * @var bool
- */
- protected $saveLater = FALSE;
-
- /**
- * Block a user.
- *
- * @param \Drupal\user\UserInterface $user
- * The user object.
- */
- protected function doExecute(UserInterface $user) {
- // Do nothing if user is anonymous or already blocked.
- if ($user->isAuthenticated() && $user->isActive()) {
- $user->block();
- $this->sessionManager->delete($user->id());
- // Set flag that indicates if the entity should be auto-saved later.
- $this->saveLater = TRUE;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- if ($this->saveLater) {
- return ['user'];
- }
- return [];
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserRoleAdd.php b/modules/rules/src/Plugin/RulesAction/UserRoleAdd.php
deleted file mode 100644
index 7cfc0a1..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserRoleAdd.php
+++ /dev/null
@@ -1,78 +0,0 @@
-hasRole($role->id())) {
- // If you try to add anonymous or authenticated role to user, Drupal
- // will throw an \InvalidArgumentException. Anonymous or authenticated
- // role ID must not be assigned manually.
- try {
- $account->addRole($role->id());
- }
- catch (\InvalidArgumentException $e) {
- throw new InvalidArgumentException($e->getMessage());
- }
- // Set flag that indicates if the entity should be auto-saved later.
- $this->saveLater = TRUE;
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- if ($this->saveLater) {
- return ['user'];
- }
- return [];
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserRoleRemove.php b/modules/rules/src/Plugin/RulesAction/UserRoleRemove.php
deleted file mode 100644
index aa03ffe..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserRoleRemove.php
+++ /dev/null
@@ -1,75 +0,0 @@
-hasRole($role->id())) {
- // If you try to add anonymous or authenticated role to user, Drupal
- // will throw an \InvalidArgumentException. Anonymous or authenticated
- // role ID must not be assigned manually.
- try {
- $account->removeRole($role->id());
- }
- catch (\InvalidArgumentException $e) {
- throw new InvalidArgumentException($e->getMessage());
- }
- // Set flag that indicates if the entity should be auto-saved later.
- $this->saveLater = TRUE;
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- if ($this->saveLater) {
- return ['user'];
- }
- return [];
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserUnblock.php b/modules/rules/src/Plugin/RulesAction/UserUnblock.php
deleted file mode 100644
index a95998f..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserUnblock.php
+++ /dev/null
@@ -1,58 +0,0 @@
-isAuthenticated() && $user->isBlocked()) {
- $user->activate();
- // Set flag that indicates if the entity should be auto-saved later.
- $this->saveLater = TRUE;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- if ($this->saveLater) {
- return ['user'];
- }
- return [];
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/VariableAdd.php b/modules/rules/src/Plugin/RulesAction/VariableAdd.php
deleted file mode 100644
index eae680f..0000000
--- a/modules/rules/src/Plugin/RulesAction/VariableAdd.php
+++ /dev/null
@@ -1,54 +0,0 @@
-setProvidedValue('variable_added', $value);
- }
-
- /**
- * {@inheritdoc}
- */
- public function refineContextDefinitions(array $selected_data) {
- if ($type = $this->getContextValue('type')) {
- $this->pluginDefinition['context']['value']->setDataType($type);
- $this->pluginDefinition['provides']['variable_added']->setDataType($type);
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesDataProcessor/NumericOffset.php b/modules/rules/src/Plugin/RulesDataProcessor/NumericOffset.php
deleted file mode 100644
index b6c97d2..0000000
--- a/modules/rules/src/Plugin/RulesDataProcessor/NumericOffset.php
+++ /dev/null
@@ -1,29 +0,0 @@
-configuration['offset'];
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesDataProcessor/TokenProcessor.php b/modules/rules/src/Plugin/RulesDataProcessor/TokenProcessor.php
deleted file mode 100644
index f0898c0..0000000
--- a/modules/rules/src/Plugin/RulesDataProcessor/TokenProcessor.php
+++ /dev/null
@@ -1,73 +0,0 @@
-placeholderResovler = $placeholder_resolver;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('typed_data.placeholder_resolver')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function process($value, ExecutionStateInterface $rules_state) {
- $data = [];
- $placeholders_by_data = $this->placeholderResovler->scan($value);
- foreach ($placeholders_by_data as $variable_name => $placeholders) {
- // Note that accessing an unavailable variable will throw an evaluation
- // exception. That's exactly what needs to happen. Invalid tokens must
- // be checked when checking integrity.
- $data[$variable_name] = $rules_state->getVariable($variable_name);
- }
- return $this->placeholderResovler->replacePlaceHolders($value, $data);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityDeleteDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityDeleteDeriver.php
deleted file mode 100644
index 490f1f3..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityDeleteDeriver.php
+++ /dev/null
@@ -1,72 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static($container->get('entity_type.manager'), $container->get('string_translation'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Only allow content entities and ignore configuration entities.
- if (!$entity_type instanceof ContentEntityTypeInterface) {
- continue;
- }
-
- $this->derivatives[$entity_type_id] = [
- 'label' => $this->t('After deleting @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
- 'category' => $entity_type->getLabel(),
- 'entity_type_id' => $entity_type_id,
- 'context' => [
- $entity_type_id => [
- 'type' => "entity:$entity_type_id",
- 'label' => $entity_type->getLabel(),
- ],
- ],
- ] + $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityInsertDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityInsertDeriver.php
deleted file mode 100644
index 2aa7893..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityInsertDeriver.php
+++ /dev/null
@@ -1,72 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static($container->get('entity_type.manager'), $container->get('string_translation'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Only allow content entities and ignore configuration entities.
- if (!$entity_type instanceof ContentEntityTypeInterface) {
- continue;
- }
-
- $this->derivatives[$entity_type_id] = [
- 'label' => $this->t('After saving new @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
- 'category' => $entity_type->getLabel(),
- 'entity_type_id' => $entity_type_id,
- 'context' => [
- $entity_type_id => [
- 'type' => "entity:$entity_type_id",
- 'label' => $entity_type->getLabel(),
- ],
- ],
- ] + $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityPresaveDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityPresaveDeriver.php
deleted file mode 100644
index 1dd3a3d..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityPresaveDeriver.php
+++ /dev/null
@@ -1,76 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static($container->get('entity_type.manager'), $container->get('string_translation'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Only allow content entities and ignore configuration entities.
- if (!$entity_type instanceof ContentEntityTypeInterface) {
- continue;
- }
-
- $this->derivatives[$entity_type_id] = [
- 'label' => $this->t('Before saving @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
- 'category' => $entity_type->getLabel(),
- 'entity_type_id' => $entity_type_id,
- 'context' => [
- $entity_type_id => [
- 'type' => "entity:$entity_type_id",
- 'label' => $entity_type->getLabel(),
- ],
- $entity_type_id . '_unchanged' => [
- 'type' => "entity:$entity_type_id",
- 'label' => $this->t('Unchanged @entity_type', ['@entity_type' => $entity_type->getLabel()]),
- ],
- ],
- ] + $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityUpdateDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityUpdateDeriver.php
deleted file mode 100644
index 7bbc574..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityUpdateDeriver.php
+++ /dev/null
@@ -1,76 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static($container->get('entity_type.manager'), $container->get('string_translation'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Only allow content entities and ignore configuration entities.
- if (!$entity_type instanceof ContentEntityTypeInterface) {
- continue;
- }
-
- $this->derivatives[$entity_type_id] = [
- 'label' => $this->t('After updating @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
- 'category' => $entity_type->getLabel(),
- 'entity_type_id' => $entity_type_id,
- 'context' => [
- $entity_type_id => [
- 'type' => "entity:$entity_type_id",
- 'label' => $entity_type->getLabel(),
- ],
- $entity_type_id . '_unchanged' => [
- 'type' => "entity:$entity_type_id",
- 'label' => $this->t('Unchanged @entity_type', ['@entity_type' => $entity_type->getLabel()]),
- ],
- ],
- ] + $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityViewDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityViewDeriver.php
deleted file mode 100644
index 0a63d32..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityViewDeriver.php
+++ /dev/null
@@ -1,72 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static($container->get('entity_type.manager'), $container->get('string_translation'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- // Only allow content entities and ignore configuration entities.
- if (!$entity_type instanceof ContentEntityTypeInterface) {
- continue;
- }
-
- $this->derivatives[$entity_type_id] = [
- 'label' => $this->t('@entity_type is viewed', ['@entity_type' => $entity_type->getLabel()]),
- 'category' => $entity_type->getLabel(),
- 'entity_type_id' => $entity_type_id,
- 'context' => [
- $entity_type_id => [
- 'type' => "entity:$entity_type_id",
- 'label' => $entity_type->getLabel(),
- ],
- ],
- ] + $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/ActionSet.php b/modules/rules/src/Plugin/RulesExpression/ActionSet.php
deleted file mode 100644
index 3284fa9..0000000
--- a/modules/rules/src/Plugin/RulesExpression/ActionSet.php
+++ /dev/null
@@ -1,35 +0,0 @@
-actions as $action) {
- $action->executeWithState($state);
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/Rule.php b/modules/rules/src/Plugin/RulesExpression/Rule.php
deleted file mode 100644
index bf8ed4e..0000000
--- a/modules/rules/src/Plugin/RulesExpression/Rule.php
+++ /dev/null
@@ -1,241 +0,0 @@
- [], 'actions' => []];
- // Per default the outer condition container of a rule is initialized as
- // conjunction (AND), meaning that all conditions in it must evaluate to
- // TRUE to fire the actions.
- $this->conditions = $expression_manager->createInstance('rules_and', $configuration['conditions']);
- $this->conditions->setRoot($this->getRoot());
- $this->actions = $expression_manager->createInstance('rules_action_set', $configuration['actions']);
- $this->actions->setRoot($this->getRoot());
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('plugin.manager.rules_expression')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function executeWithState(ExecutionStateInterface $state) {
- // Evaluate the rule's conditions.
- if (!$this->conditions->isEmpty() && !$this->conditions->executeWithState($state)) {
- // Do not run the actions if the conditions are not met.
- return;
- }
- $this->actions->executeWithState($state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function addCondition($condition_id, ContextConfig $config = NULL) {
- return $this->conditions->addCondition($condition_id, $config);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConditions() {
- return $this->conditions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConditions(ConditionExpressionContainerInterface $conditions) {
- $this->conditions = $conditions;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addAction($action_id, ContextConfig $config = NULL) {
- return $this->actions->addAction($action_id, $config);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getActions() {
- return $this->actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setActions(ActionExpressionContainerInterface $actions) {
- $this->actions = $actions;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addExpressionObject(ExpressionInterface $expression) {
- if ($expression instanceof ConditionExpressionInterface) {
- $this->conditions->addExpressionObject($expression);
- }
- elseif ($expression instanceof ActionExpressionInterface) {
- $this->actions->addExpressionObject($expression);
- }
- else {
- throw new InvalidExpressionException();
- }
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addExpression($plugin_id, ContextConfig $config = NULL) {
- return $this->addExpressionObject(
- $this->expressionManager->createInstance($plugin_id, $config ? $config->toArray() : [])
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- $configuration = parent::getConfiguration();
- // We need to update the configuration in case actions/conditions have been
- // added or changed.
- $configuration['conditions'] = $this->conditions->getConfiguration();
- $configuration['actions'] = $this->actions->getConfiguration();
- return $configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getIterator() {
- // Just pass up the actions for iterating over.
- return $this->actions->getIterator();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getExpression($uuid) {
- $condition = $this->conditions->getExpression($uuid);
- if ($condition) {
- return $condition;
- }
- return $this->actions->getExpression($uuid);
- }
-
- /**
- * {@inheritdoc}
- */
- public function deleteExpression($uuid) {
- $deleted = $this->conditions->deleteExpression($uuid);
- if (!$deleted) {
- $deleted = $this->actions->deleteExpression($uuid);
- }
- return $deleted;
- }
-
- /**
- * {@inheritdoc}
- */
- public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
- $violation_list = $this->conditions->checkIntegrity($metadata_state, $apply_assertions);
- $violation_list->addAll($this->actions->checkIntegrity($metadata_state, $apply_assertions));
- return $violation_list;
- }
-
- /**
- * {@inheritdoc}
- */
- public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
- // @todo: If the rule is nested, we may not pass assertions to following
- // expressions as we do not know whether the rule fires at all. Should we
- // clone the metadata state to ensure modifications stay local?
- $found = $this->conditions->prepareExecutionMetadataState($metadata_state, $until, $apply_assertions);
- if ($found) {
- return TRUE;
- }
- return $this->actions->prepareExecutionMetadataState($metadata_state, $until, $apply_assertions);
- }
-
- /**
- * PHP magic __clone function.
- */
- public function __clone() {
- $this->actions = clone $this->actions;
- $this->actions->setRoot($this->getRoot());
- $this->conditions = clone $this->conditions;
- $this->conditions->setRoot($this->getRoot());
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RuleInterface.php b/modules/rules/src/Plugin/RulesExpression/RuleInterface.php
deleted file mode 100644
index 6c0e045..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RuleInterface.php
+++ /dev/null
@@ -1,77 +0,0 @@
-actionManager = $action_manager;
- $this->processorManager = $processor_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static($configuration, $plugin_id, $plugin_definition,
- $container->get('plugin.manager.rules_action'),
- $container->get('plugin.manager.rules_data_processor')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- // If the plugin id has been set already, keep it if not specified.
- if (isset($this->configuration['action_id'])) {
- $configuration += [
- 'action_id' => $this->configuration['action_id'],
- ];
- }
- return parent::setConfiguration($configuration);
- }
-
- /**
- * {@inheritdoc}
- */
- public function executeWithState(ExecutionStateInterface $state) {
- $action = $this->actionManager->createInstance($this->configuration['action_id']);
-
- $this->prepareContext($action, $state);
- $action->execute();
-
- $auto_saves = $action->autoSaveContext();
- foreach ($auto_saves as $context_name) {
- // Mark parameter contexts for auto saving in the Rules state.
- $state->saveChangesLater($this->configuration['context_mapping'][$context_name]);
- }
-
- // Now that the action has been executed it can provide additional
- // context which we will have to pass back in the evaluation state.
- $this->addProvidedContext($action, $state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getLabel() {
- if (!empty($this->configuration['action_id'])) {
- $definition = $this->actionManager->getDefinition($this->configuration['action_id']);
- return $this->t('Action: @label', ['@label' => $definition['label']]);
- }
- return parent::getLabel();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormHandler() {
- if (isset($this->pluginDefinition['form_class'])) {
- $class_name = $this->pluginDefinition['form_class'];
- return new $class_name($this, $this->actionManager);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
- $violation_list = new IntegrityViolationList();
- if (empty($this->configuration['action_id'])) {
- $violation_list->addViolationWithMessage($this->t('Action plugin ID is missing'), $this->getUuid());
- return $violation_list;
- }
- if (!$this->actionManager->hasDefinition($this->configuration['action_id'])) {
- $violation_list->addViolationWithMessage($this->t('Action plugin %plugin_id does not exist', [
- '%plugin_id' => $this->configuration['action_id'],
- ]), $this->getUuid());
- return $violation_list;
- }
-
- $action = $this->actionManager->createInstance($this->configuration['action_id']);
-
- // Prepare and refine the context before checking integrity, such that any
- // context definition changes are respected while checking.
- $this->prepareContextWithMetadata($action, $metadata_state);
- $result = $this->checkContextConfigIntegrity($action, $metadata_state);
- $this->prepareExecutionMetadataState($metadata_state, NULL, $apply_assertions);
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
- if ($until && $this->getUuid() === $until->getUuid()) {
- return TRUE;
- }
- $action = $this->actionManager->createInstance($this->configuration['action_id']);
- // Make sure to refine context first, such that possibly refined definitions
- // of provided context are respected.
- $this->prepareContextWithMetadata($action, $metadata_state);
- $this->addProvidedContextDefinitions($action, $metadata_state);
- if ($apply_assertions) {
- $this->assertMetadata($action, $metadata_state);
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesAnd.php b/modules/rules/src/Plugin/RulesExpression/RulesAnd.php
deleted file mode 100644
index f1e5b61..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesAnd.php
+++ /dev/null
@@ -1,54 +0,0 @@
-conditions);
- }
-
- /**
- * {@inheritdoc}
- */
- public function evaluate(ExecutionStateInterface $state) {
- foreach ($this->conditions as $condition) {
- if (!$condition->executeWithState($state)) {
- return FALSE;
- }
- }
- // An empty AND should return FALSE, otherwise all conditions evaluated to
- // TRUE and we return TRUE.
- return !empty($this->conditions);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function allowsMetadataAssertions() {
- // If the AND is not negated, all child-expressions must be executed - thus
- // assertions can be added it.
- return !$this->isNegated();
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesCondition.php b/modules/rules/src/Plugin/RulesExpression/RulesCondition.php
deleted file mode 100644
index 050707b..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesCondition.php
+++ /dev/null
@@ -1,204 +0,0 @@
-defaultConfiguration();
- parent::__construct($configuration, $plugin_id, $plugin_definition);
- $this->conditionManager = $condition_manager;
- $this->processorManager = $processor_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('plugin.manager.condition'),
- $container->get('plugin.manager.rules_data_processor')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- return [
- // Per default the result of this expression is not negated.
- 'negate' => FALSE,
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- // If the plugin id has been set already, keep it if not specified.
- if (isset($this->configuration['condition_id'])) {
- $configuration += [
- 'condition_id' => $this->configuration['condition_id'],
- ];
- }
- return parent::setConfiguration($configuration);
- }
-
- /**
- * {@inheritdoc}
- */
- public function executeWithState(ExecutionStateInterface $state) {
- $condition = $this->conditionManager->createInstance($this->configuration['condition_id'], [
- 'negate' => $this->configuration['negate'],
- ]);
-
- $this->prepareContext($condition, $state);
- $result = $condition->evaluate();
-
- // Now that the condition has been executed it can provide additional
- // context which we will have to pass back in the evaluation state.
- $this->addProvidedContext($condition, $state);
-
- if ($this->isNegated()) {
- $result = !$result;
- }
-
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function negate($negate = TRUE) {
- $this->configuration['negate'] = $negate;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isNegated() {
- return !empty($this->configuration['negate']);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getLabel() {
- if (!empty($this->configuration['condition_id'])) {
- $definition = $this->conditionManager->getDefinition($this->configuration['condition_id']);
- return $this->t('Condition: @label', ['@label' => $definition['label']]);
- }
- return parent::getLabel();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormHandler() {
- if (isset($this->pluginDefinition['form_class'])) {
- $class_name = $this->pluginDefinition['form_class'];
- return new $class_name($this, $this->conditionManager);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
- $violation_list = new IntegrityViolationList();
- if (empty($this->configuration['condition_id'])) {
- $violation_list->addViolationWithMessage($this->t('Condition plugin ID is missing'), $this->getUuid());
- return $violation_list;
- }
- if (!$this->conditionManager->hasDefinition($this->configuration['condition_id'])) {
- $violation_list->addViolationWithMessage($this->t('Condition plugin %plugin_id does not exist', [
- '%plugin_id' => $this->configuration['condition_id'],
- ]), $this->getUuid());
- return $violation_list;
- }
-
- $condition = $this->conditionManager->createInstance($this->configuration['condition_id'], [
- 'negate' => $this->configuration['negate'],
- ]);
- // Prepare and refine the context before checking integrity, such that any
- // context definition changes are respected while checking.
- $this->prepareContextWithMetadata($condition, $metadata_state);
- $result = $this->checkContextConfigIntegrity($condition, $metadata_state);
- $this->prepareExecutionMetadataState($metadata_state, NULL, $apply_assertions);
- return $result;
- }
-
- /**
- * {@inheritdoc}
- */
- public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
- if ($until && $this->getUuid() === $until->getUuid()) {
- return TRUE;
- }
- $condition = $this->conditionManager->createInstance($this->configuration['condition_id'], [
- 'negate' => $this->configuration['negate'],
- ]);
- // Make sure to refine context first, such that possibly refined definitions
- // of provided context are respected.
- $this->prepareContextWithMetadata($condition, $metadata_state);
- $this->addProvidedContextDefinitions($condition, $metadata_state);
- if ($apply_assertions && !$this->isNegated()) {
- $this->assertMetadata($condition, $metadata_state);
- }
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesLoop.php b/modules/rules/src/Plugin/RulesExpression/RulesLoop.php
deleted file mode 100644
index 892eb86..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesLoop.php
+++ /dev/null
@@ -1,126 +0,0 @@
- 'list_item',
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function executeWithState(ExecutionStateInterface $state) {
- $list_data = $state->fetchDataByPropertyPath($this->configuration['list']);
- $list_item_name = $this->configuration['list_item'];
-
- foreach ($list_data as $item) {
- $state->setVariableData($list_item_name, $item);
- foreach ($this->actions as $action) {
- $action->executeWithState($state);
- }
- }
- // After the loop the list item is out of scope and cannot be used by any
- // following actions.
- $state->removeVariable($list_item_name);
- }
-
- /**
- * {@inheritdoc}
- */
- public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
- $violation_list = new IntegrityViolationList();
-
- if (empty($this->configuration['list'])) {
- $violation_list->addViolationWithMessage($this->t('List variable is missing.'));
- return $violation_list;
- }
-
- try {
- $list_definition = $metadata_state->fetchDefinitionByPropertyPath($this->configuration['list']);
- }
- catch (IntegrityException $e) {
- $violation_list->addViolationWithMessage($this->t('List variable %list does not exist. @message', [
- '%list' => $this->configuration['list'],
- '@message' => $e->getMessage(),
- ]));
- return $violation_list;
- }
-
- $list_item_name = isset($this->configuration['list_item']) ? $this->configuration['list_item'] : 'list_item';
- if ($metadata_state->hasDataDefinition($list_item_name)) {
- $violation_list->addViolationWithMessage($this->t('List item name %name conflicts with an existing variable.', [
- '%name' => $list_item_name,
- ]));
- return $violation_list;
- }
-
- if (!$list_definition instanceof ListDataDefinitionInterface) {
- $violation_list->addViolationWithMessage($this->t('The data type of list variable %list is not a list.', [
- '%list' => $this->configuration['list'],
- ]));
- return $violation_list;
- }
-
- // So far all ok, so continue with checking integrity in contained actions.
- // The parent implementation will take care of invoking pre/post traversal
- // metadata state preparations.
- $violation_list = parent::checkIntegrity($metadata_state, $apply_assertions);
- return $violation_list;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function allowsMetadataAssertions() {
- // As the list can be empty, we cannot ensure child expressions are
- // executed at all - thus no assertions can be added.
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function prepareExecutionMetadataStateBeforeTraversal(ExecutionMetadataStateInterface $metadata_state) {
- try {
- $list_definition = $metadata_state->fetchDefinitionByPropertyPath($this->configuration['list']);
- $list_item_definition = $list_definition->getItemDefinition();
- $metadata_state->setDataDefinition($this->configuration['list_item'], $list_item_definition);
- }
- catch (IntegrityException $e) {
- // Silently eat the exception: we just continue without adding the list
- // item definition to the state.
- }
- }
-
- /**
- * {@inheritdoc}
- */
- protected function prepareExecutionMetadataStateAfterTraversal(ExecutionMetadataStateInterface $metadata_state) {
- // Remove the list item variable after the loop, it is out of scope now.
- $metadata_state->removeDataDefinition($this->configuration['list_item']);
- }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesOr.php b/modules/rules/src/Plugin/RulesExpression/RulesOr.php
deleted file mode 100644
index a599161..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesOr.php
+++ /dev/null
@@ -1,41 +0,0 @@
-conditions as $condition) {
- if ($condition->executeWithState($state)) {
- return TRUE;
- }
- }
- // An empty OR should return TRUE, otherwise all conditions evaluated to
- // FALSE and we return FALSE.
- return empty($this->conditions);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function allowsMetadataAssertions() {
- // We cannot garantuee child expressions are executed, thus we cannot allow
- // metadata assertions.
- return FALSE;
- }
-
-}
diff --git a/modules/rules/src/Routing/RulesUiRouteEnhancer.php b/modules/rules/src/Routing/RulesUiRouteEnhancer.php
deleted file mode 100644
index b075455..0000000
--- a/modules/rules/src/Routing/RulesUiRouteEnhancer.php
+++ /dev/null
@@ -1,58 +0,0 @@
-rulesUiManager = $rules_ui_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function enhance(array $defaults, Request $request) {
- // @var $route \Symfony\Component\Routing\Route
- $route = $defaults[RouteObjectInterface::ROUTE_OBJECT];
- $plugin_id = $route->getOption('_rules_ui');
- $defaults['rules_ui_handler'] = $this->rulesUiManager->createInstance($plugin_id);
- return $defaults;
- }
-
- /**
- * {@inheritdoc}
- */
- public function applies(Route $route) {
- return ($route->hasOption('_rules_ui'));
- }
-
-}
diff --git a/modules/rules/src/Routing/RulesUiRouteSubscriber.php b/modules/rules/src/Routing/RulesUiRouteSubscriber.php
deleted file mode 100644
index 9cdf0e8..0000000
--- a/modules/rules/src/Routing/RulesUiRouteSubscriber.php
+++ /dev/null
@@ -1,121 +0,0 @@
-rulesUiManager = $rules_ui_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function alterRoutes(RouteCollection $collection) {
- foreach ($this->rulesUiManager->getDefinitions() as $name => $definition) {
- $ui_definition = $this->rulesUiManager->getDefinition($name);
- $this->registerRoutes($ui_definition, $collection);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public static function getSubscribedEvents() {
- $events = parent::getSubscribedEvents();
- // Should run after AdminRouteSubscriber so the routes can inherit admin
- // status of the edit routes on entities. Therefore priority -210.
- $events[RoutingEvents::ALTER] = ['onAlterRoutes', -210];
- return $events;
- }
-
- /**
- * Registers the routes as needed for the UI.
- *
- * @param \Drupal\rules\Ui\RulesUiDefinition $ui_definition
- * The definition of the RulesUI for which to register the routes.
- * @param \Symfony\Component\Routing\RouteCollection $collection
- * The route collection to which to add the routes.
- */
- protected function registerRoutes(RulesUiDefinition $ui_definition, RouteCollection $collection) {
- $base_route = $collection->get($ui_definition->base_route);
-
- $options = [
- 'parameters' => ($base_route->getOption('parameters') ?: []),
- '_admin_route' => $base_route->getOption('_admin_route') ?: FALSE,
- '_rules_ui' => $ui_definition->id,
- ];
- $requirements = [
- '_permission' => $ui_definition->permissions ?: $base_route->getRequirement('_permission'),
- ];
-
- $route = (new Route($base_route->getPath() . '/add/{expression_id}'))
- ->addDefaults([
- '_form' => '\Drupal\rules\Form\AddExpressionForm',
- '_title_callback' => '\Drupal\rules\Form\AddExpressionForm::getTitle',
- ])
- ->addOptions($options)
- ->addRequirements($requirements);
- $collection->add($ui_definition->base_route . '.expression.add', $route);
-
- $route = (new Route($base_route->getPath() . '/edit/{uuid}'))
- ->addDefaults([
- '_form' => '\Drupal\rules\Form\EditExpressionForm',
- '_title_callback' => '\Drupal\rules\Form\EditExpressionForm::getTitle',
- ])
- ->addOptions($options)
- ->addRequirements($requirements);
- $collection->add($ui_definition->base_route . '.expression.edit', $route);
-
- $route = (new Route($base_route->getPath() . '/delete/{uuid}'))
- ->addDefaults([
- '_form' => '\Drupal\rules\Form\DeleteExpressionForm',
- '_title' => 'Delete expression',
- ])
- ->addOptions($options)
- ->addRequirements($requirements);
- $collection->add($ui_definition->base_route . '.expression.delete', $route);
-
- $route = (new Route($base_route->getPath() . '/break-lock'))
- ->addDefaults([
- '_form' => '\Drupal\rules\Form\BreakLockForm',
- '_title' => 'Break lock',
- ])
- ->addOptions($options)
- ->addRequirements($requirements);
- $collection->add($ui_definition->base_route . '.break_lock', $route);
-
- $route = (new Route($base_route->getPath() . '/autocomplete/{uuid}'))
- ->addDefaults([
- '_controller' => '\Drupal\rules\Controller\AutocompleteController::autocomplete',
- 'uuid' => '',
- ])
- ->addOptions($options)
- ->addRequirements($requirements);
- $collection->add($ui_definition->base_route . '.autocomplete', $route);
- }
-
-}
diff --git a/modules/rules/src/Rules.php b/modules/rules/src/Rules.php
deleted file mode 100644
index 20ea2dd..0000000
--- a/modules/rules/src/Rules.php
+++ /dev/null
@@ -1,30 +0,0 @@
-getDefinition('plugin.manager.condition');
- $definition->setClass(ConditionManager::class);
- }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiComponentProviderInterface.php b/modules/rules/src/Ui/RulesUiComponentProviderInterface.php
deleted file mode 100644
index c69729a..0000000
--- a/modules/rules/src/Ui/RulesUiComponentProviderInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-get('current_route_match'), $container->get('config.factory'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match, ConfigFactoryInterface $config_factory) {
- parent::__construct($configuration, $plugin_id, $plugin_definition);
- $this->currentRouteMatch = $route_match;
- $this->configFactory = $config_factory;
- }
-
- /**
- * Gets the edited config object.
- *
- * @return \Drupal\rules\Ui\RulesUiComponentProviderInterface|\Drupal\Core\Config\Config
- * The component provider object (usually a config entity) or the editable
- * config object.
- */
- public function getConfig() {
- $config = $this->fetchFromTempStore();
- if (!$config) {
- if (isset($this->pluginDefinition->settings['config_parameter'])) {
- $config = $this->currentRouteMatch->getParameter($this->pluginDefinition->settings['config_parameter']);
- }
- else {
- $config = $this->configFactory->getEditable($this->pluginDefinition->settings['config_name']);
- }
- }
- return $config;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getComponentLabel() {
- if (isset($this->pluginDefinition->component_label)) {
- return $this->pluginDefinition->component_label;
- }
- elseif ($this->getConfig() instanceof EntityInterface) {
- return $this->getConfig()->label();
- }
- else {
- return $this->pluginDefinition->component_type_label;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getComponent() {
- $config = $this->getConfig();
- if ($config instanceof RulesUiComponentProviderInterface) {
- return $config->getComponent();
- }
- else {
- $configuration = $config->get($this->pluginDefinition->settings['config_key']);
- return RulesComponent::createFromConfiguration($configuration);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function updateComponent(RulesComponent $component) {
- $config = $this->getConfig();
- if ($config instanceof RulesUiComponentProviderInterface) {
- $config->updateFromComponent($component);
- }
- else {
- $config->set($this->pluginDefinition->settings['config_key'], $component->getConfiguration());
- }
- $this->storeToTempStore($config);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getBaseRouteUrl(array $options = []) {
- // See Url::fromRouteMatch()
- return Url::fromRoute(
- $this->pluginDefinition->base_route,
- $this->currentRouteMatch->getRawParameters()->all(),
- $options
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getUrlFromRoute($route_suffix, array $route_parameters, array $options = []) {
- // See Url::fromRouteMatch()
- return Url::fromRoute(
- $this->pluginDefinition->base_route . '.' . $route_suffix,
- $route_parameters + $this->currentRouteMatch->getRawParameters()->all(),
- $options
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getForm() {
- return new EmbeddedComponentForm($this);
- }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiDefinition.php b/modules/rules/src/Ui/RulesUiDefinition.php
deleted file mode 100644
index a724634..0000000
--- a/modules/rules/src/Ui/RulesUiDefinition.php
+++ /dev/null
@@ -1,160 +0,0 @@
- $value) {
- $this->$key = $value;
- }
- }
-
- /**
- * The plugin ID.
- *
- * @var string
- */
- public $id;
-
- /**
- * The human-readable name of the plugin.
- *
- * @var string
- *
- * @ingroup plugin_translatable
- */
- public $label;
-
- /**
- * The rules UI handler class.
- *
- * The class must implement \Drupal\rules\Ui\RulesUiHandlerInterface.
- *
- * @var string
- */
- public $class = RulesUiConfigHandler::class;
-
- /**
- * Array of handler-specific settings.
- *
- * Check the documentation of the ui handler for further details.
- *
- * @var array
- */
- public $settings = [];
-
- /**
- * The plugin provider; e.g., the module.
- *
- * @var string
- */
- public $provider;
-
- /**
- * The name of the base route.
- *
- * Generated routes are added below this route.
- *
- * @var string
- */
- public $base_route;
-
- /**
- * The permission string to use for the generated routes.
- *
- * If omitted, the permission string is inherited from the base route.
- *
- * @var string|null
- */
- public $permissions;
-
- /**
- * The label used for referring to the component (optional).
- *
- * If omitted, a handler-specific fallback logic is applied. For example,
- * the RulesUiConfigHandler assumes a config entity and uses its label()
- * method.
- *
- * @var string|null
- *
- * @ingroup plugin_translatable
- */
- public $component_label;
-
- /**
- * The label used for referring to the component type.
- *
- * @var string|null
- *
- * @ingroup plugin_translatable
- */
- public $component_type_label = 'component';
-
- /**
- * {@inheritdoc}
- */
- public function id() {
- return $this->id;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getProvider() {
- return $this->provider;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setClass($class) {
- $this->class = $class;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getClass() {
- return $this->class;
- }
-
- /**
- * Validates the set property values.
- *
- * @throws \Drupal\rules\Exception\LogicException
- * Thrown if the set object properties are not valid.
- */
- public function validate() {
- if (!isset($this->id)) {
- throw new LogicException("Missing the required property 'id'.");
- }
- foreach (['label', 'class', 'provider', 'base_route'] as $required) {
- if (!isset($this->$required)) {
- throw new LogicException("Plugin {$this->id} misses the required property $required.");
- }
- }
- if (!is_subclass_of($this->class, RulesUiHandlerInterface::class)) {
- throw new LogicException("The provided class does not implement the RulesUiHandlerInterface.");
- }
- }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiHandlerInterface.php b/modules/rules/src/Ui/RulesUiHandlerInterface.php
deleted file mode 100644
index 7ea5167..0000000
--- a/modules/rules/src/Ui/RulesUiHandlerInterface.php
+++ /dev/null
@@ -1,148 +0,0 @@
-rulesUiHandler)) {
- $this->rulesUiHandler = \Drupal::request()->attributes->get('rules_ui_handler');
- }
- return $this->rulesUiHandler;
- }
-
- /**
- * Sets the Rules UI handler.
- *
- * @param \Drupal\rules\Ui\RulesUiHandlerInterface $rules_ui_handler
- * The Rules UI handler to set.
- */
- public function setRulesUiHandler(RulesUiHandlerInterface $rules_ui_handler) {
- $this->rulesUiHandler = $rules_ui_handler;
- }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiManager.php b/modules/rules/src/Ui/RulesUiManager.php
deleted file mode 100644
index 42ed944..0000000
--- a/modules/rules/src/Ui/RulesUiManager.php
+++ /dev/null
@@ -1,41 +0,0 @@
-alterInfo('rules_ui');
- $this->discovery = new ContainerDerivativeDiscoveryDecorator(new YamlDiscovery('rules_ui', $module_handler->getModuleDirectories()));
- $this->factory = new ContainerFactory($this, RulesUiHandlerInterface::class);
- $this->moduleHandler = $module_handler;
- }
-
- /**
- * {@inheritdoc}
- */
- public function processDefinition(&$definition, $plugin_id) {
- $definition = new RulesUiDefinition($definition);
- $definition->validate();
- }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiManagerInterface.php b/modules/rules/src/Ui/RulesUiManagerInterface.php
deleted file mode 100644
index f8c3ccc..0000000
--- a/modules/rules/src/Ui/RulesUiManagerInterface.php
+++ /dev/null
@@ -1,49 +0,0 @@
-renderer)) {
- $this->renderer = \Drupal::service('renderer');
- }
- return $this->renderer;
- }
-
- /**
- * Retrieves the temporary storage service if not already present.
- *
- * @return \Drupal\user\SharedTempStoreFactory
- * The factory.
- */
- protected function getTempStoreFactory() {
- if (!isset($this->tempStoreFactory)) {
- $this->tempStoreFactory = \Drupal::service('user.shared_tempstore');
- }
- return $this->tempStoreFactory;
- }
-
- /**
- * Setter injection for the temporary storage factory.
- *
- * @param \Drupal\user\SharedTempStoreFactory $temp_store_factory
- * The factory.
- */
- public function setTempStoreFactory(SharedTempStoreFactory $temp_store_factory) {
- $this->tempStoreFactory = $temp_store_factory;
- }
-
- /**
- * Retrieves the date formatter service if not already present.
- *
- * @return \Drupal\Core\Datetime\DateFormatterInterface
- * The service.
- */
- protected function getDateFormatter() {
- if (!isset($this->dateFormatter)) {
- $this->dateFormatter = \Drupal::service('date.formatter');
- }
- return $this->dateFormatter;
- }
-
- /**
- * Setter injection for the date formatter service.
- *
- * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
- * The service.
- */
- public function setDateFormatter(DateFormatterInterface $date_formatter) {
- $this->dateFormatter = $date_formatter;
- }
-
- /**
- * Retrieves the entity type manager service if not already present.
- *
- * @return \Drupal\Core\Entity\EntityTypeManagerInterface
- * The entity type manager.
- */
- protected function getEntityTypeManager() {
- if (!isset($this->entityTypeManager)) {
- $this->entityTypeManager = \Drupal::service('entity_type.manager');
- }
- return $this->entityTypeManager;
- }
-
- /**
- * Gets the currently active RulesUI's handler.
- *
- * @return \Drupal\rules\Ui\RulesUiHandlerInterface
- * The RulesUI handler.
- */
- protected function getRulesUiHandler() {
- // Usually the trait is used on the RulesUI handler.
- return $this;
- }
-
- /**
- * Fetches the stored data from the temporary storage.
- *
- * @return mixed|null
- * The stored data or NULL if the temp store is empty.
- */
- protected function fetchFromTempStore() {
- return $this->getTempStore()->get($this->getTempStoreItemId());
- }
-
- /**
- * Stores some data in the temporary storage.
- *
- * @param mixed $data
- * The data to store.
- */
- protected function storeToTempStore($data) {
- $this->getTempStore()->set($this->getTempStoreItemId(), $data);
- }
-
- /**
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface::clearTemporaryStorage()
- */
- public function clearTemporaryStorage() {
- $this->getTempStore()->delete($this->getTempStoreItemId());
- }
-
- /**
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface::isLocked()
- */
- public function isLocked() {
- // If there is an object in the temporary storage from another user then
- // this component is locked.
- if ($this->getTempStore()->get($this->getTempStoreItemId()) && !$this->getTempStore()->getIfOwner($this->getTempStoreItemId())
- ) {
- return TRUE;
- }
- return FALSE;
- }
-
- /**
- * Generates the temp store item's ID to use for the edited component.
- *
- * @return string
- * The temp store ID.
- */
- private function getTempStoreItemId() {
- // The internal path is unique for the currently edited component.
- return $this->getRulesUiHandler()->getBaseRouteUrl()->getInternalPath();
- }
-
- /**
- * Gets the temporary storage repository from the factory.
- *
- * @return \Drupal\user\SharedTempStore
- * The shareds storage.
- */
- private function getTempStore() {
- if (!isset($this->tempStore)) {
- $this->tempStore = $this->getTempStoreFactory()->get($this->getRulesUiHandler()->getPluginId());
- }
- return $this->tempStore;
- }
-
- /**
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface::getLockMetaData()
- */
- public function getLockMetaData() {
- return $this->getTempStore()->getMetadata($this->getTempStoreItemId());
- }
-
- /**
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface::isEdited()
- */
- public function isEdited() {
- if ($this->getTempStore()->get($this->getTempStoreItemId())) {
- return TRUE;
- }
- return FALSE;
- }
-
- /**
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface::addLockInformation()
- */
- public function addLockInformation() {
- $build = [];
- if ($this->isLocked()) {
- $build['locked'] = [
- '#type' => 'container',
- '#attributes' => [
- 'class' => ['rules-locked', 'messages', 'messages--warning'],
- ],
- '#children' => $this->lockInformationMessage(),
- '#weight' => -10,
- ];
- }
- else {
- $build['changed'] = [
- '#type' => 'container',
- '#attributes' => [
- 'class' => ['rules-changed', 'messages', 'messages--warning'],
- ],
- '#children' => $this->t('You have unsaved changes.'),
- '#weight' => -10,
- ];
- if (!$this->isEdited()) {
- $build['changed']['#attributes']['class'][] = 'js-hide';
- }
- }
- return $build;
- }
-
- /**
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface::validateLock()
- */
- public function validateLock(array &$form, FormStateInterface $form_state) {
- if ($this->isLocked()) {
- $form_state->setErrorByName('locked', $this->lockInformationMessage());
- }
- }
-
- /**
- * Provides a lock info message.
- *
- * @return \Drupal\Core\StringTranslation\TranslatableMarkup
- * The message suitable to be shown in the UI.
- */
- private function lockInformationMessage() {
- $lock = $this->getLockMetaData();
- $username = [
- '#theme' => 'username',
- '#account' => $this->getEntityTypeManager()->getStorage('user')->load($lock->owner),
- ];
- $lock_message_substitutions = [
- '@user' => $this->getRenderer()->render($username),
- '@age' => $this->getDateFormatter()->formatTimeDiffSince($lock->updated),
- '@component_type' => $this->getRulesUiHandler()->getPluginDefinition()->component_type_label,
- ':url' => Url::fromRoute($this->getRulesUiHandler()->getPluginDefinition()->base_route . '.break_lock', \Drupal::routeMatch()->getRawParameters()->all())->toString(),
- ];
- return $this->t('This @component_type is being edited by user @user, and is therefore locked from editing by others. This lock is @age old. Click here to break this lock .', $lock_message_substitutions);
- }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/config/schema/rules_test.action.schema.yml b/modules/rules/tests/modules/rules_test/config/schema/rules_test.action.schema.yml
deleted file mode 100644
index 4a7c733..0000000
--- a/modules/rules/tests/modules/rules_test/config/schema/rules_test.action.schema.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-rules.action.context_values.rules_test_log:
- type: mapping
- label: Test log context values
- mapping:
- message:
- type: text
diff --git a/modules/rules/tests/modules/rules_test/rules_test.info.yml b/modules/rules/tests/modules/rules_test/rules_test.info.yml
deleted file mode 100644
index cab6f14..0000000
--- a/modules/rules/tests/modules/rules_test/rules_test.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Rules test
-type: module
-description: 'Support module for the Rules tests.'
-package: Rules
-# core: 8.x
-dependencies:
- - rules:rules
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionFalse.php b/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionFalse.php
deleted file mode 100644
index ed218a8..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionFalse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-setProvidedValue('provided_text', 'test value');
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function summary() {
- // We don't care about summaries for test condition plugins.
- return '';
- }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionTrue.php b/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionTrue.php
deleted file mode 100644
index 0648253..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionTrue.php
+++ /dev/null
@@ -1,32 +0,0 @@
-getContextValue('text');
- return $text == 'test value';
- }
-
- /**
- * {@inheritdoc}
- */
- public function summary() {
- // We don't care about summaries for test condition plugins.
- return '';
- }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestLogAction.php b/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestLogAction.php
deleted file mode 100644
index 76e4f29..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestLogAction.php
+++ /dev/null
@@ -1,73 +0,0 @@
-logger = $logger;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('logger.channel.rules')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function execute() {
- $message = $this->getContextValue('message');
- if (empty($message)) {
- $message = 'action called';
- }
- $this->logger->info($message);
- }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestNodeAction.php b/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestNodeAction.php
deleted file mode 100644
index 8b05962..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestNodeAction.php
+++ /dev/null
@@ -1,43 +0,0 @@
-getContextValue('node');
- $title = $this->getContextValue('title');
- $node->setTitle($title);
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoSaveContext() {
- // The node where we changed the title should be auto-saved after the
- // execution.
- return ['node'];
- }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestStringAction.php b/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestStringAction.php
deleted file mode 100644
index 798d88f..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestStringAction.php
+++ /dev/null
@@ -1,36 +0,0 @@
-getContextValue('text');
- $this->setProvidedValue('concatenated', $text . $text);
- }
-
-}
diff --git a/modules/rules/tests/modules/rules_test_default_component/config/install/rules.component.rules_test_default_component.yml b/modules/rules/tests/modules/rules_test_default_component/config/install/rules.component.rules_test_default_component.yml
deleted file mode 100644
index 8095fe2..0000000
--- a/modules/rules/tests/modules/rules_test_default_component/config/install/rules.component.rules_test_default_component.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-langcode: en
-status: true
-dependencies: {}
-id: rules_test_default_component
-label: Rules test default component
-description: 'Tests adding Rules component by default.'
-tags:
- - 'test'
-config_version: '3.0'
-component:
- context_definitions:
- user:
- type: 'entity:user'
- label: User
- description: 'The user whose mail address to print.'
- provided_context_definitions:
- concatenated:
- type: 'string'
- label: Concatenated text
- description: 'The concatenated text.'
- expression:
- id: rules_rule
- conditions:
- id: rules_and
- conditions: {}
- actions:
- id: rules_action_set
- actions:
- - id: rules_action
- action_id: rules_system_message
- context_values:
- type: 'status'
- context_mapping:
- message: 'user.mail.value'
- context_processors: { }
- provides_mapping: { }
- - id: rules_action
- action_id: rules_test_string
- context_mapping:
- text: 'user.mail.value'
- context_processors: { }
- provides_mapping: { }
diff --git a/modules/rules/tests/modules/rules_test_default_component/rules_test_default_component.info.yml b/modules/rules/tests/modules/rules_test_default_component/rules_test_default_component.info.yml
deleted file mode 100644
index adcff36..0000000
--- a/modules/rules/tests/modules/rules_test_default_component/rules_test_default_component.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Rules test default component
-type: module
-description: 'Support module for testing Rules config defaults.'
-package: Rules
-# core: 8.x
-dependencies:
- - rules:rules
- - rules:rules_test
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/config/install/rules_test_ui_embed.settings.yml b/modules/rules/tests/modules/rules_test_ui_embed/config/install/rules_test_ui_embed.settings.yml
deleted file mode 100644
index b5b3afa..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/config/install/rules_test_ui_embed.settings.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-conditions:
- expression:
- id: rules_and
- context_definitions:
- css_file:
- type: 'string'
- label: CSS file
- description: 'The CSS file for which to evaluate the conditions.'
-css:
- - module: rulest_test_ui_embed
- file: css/test.css
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/config/schema/rules_test_ui_embed.schema.yml b/modules/rules/tests/modules/rules_test_ui_embed/config/schema/rules_test_ui_embed.schema.yml
deleted file mode 100644
index 01dbd2d..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/config/schema/rules_test_ui_embed.schema.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-rules_test_ui_embed.settings:
- type: config_object
- label: 'Rules Test UI embedding settings'
- mapping:
- conditions:
- type: rules_component
- label: Rules Conditions
- css:
- type: sequence
- sequence:
- type: mapping
- label: CSS files
- mapping:
- module:
- type: string
- file:
- type: string
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/css/test.css b/modules/rules/tests/modules/rules_test_ui_embed/css/test.css
deleted file mode 100644
index adc68fa..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/css/test.css
+++ /dev/null
@@ -1,3 +0,0 @@
-h1 {
- color: red;
-}
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.info.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.info.yml
deleted file mode 100644
index 9b0f6bb..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Rules UI embedding test
-type: module
-description: 'A module testing embedding the Rules UI.'
-package: Rules
-# core: 8.x
-dependencies:
- - rules:rules
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.links.menu.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.links.menu.yml
deleted file mode 100644
index 228833f..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.links.menu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-rules_test_ui_embed.settings:
- title: 'CSS rules'
- parent: system.admin_config_ui
- description: 'Configure CSS to be active based on certain conditions met.'
- route_name: rules_test_ui_embed.settings
- weight: 10
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.routing.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.routing.yml
deleted file mode 100644
index c72535d..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.routing.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-rules_test_ui_embed.settings:
- path: '/admin/config/user-interface/css'
- defaults:
- _form: 'Drupal\rules_test_ui_embed\Form\SettingsForm'
- _title: 'CSS rules'
- requirements:
- _permission: 'administer rules'
- options:
- _rules_ui: rules_test_ui_embed.settings_conditions
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.rules_ui.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.rules_ui.yml
deleted file mode 100644
index 72d64bf..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.rules_ui.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-rules_test_ui_embed.settings_conditions:
- label: 'Conditions embedded in Rules-test-UI-embed module settings'
- base_route: rules_test_ui_embed.settings
- settings:
- config_name: rules_test_ui_embed.settings
- config_key: conditions
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/src/Form/SettingsForm.php b/modules/rules/tests/modules/rules_test_ui_embed/src/Form/SettingsForm.php
deleted file mode 100644
index 56142bf..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/src/Form/SettingsForm.php
+++ /dev/null
@@ -1,111 +0,0 @@
-rulesUiHandler ? $this->rulesUiHandler->getConfig() : NULL;
- if ($config->getName() == $name && in_array($name, $this->getEditableConfigNames())) {
- return $config;
- }
- return parent::config($name);
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, RulesUiConfigHandler $rules_ui_handler = NULL) {
- $form = parent::buildForm($form, $form_state);
- $this->rulesUiHandler = $rules_ui_handler;
- $config = $this->config('rules_test_ui_embed.settings');
-
- $form['css_file'] = [
- '#type' => 'textfield',
- '#title' => $this->t('CSS file'),
- '#default_value' => $config->get('css.0.file'),
- '#required' => TRUE,
- ];
-
- $form['conditions'] = $this->rulesUiHandler->getForm()
- ->buildForm([], $form_state);
-
- $form['actions']['cancel'] = [
- '#type' => 'submit',
- '#limit_validation_errors' => [['locked']],
- '#value' => $this->t('Cancel'),
- '#submit' => ['::cancel'],
- ];
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- parent::validateForm($form, $form_state);
- $this->rulesUiHandler->getForm()
- ->validateForm($form['conditions'], $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->rulesUiHandler->getForm()
- ->submitForm($form['conditions'], $form_state);
-
- $this->config('rules_test_ui_embed.settings')
- ->set('css.0.file', $form_state->getValue('css_file'))
- ->save();
-
- // Also remove the temporarily stored component, it has been persisted now.
- $this->rulesUiHandler->clearTemporaryStorage();
-
- parent::submitForm($form, $form_state);
- }
-
- /**
- * Form submission handler for the 'cancel' action.
- */
- public function cancel(array $form, FormStateInterface $form_state) {
- $this->rulesUiHandler->clearTemporaryStorage();
- drupal_set_message($this->t('Canceled.'));
- $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
- }
-
-}
diff --git a/modules/rules/tests/src/Functional/ConfigureAndExecuteTest.php b/modules/rules/tests/src/Functional/ConfigureAndExecuteTest.php
deleted file mode 100644
index 9c1edb9..0000000
--- a/modules/rules/tests/src/Functional/ConfigureAndExecuteTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-container->get('entity_type.manager')->getStorage('node_type')
- ->create([
- 'type' => 'article',
- 'name' => 'Article',
- ]);
- $type->save();
- $this->container->get('router.builder')->rebuild();
-
- }
-
- /**
- * Tests creation of a rule and then triggering its execution.
- */
- public function testConfigureAndExecute() {
- $account = $this->drupalCreateUser([
- 'create article content',
- 'administer rules',
- 'administer site configuration',
- ]);
- $this->drupalLogin($account);
-
- $this->drupalGet('admin/config/workflow/rules');
-
- // Set up a rule that will show a system message if the title of a node
- // matches "Test title".
- $this->clickLink('Add reaction rule');
-
- $this->fillField('Label', 'Test rule');
- $this->fillField('Machine-readable name', 'test_rule');
- $this->fillField('React on event', 'rules_entity_presave:node');
- $this->pressButton('Save');
-
- $this->clickLink('Add condition');
-
- $this->fillField('Condition', 'rules_data_comparison');
- $this->pressButton('Continue');
-
- // @todo this should not be necessary once the data context is set to
- // selector by default anyway.
- $this->pressButton('Switch to data selection');
- $this->fillField('context[data][setting]', 'node.title.0.value');
-
- $this->fillField('context[value][setting]', 'Test title');
- $this->pressButton('Save');
-
- $this->clickLink('Add action');
- $this->fillField('Action', 'rules_system_message');
- $this->pressButton('Continue');
-
- $this->fillField('context[message][setting]', 'Title matched "Test title"!');
- $this->fillField('context[type][setting]', 'status');
- $this->pressButton('Save');
-
- // One more save to permanently store the rule.
- $this->pressButton('Save');
-
- // Add a node now and check if our rule triggers.
- $this->drupalGet('node/add/article');
- $this->fillField('Title', 'Test title');
- $this->pressButton('Save');
-
- $this->assertSession()->pageTextContains('Title matched "Test title"!');
-
- // Edit the rule and negate the condition.
- $this->drupalGet('admin/config/workflow/rules/reactions/edit/test_rule');
- $this->clickLink('Edit', 0);
- $this->getSession()->getPage()->checkField('negate');
- $this->pressButton('Save');
- // One more save to permanently store the rule.
- $this->pressButton('Save');
-
- // Need to clear cache so that the edited version will be used.
- drupal_flush_all_caches();
- // Create node with same title and check that the message is not shown.
- $this->drupalGet('node/add/article');
- $this->fillField('Title', 'Test title');
- $this->pressButton('Save');
- $this->assertSession()->pageTextNotContains('Title matched "Test title"!');
- }
-
-}
diff --git a/modules/rules/tests/src/Functional/RulesBrowserTestBase.php b/modules/rules/tests/src/Functional/RulesBrowserTestBase.php
deleted file mode 100644
index 9e8b577..0000000
--- a/modules/rules/tests/src/Functional/RulesBrowserTestBase.php
+++ /dev/null
@@ -1,79 +0,0 @@
-getSession()->getPage()->findLink($locator);
- }
-
- /**
- * Finds field (input, textarea, select) with specified locator.
- *
- * @param string $locator
- * Input id, name or label.
- *
- * @return \Behat\Mink\Element\NodeElement|null
- * The input field element.
- */
- public function findField($locator) {
- return $this->getSession()->getPage()->findField($locator);
- }
-
- /**
- * Finds button with specified locator.
- *
- * @param string $locator
- * Button id, value or alt.
- *
- * @return \Behat\Mink\Element\NodeElement|null
- * The button node element.
- */
- public function findButton($locator) {
- return $this->getSession()->getPage()->findButton($locator);
- }
-
- /**
- * Presses button with specified locator.
- *
- * @param string $locator
- * Button id, value or alt.
- *
- * @throws \Behat\Mink\Exception\ElementNotFoundException
- */
- public function pressButton($locator) {
- $this->getSession()->getPage()->pressButton($locator);
- }
-
- /**
- * Fills in field (input, textarea, select) with specified locator.
- *
- * @param string $locator
- * Input id, name or label.
- * @param string $value
- * Value.
- *
- * @throws \Behat\Mink\Exception\ElementNotFoundException
- *
- * @see \Behat\Mink\Element\NodeElement::setValue
- */
- public function fillField($locator, $value) {
- $this->getSession()->getPage()->fillField($locator, $value);
- }
-
-}
diff --git a/modules/rules/tests/src/Functional/RulesUiEmbedTest.php b/modules/rules/tests/src/Functional/RulesUiEmbedTest.php
deleted file mode 100644
index ee0f2f2..0000000
--- a/modules/rules/tests/src/Functional/RulesUiEmbedTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-drupalCreateUser([
- 'administer rules',
- 'access administration pages',
- ]);
- $this->drupalLogin($account);
- $this->drupalGet('admin/config/user-interface');
-
- $this->drupalGet('admin/config/user-interface/css');
- $this->clickLink('Add condition');
- $this->fillField('Condition', 'rules_data_comparison');
- $this->pressButton('Continue');
- $this->fillField('context[data][setting]', '123');
- $this->fillField('context[value][setting]', '234');
- $this->pressButton('Save');
-
- // Now the condition should be listed. Try editing it.
- $this->assertSession()->pageTextContains('Data comparison');
- $this->clickLink('Edit');
- $this->assertSession()->fieldValueEquals('context[data][setting]', '123');
- $this->assertSession()->fieldValueEquals('context[value][setting]', '234');
- $this->fillField('context[value][setting]', '123');
- $this->pressButton('Save');
- $this->assertSession()->pageTextContains('Data comparison');
- // One more save to permanently store the changes.
- $this->fillField('css_file', 'css/test2.css');
- $this->pressButton('Save configuration');
- $this->assertSession()->pageTextContains('The configuration options have been saved.');
-
- // Reload and ensure data is still there.
- $this->drupalGet('admin/config/user-interface/css');
- $this->assertSession()->fieldValueEquals('css_file', 'css/test2.css');
- $this->assertSession()->pageTextContains('Data comparison');
-
- // Delete condition and save.
- $this->clickLink('Delete');
- $this->pressButton('Delete');
- $this->pressButton('Save configuration');
- $this->assertSession()->pageTextContains('The configuration options have been saved.');
- $this->assertSession()->pageTextNotContains('Data comparison');
- }
-
-}
diff --git a/modules/rules/tests/src/Functional/TempStorageTest.php b/modules/rules/tests/src/Functional/TempStorageTest.php
deleted file mode 100644
index 3175462..0000000
--- a/modules/rules/tests/src/Functional/TempStorageTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-drupalCreateUser(['administer rules']);
- $this->drupalLogin($account_1);
-
- $this->drupalGet('admin/config/workflow/rules');
- $this->clickLink('Add reaction rule');
-
- $this->fillField('Label', 'Test rule');
- $this->fillField('Machine-readable name', 'test_rule');
- $this->fillField('React on event', 'rules_entity_insert:node');
- $this->pressButton('Save');
-
- $this->clickLink('Add condition');
- $this->fillField('Condition', 'rules_node_is_promoted');
- $this->pressButton('Continue');
-
- $this->fillField('context[node][setting]', '1');
- $this->pressButton('Save');
-
- $this->assertSession()->pageTextContains('You have unsaved changes.');
-
- // Now check with the second user that the rule is being edited and locked.
- $account_2 = $this->drupalCreateUser(['administer rules']);
- $this->drupalLogin($account_2);
-
- $this->drupalGet('admin/config/workflow/rules/reactions/edit/test_rule');
- $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
- $this->pressButton('Cancel');
- $this->assertSession()->pageTextNotContains('Canceled.');
- $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
- $this->pressButton('Save');
- $this->assertSession()->pageTextNotContains('Reaction rule Test rule has been updated.');
- $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
- $this->clickLink('Edit');
- $current_url = $this->getSession()->getCurrentUrl();
- $this->pressButton('Save');
-
- $this->assertEquals($current_url, $this->getSession()->getCurrentUrl());
- $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
- // Try breaking the lock to edit the rule.
- $this->clickLink('break this lock');
-
- $this->assertSession()->pageTextContains('By breaking this lock, any unsaved changes made by ' . $account_1->getUsername() . ' will be lost.');
- $this->pressButton('Break lock');
-
- $this->assertSession()->pageTextContains('The lock has been broken and you may now edit this rule.');
- // The link to edit the condition is now gone because the changes have been
- // reverted.
- $this->assertFalse($this->getSession()->getPage()->hasLink('Edit'));
- }
-
-}
diff --git a/modules/rules/tests/src/Functional/UiPageTest.php b/modules/rules/tests/src/Functional/UiPageTest.php
deleted file mode 100644
index 0cb22c2..0000000
--- a/modules/rules/tests/src/Functional/UiPageTest.php
+++ /dev/null
@@ -1,148 +0,0 @@
-drupalCreateUser(['administer rules']);
- $this->drupalLogin($account);
-
- $this->drupalGet('admin/config/workflow/rules');
- $this->assertSession()->statusCodeEquals(200);
-
- // Test that there is an empty reaction rule listing.
- $this->assertSession()->pageTextContains('There is no Reaction Rule yet.');
- }
-
- /**
- * Tests that creating a reaction rule works.
- */
- public function testCreateReactionRule() {
- $account = $this->drupalCreateUser(['administer rules']);
- $this->drupalLogin($account);
-
- $this->drupalGet('admin/config/workflow/rules');
- $this->clickLink('Add reaction rule');
-
- $this->fillField('Label', 'Test rule');
- $this->fillField('Machine-readable name', 'test_rule');
- $this->fillField('React on event', 'rules_entity_insert:node');
-
- $this->pressButton('Save');
-
- $this->assertSession()->statusCodeEquals(200);
- $this->assertSession()->pageTextContains('Reaction rule Test rule has been created.');
-
- $this->clickLink('Add condition');
-
- $this->fillField('Condition', 'rules_node_is_promoted');
- $this->pressButton('Continue');
-
- $this->fillField('context[node][setting]', '1');
- $this->pressButton('Save');
-
- $this->assertSession()->statusCodeEquals(200);
- $this->assertSession()->pageTextContains('You have unsaved changes.');
-
- $this->pressButton('Save');
- $this->assertSession()->pageTextContains('Reaction rule Test rule has been updated. ');
- }
-
- /**
- * Tests that cancelling an expression from a rule works.
- */
- public function testCancelExpressionInRule() {
- // Setup a rule with one condition.
- $this->testCreateReactionRule();
-
- $this->clickLink('Add condition');
- $this->fillField('Condition', 'rules_node_is_promoted');
- $this->pressButton('Continue');
-
- $this->fillField('context[node][setting]', '1');
- $this->pressButton('Save');
-
- $this->assertSession()->pageTextContains('You have unsaved changes.');
-
- // Edit and cancel.
- $this->pressButton('Cancel');
- $this->assertSession()->pageTextContains('Canceled.');
-
- // Make sure that we are back at the overview listing page.
- $this->assertEquals(1, preg_match('#/admin/config/workflow/rules$#', $this->getSession()->getCurrentUrl()));
- }
-
- /**
- * Tests that deleting an expression from a rule works.
- */
- public function testDeleteExpressionInRule() {
- // Setup a rule with one condition.
- $this->testCreateReactionRule();
-
- $this->clickLink('Delete');
- $this->assertSession()->pageTextContains('Are you sure you want to delete Condition: Node is promoted from Test rule?');
-
- $this->pressButton('Delete');
- $this->assertSession()->pageTextContains('You have unsaved changes.');
-
- $this->pressButton('Save');
- $this->assertSession()->pageTextContains('Reaction rule Test rule has been updated. ');
- }
-
- /**
- * Tests that an action with a multiple context can be confugured.
- */
- public function testMultipleContextAction() {
- $account = $this->drupalCreateUser(['administer rules']);
- $this->drupalLogin($account);
-
- $this->drupalGet('admin/config/workflow/rules');
- $this->clickLink('Add reaction rule');
-
- $this->fillField('Label', 'Test rule');
- $this->fillField('Machine-readable name', 'test_rule');
- $this->fillField('React on event', 'rules_entity_insert:node');
-
- $this->pressButton('Save');
-
- $this->clickLink('Add action');
- $this->fillField('Action', 'rules_send_email');
- $this->pressButton('Continue');
-
- // Push the data selection switch 2 times to make sure that also works and
- // does not throw PHP notices.
- $this->pressButton('Switch to data selection');
- $this->pressButton('Switch to data selection');
-
- $this->fillField('context[to][setting]', 'klausi@example.com');
- $this->fillField('context[subject][setting]', 'subject');
- $this->fillField('context[message][setting]', 'message');
- $this->pressButton('Save');
-
- $this->assertSession()->statusCodeEquals(200);
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigEntityDefaultsTest.php b/modules/rules/tests/src/Kernel/ConfigEntityDefaultsTest.php
deleted file mode 100644
index 48f8b89..0000000
--- a/modules/rules/tests/src/Kernel/ConfigEntityDefaultsTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-entityTypeManager = $this->container->get('entity_type.manager');
- $this->storage = $this->entityTypeManager->getStorage('rules_component');
- $this->installConfig(['rules_test_default_component']);
- }
-
- /**
- * Tests Rules default components.
- */
- public function testDefaultComponents() {
- $config_entity = $this->storage->load('rules_test_default_component');
-
- $user = $this->entityTypeManager->getStorage('user')
- ->create(['mail' => 'test@example.com']);
-
- $result = $config_entity
- ->getComponent()
- ->setContextValue('user', $user)
- ->execute();
-
- // Test that the action was executed correctly.
- $messages = drupal_get_messages();
- $message_string = isset($messages['status'][0]) ? (string) $messages['status'][0] : NULL;
- $this->assertEquals($message_string, 'test@example.com');
-
- $this->assertEquals('test@example.comtest@example.com', $result['concatenated']);
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigEntityTest.php b/modules/rules/tests/src/Kernel/ConfigEntityTest.php
deleted file mode 100644
index 7263c86..0000000
--- a/modules/rules/tests/src/Kernel/ConfigEntityTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-storage = $this->container->get('entity_type.manager')->getStorage('rules_component');
- }
-
- /**
- * Tests that an empty rule configuration can be saved.
- */
- public function testSavingEmptyRule() {
- $rule = $this->expressionManager->createRule();
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- ])->setExpression($rule);
- $config_entity->save();
- }
-
- /**
- * Tests saving the configuration of an action and then loading it again.
- */
- public function testConfigAction() {
- $action = $this->expressionManager->createAction('rules_test_log');
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- ])->setExpression($action);
- $config_entity->save();
-
- $loaded_entity = $this->storage->load('test_rule');
- $this->assertEquals($action->getConfiguration(), $loaded_entity->get('component')['expression'], 'Action configuration is the same after loading the config.');
-
- // Create the Rules expression object from the configuration.
- $expression = $loaded_entity->getExpression();
- $expression->execute();
-
- // Test that the action logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Tests saving the nested config of a rule and then loading it again.
- */
- public function testConfigRule() {
- // Create a simple rule with one action and one condition.
- $rule = $this->expressionManager
- ->createRule();
- $rule->addCondition('rules_test_true');
- $rule->addAction('rules_test_log');
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- ])->setExpression($rule);
- $config_entity->save();
-
- $loaded_entity = $this->storage->load('test_rule');
- // Create the Rules expression object from the configuration.
- $expression = $loaded_entity->getExpression();
- $expression->execute();
-
- // Test that the action logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Make sure that expressions using context definitions can be exported.
- */
- public function testContextDefinitionExport() {
- $component = RulesComponent::create($this->expressionManager->createRule())
- ->addContextDefinition('test', ContextDefinition::create('string')
- ->setLabel('Test string')
- );
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- ])->updateFromComponent($component);
- $config_entity->save();
-
- $loaded_entity = $this->storage->load('test_rule');
- // Create the Rules expression object from the configuration.
- $expression = $loaded_entity->getExpression();
- $this->assertInstanceOf(Rule::class, $expression);
- $context_definitions = $loaded_entity->getContextDefinitions();
- $this->assertEquals($context_definitions['test']->getDataType(), 'string', 'Data type of context definition is correct.');
- $this->assertEquals($context_definitions['test']->getLabel(), 'Test string', 'Label of context definition is correct.');
- }
-
- /**
- * Tests that a reaction rule config entity can be saved.
- */
- public function testReactionRuleSaving() {
- $rule = $this->expressionManager->createRule();
- $storage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
- $config_entity = $storage->create([
- 'id' => 'test_rule',
- ])->setExpression($rule);
- $config_entity->save();
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigSchemaTest.php b/modules/rules/tests/src/Kernel/ConfigSchemaTest.php
deleted file mode 100644
index faa5335..0000000
--- a/modules/rules/tests/src/Kernel/ConfigSchemaTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-storage = $this->container->get('entity_type.manager')->getStorage('rules_component');
- }
-
- /**
- * Make sure the system send email config schema works on saving.
- */
- public function testMailActionContextSchema() {
- $rule = $this->expressionManager
- ->createRule();
- $rule->addAction('rules_send_email', ContextConfig::create()
- ->setValue('to', ['test@exmaple.com'])
- ->setValue('message', 'mail body')
- ->setValue('subject', 'test subject')
- );
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- ])->setExpression($rule);
- $config_entity->save();
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigurableEventHandlerTest.php b/modules/rules/tests/src/Kernel/ConfigurableEventHandlerTest.php
deleted file mode 100644
index dac52d5..0000000
--- a/modules/rules/tests/src/Kernel/ConfigurableEventHandlerTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-installSchema('system', ['sequences']);
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
- $this->installConfig(['field']);
-
- $this->storage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- FieldStorageConfig::create([
- 'field_name' => 'field_integer',
- 'type' => 'integer',
- 'entity_type' => 'node',
- 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'field_integer',
- 'entity_type' => 'node',
- 'bundle' => 'page',
- ])->save();
-
- $this->node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
- }
-
- /**
- * Tests ConfigurableEventHandlerEntityBundle.
- *
- * Test that rules are triggered correctly based upon the fully qualified
- * event name as well as the base event name.
- *
- * @todo Add integrity check that node.field_integer is detected by Rules.
- */
- public function testConfigurableEventHandler() {
- // Create rule1 with the 'rules_entity_presave:node--page' event.
- $rule1 = $this->expressionManager->createRule();
- $rule1->addAction('rules_test_log',
- ContextConfig::create()
- ->map('message', 'node.field_integer.0.value')
- );
- $config_entity1 = $this->storage->create([
- 'id' => 'test_rule1',
- ]);
- $config_entity1->set('events', [
- ['event_name' => 'rules_entity_presave:node--page'],
- ]);
- $config_entity1->set('expression', $rule1->getConfiguration());
- $config_entity1->save();
-
- // Create rule2 with the 'rules_entity_presave:node' event.
- $rule2 = $this->expressionManager->createRule();
- $rule2->addAction('rules_test_log',
- ContextConfig::create()
- ->map('message', 'node.field_integer.1.value')
- );
- $config_entity2 = $this->storage->create([
- 'id' => 'test_rule2',
- ]);
- $config_entity2->set('events', [
- ['event_name' => 'rules_entity_presave:node'],
- ]);
- $config_entity2->set('expression', $rule2->getConfiguration());
- $config_entity2->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- // Add node.field_integer.0.value to rules log message, read result.
- $this->node->field_integer->setValue(['0' => 11, '1' => 22]);
-
- // Trigger node save.
- $entity_type_id = $this->node->getEntityTypeId();
- $event = new EntityEvent($this->node, [
- $entity_type_id => $this->node,
- $entity_type_id . '_unchanged' => $this->node,
- ]);
- $event_dispatcher = \Drupal::service('event_dispatcher');
- $event_dispatcher->dispatch("rules_entity_presave:$entity_type_id", $event);
-
- // Test that the action in the rule1 logged node value.
- $this->assertRulesLogEntryExists(11, 1);
- // Test that the action in the rule2 logged node value.
- $this->assertRulesLogEntryExists(22, 0);
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ContextIntegrationTest.php b/modules/rules/tests/src/Kernel/ContextIntegrationTest.php
deleted file mode 100644
index b0b7b3c..0000000
--- a/modules/rules/tests/src/Kernel/ContextIntegrationTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-expressionManager->createInstance('rules_action',
- ContextConfig::create()
- ->setConfigKey('action_id', 'rules_test_string')
- ->map('text', 'null_context')
- ->toArray()
- );
-
- $rule = $this->expressionManager->createRule()
- ->addExpressionObject($action);
-
- $component = RulesComponent::create($rule)
- ->addContextDefinition('null_context', ContextDefinition::create('string'))
- ->setContextValue('null_context', NULL);
-
- try {
- $component->execute();
- $this->fail('No exception thrown when required context value is NULL');
- }
- catch (EvaluationException $e) {
- $this->pass('Exception thrown as expected when a required context is NULL');
- }
- }
-
- /**
- * Tests that a required context value that is NULL throws an exception.
- */
- public function testRequiredNullValue() {
- // Configure a simple rule with one action. The required 'text' context is
- // set to be NULL.
- $action = $this->expressionManager->createInstance('rules_action',
- ContextConfig::create()
- ->setConfigKey('action_id', 'rules_test_string')
- ->setValue('text', NULL)
- ->toArray()
- );
-
- $rule = $this->expressionManager->createRule([]);
- $rule->addExpressionObject($action);
- try {
- $rule->execute();
- $this->fail('No exception thrown when required context value is NULL');
- }
- catch (EvaluationException $e) {
- $this->pass('Exception thrown as expected when a required context is NULL');
- }
- }
-
- /**
- * Tests that NULL values for contexts are allowed if specified.
- */
- public function testAllowNullValue() {
- // Configure a simple rule with the data set action which allows NULL
- // values.
- $action = $this->expressionManager->createInstance('rules_action',
- ContextConfig::create()
- ->setConfigKey('action_id', 'rules_data_set')
- ->map('data', 'null_variable')
- ->map('value', 'new_value')
- ->toArray()
- );
-
- $rule = $this->expressionManager->createRule()
- ->addExpressionObject($action);
-
- $component = RulesComponent::create($rule)
- ->addContextDefinition('null_variable', ContextDefinition::create('string'))
- ->addContextDefinition('new_value', ContextDefinition::create('string'))
- ->setContextValue('null_variable', NULL)
- ->setContextValue('new_value', 'new value');
-
- $component->execute();
-
- $this->assertEquals('new value', $component->getState()->getVariableValue('null_variable'));
- }
-
- /**
- * Tests the assignment restriction on context definitions.
- */
- public function testAssignmentRestriction() {
- $action_manager = $this->container->get('plugin.manager.rules_action');
-
- // Test the assignment restriction on the entity fetch action as an example.
- $entity_fetch_action = $action_manager->createInstance('rules_entity_fetch_by_id');
- $context_definition = $entity_fetch_action->getContextDefinition('type');
- $this->assertEquals($context_definition->getAssignmentRestriction(), 'input');
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/CoreIntegrationTest.php b/modules/rules/tests/src/Kernel/CoreIntegrationTest.php
deleted file mode 100644
index a350e24..0000000
--- a/modules/rules/tests/src/Kernel/CoreIntegrationTest.php
+++ /dev/null
@@ -1,319 +0,0 @@
-installSchema('system', ['sequences']);
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
- }
-
- /**
- * Tests that a complex data selector can be applied to entities.
- */
- public function testEntityPropertyPath() {
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
-
- $user = $entity_type_manager->getStorage('user')
- ->create([
- 'name' => 'test value',
- ]);
-
- $user->save();
- $node->setOwner($user);
-
- $rule = $this->expressionManager->createRule();
-
- // Test that the long detailed data selector works.
- $rule->addCondition('rules_test_string_condition', ContextConfig::create()
- ->map('text', 'node.uid.0.entity.name.0.value')
- );
-
- // Test that the shortened data selector without list indices.
- $rule->addCondition('rules_test_string_condition', ContextConfig::create()
- ->map('text', 'node.uid.entity.name.value')
- );
-
- $rule->addAction('rules_test_log');
-
- RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->setContextValue('node', $node)
- ->execute();
- }
-
- /**
- * Tests that an entity is automatically saved after being changed.
- */
- public function testEntityAutoSave() {
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
-
- // We use the rules_test_node action plugin which marks its node context for
- // auto saving.
- // @see \Drupal\rules_test\Plugin\RulesAction\TestNodeAction
- $action = $this->expressionManager->createAction('rules_test_node')
- ->setConfiguration(ContextConfig::create()
- ->map('node', 'node')
- ->map('title', 'title')
- ->toArray()
- );
-
- RulesComponent::create($action)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->addContextDefinition('title', ContextDefinition::create('string'))
- ->setContextValue('node', $node)
- ->setContextValue('title', 'new title')
- ->execute();
- $this->assertNotNull($node->id(), 'Node ID is set, which means that the node has been saved.');
- }
-
- /**
- * Tests that tokens in action parameters get replaced.
- */
- public function testTokenReplacements() {
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
-
- $user = $entity_type_manager->getStorage('user')
- ->create([
- 'name' => 'klausi',
- ]);
-
- $user->save();
- $node->setOwner($user);
-
- // Configure a simple rule with one action.
- $action = $this->expressionManager->createInstance('rules_action',
- ContextConfig::create()
- ->map('message', 'message')
- ->map('type', 'type')
- ->process('message', 'rules_tokens')
- ->setConfigKey('action_id', 'rules_system_message')
- ->toArray()
- );
-
- $rule = $this->expressionManager->createRule()
- ->addExpressionObject($action);
-
- RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->addContextDefinition('message', ContextDefinition::create('string'))
- ->addContextDefinition('type', ContextDefinition::create('string'))
- ->setContextValue('node', $node)
- ->setContextValue('message', 'Hello {{ node.uid.entity.name.value }}!')
- ->setContextValue('type', 'status')
- ->execute();
-
- $messages = drupal_set_message();
- $this->assertEquals((string) $messages['status'][0], 'Hello klausi!');
- }
-
- /**
- * Tests that tokens used to format entity fields get replaced.
- */
- public function testTokenFormattingReplacements() {
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- // Set the created date to the first second in 1970.
- 'created' => 1,
- ]);
-
- // Configure a simple rule with one action.
- $action = $this->expressionManager->createInstance('rules_action',
- ContextConfig::create()
- ->map('message', 'message')
- ->map('type', 'type')
- ->process('message', 'rules_tokens')
- ->setConfigKey('action_id', 'rules_system_message')
- ->toArray()
- );
-
- $rule = $this->expressionManager->createRule()
- ->addExpressionObject($action);
-
- RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->addContextDefinition('message', ContextDefinition::create('string'))
- ->addContextDefinition('type', ContextDefinition::create('string'))
- ->setContextValue('node', $node)
- ->setContextValue('message', "The node was created in the year {{ node.created.value | format_date('custom', 'Y') }}")
- ->setContextValue('type', 'status')
- ->execute();
-
- $messages = drupal_set_message();
- $this->assertEquals((string) $messages['status'][0], 'The node was created in the year 1970');
- }
-
- /**
- * Tests that the data set action works on entities.
- */
- public function testDataSetEntities() {
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
-
- // Configure a simple rule with one action.
- $action = $this->expressionManager->createInstance('rules_action',
- ContextConfig::create()
- ->setConfigKey('action_id', 'rules_data_set')
- ->map('data', 'node.title')
- ->map('value', 'new_title')
- ->toArray()
- );
-
- $rule = $this->expressionManager->createRule()
- ->addExpressionObject($action);
-
- RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->addContextDefinition('new_title', ContextDefinition::create('string'))
- ->setContextValue('node', $node)
- ->setContextValue('new_title', 'new title')
- ->execute();
-
- $this->assertEquals('new title', $node->getTitle());
- $this->assertNotNull($node->id(), 'Node ID is set, which means that the node has been auto-saved.');
- }
-
- /**
- * Tests that auto saving in a component executed as action works.
- */
- public function testComponentActionAutoSave() {
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- $nested_rule = $this->expressionManager->createRule();
- // Create a node entity with the action.
- $nested_rule->addAction('rules_entity_create:node', ContextConfig::create()
- ->setValue('type', 'page')
- );
- // Set the title of the new node so that it is marked for auto-saving.
- $nested_rule->addAction('rules_data_set', ContextConfig::create()
- ->map('data', 'entity.title')
- ->setValue('value', 'new title')
- );
-
- $rules_config = new RulesComponentConfig([
- 'id' => 'test_rule',
- 'label' => 'Test rule',
- ], 'rules_component');
- $rules_config->setExpression($nested_rule);
- $rules_config->save();
-
- // Invoke the rules component in another rule.
- $rule = $this->expressionManager->createRule();
- $rule->addAction('rules_component:test_rule');
-
- RulesComponent::create($rule)->execute();
-
- $nodes = Node::loadMultiple();
- $node = reset($nodes);
- $this->assertEquals('new title', $node->getTitle());
- $this->assertNotNull($node->id(), 'Node ID is set, which means that the node has been auto-saved.');
- }
-
- /**
- * Tests using global context.
- */
- public function testGlobalContext() {
- $account = User::create([
- 'name' => 'hubert',
- ]);
- $account->save();
- $this->container->get('current_user')->setAccount($account);
-
- $rule = $this->expressionManager->createRule()
- ->addAction('rules_system_message', ContextConfig::create()
- ->map('message', '@user.current_user_context:current_user.name.value')
- ->setValue('type', 'status')
- );
- $component = RulesComponent::create($rule);
- $this->assertEquals(0, $component->checkIntegrity()->count());
-
- // Ensure the execution-state is aware of global context.
- $result = $component->getState()
- ->hasVariable('@user.current_user_context:current_user');
- $this->assertTrue($result);
- // Test asking for non-existing variables.
- $this->assertFalse($component->getState()
- ->hasVariable('@user.current_user_context:invalid'));
- $this->assertFalse($component->getState()
- ->hasVariable('@user.invalid_service'));
- $this->assertFalse($component->getState()
- ->hasVariable('invalid-var'));
-
- // Test using global context during execution.
- $component->execute();
- $messages = drupal_set_message();
- $this->assertEquals((string) $messages['status'][0], 'hubert');
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/DataProcessorTest.php b/modules/rules/tests/src/Kernel/DataProcessorTest.php
deleted file mode 100644
index 9f71b48..0000000
--- a/modules/rules/tests/src/Kernel/DataProcessorTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-expressionManager->createInstance('rules_action',
- // @todo Actually the data processor plugin only applies to numbers, so is
- // kind of an invalid configuration. Since the configuration is not
- // validated during execution this works for now.
- ContextConfig::create()
- ->map('message', 'message')
- ->map('type', 'type')
- ->process('message', 'rules_numeric_offset', [
- 'offset' => 1,
- ])
- ->setConfigKey('action_id', 'rules_system_message')
- ->toArray()
- );
-
- $component = RulesComponent::create($this->expressionManager->createRule())
- ->addContextDefinition('message', ContextDefinition::create('string'))
- ->addContextDefinition('type', ContextDefinition::create('string'))
- ->setContextValue('message', 1)
- ->setContextValue('type', 'status');
-
- $component->getExpression()
- ->addExpressionObject($action);
-
- $component->execute();
-
- $messages = drupal_set_message();
- // The original value was 1 and the processor adds 1, so the result should
- // be 2.
- $this->assertEquals((string) $messages['status'][0], '2');
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/Engine/AutocompleteTest.php b/modules/rules/tests/src/Kernel/Engine/AutocompleteTest.php
deleted file mode 100644
index c3bed6a..0000000
--- a/modules/rules/tests/src/Kernel/Engine/AutocompleteTest.php
+++ /dev/null
@@ -1,366 +0,0 @@
-installEntitySchema('user');
-
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- // Create a multi-value integer field for testing.
- FieldStorageConfig::create([
- 'field_name' => 'field_integer',
- 'type' => 'integer',
- 'entity_type' => 'node',
- 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'field_integer',
- 'entity_type' => 'node',
- 'bundle' => 'page',
- ])->save();
- }
-
- /**
- * Tests autocompletion works for a variable in the metadata state.
- */
- public function testAutocomplete() {
- $rule = $this->expressionManager->createRule();
- $action = $this->expressionManager->createAction('rules_data_set');
- $rule->addExpressionObject($action);
-
- $results = RulesComponent::create($rule)
- ->addContextDefinition('entity', ContextDefinition::create('entity'))
- ->autocomplete('e', $action);
-
- $this->assertSame([
- [
- 'value' => 'entity',
- 'label' => 'entity',
- ],
- [
- 'value' => 'entity.',
- 'label' => 'entity...',
- ],
- ], $results);
- }
-
- /**
- * Test various node example data selectors.
- */
- public function testNodeAutocomplete() {
- $rule = $this->expressionManager->createRule();
- $rule->addAction('rules_data_set');
-
- $component = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node:page'));
-
- // Tests that "node.uid.en" returns the suggestion "node.uid.entity".
- $results = $component->autocomplete('node.uid.en');
- $this->assertSame([
- [
- 'value' => 'node.uid.entity',
- 'label' => 'node.uid.entity (User)',
- ],
- [
- 'value' => 'node.uid.entity.',
- 'label' => 'node.uid.entity... (User)',
- ],
- ], $results);
-
- // Tests that "node." returns all available fields on a node.
- $results = $component->autocomplete('node.');
- $expected = [
- [
- 'value' => 'node.changed',
- 'label' => 'node.changed (Changed)',
- ],
- [
- 'value' => 'node.changed.',
- 'label' => 'node.changed... (Changed)',
- ],
- [
- 'value' => 'node.created',
- 'label' => 'node.created (Authored on)',
- ],
- [
- 'value' => 'node.created.',
- 'label' => 'node.created... (Authored on)',
- ],
- [
- 'value' => 'node.default_langcode',
- 'label' => 'node.default_langcode (Default translation)',
- ],
- [
- 'value' => 'node.default_langcode.',
- 'label' => 'node.default_langcode... (Default translation)',
- ],
- [
- 'value' => 'node.field_integer',
- 'label' => 'node.field_integer (field_integer)',
- ],
- [
- 'value' => 'node.field_integer.',
- 'label' => 'node.field_integer... (field_integer)',
- ],
- [
- 'value' => 'node.langcode',
- 'label' => 'node.langcode (Language)',
- ],
- [
- 'value' => 'node.langcode.',
- 'label' => 'node.langcode... (Language)',
- ],
- [
- 'value' => 'node.nid',
- // @todo Remove this once Drupal 8.0.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.nid (Node ID)' : 'node.nid (ID)',
- ],
- [
- 'value' => 'node.nid.',
- // @todo Remove this once Drupal 8.0.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.nid... (Node ID)' : 'node.nid... (ID)',
- ],
- [
- 'value' => 'node.promote',
- 'label' => 'node.promote (Promoted to front page)',
- ],
- [
- 'value' => 'node.promote.',
- 'label' => 'node.promote... (Promoted to front page)',
- ],
- [
- 'value' => 'node.revision_log',
- 'label' => 'node.revision_log (Revision log message)',
- ],
- [
- 'value' => 'node.revision_log.',
- 'label' => 'node.revision_log... (Revision log message)',
- ],
- [
- 'value' => 'node.revision_timestamp',
- // @todo In Drupal 8.4.x the text changed from (Revision timestamp) to
- // (Revision create time). Remove this once 8.3.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_timestamp (Revision create time)' : 'node.revision_timestamp (Revision timestamp)',
- ],
- [
- 'value' => 'node.revision_timestamp.',
- // @todo In Drupal 8.4.x the text changed from (Revision timestamp) to
- // (Revision create time). Remove this once 8.3.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_timestamp... (Revision create time)' : 'node.revision_timestamp... (Revision timestamp)',
- ],
- [
- 'value' => 'node.revision_translation_affected',
- 'label' => 'node.revision_translation_affected (Revision translation affected)',
- ],
- [
- 'value' => 'node.revision_translation_affected.',
- 'label' => 'node.revision_translation_affected... (Revision translation affected)',
- ],
- [
- 'value' => 'node.revision_uid',
- // @todo In Drupal 8.4.x the text changed from (Revision user ID) to
- // (Revision user). Remove this once 8.3.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_uid (Revision user)' : 'node.revision_uid (Revision user ID)',
- ],
- [
- 'value' => 'node.revision_uid.',
- // @todo In Drupal 8.4.x the text changed from (Revision user ID) to
- // (Revision user). Remove this once 8.3.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_uid... (Revision user)' : 'node.revision_uid... (Revision user ID)',
- ],
- [
- 'value' => 'node.status',
- // In Core 8.4 the text has changed from Publishing Status to Published.
- // @todo Remove this version checking when 8.3.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.status (Published)' : 'node.status (Publishing status)',
- ],
- [
- 'value' => 'node.status.',
- // In Core 8.4 the text has changed from Publishing Status to Published.
- // @todo Remove this version checking when 8.3.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.status... (Published)' : 'node.status... (Publishing status)',
- ],
- [
- 'value' => 'node.sticky',
- 'label' => 'node.sticky (Sticky at top of lists)',
- ],
- [
- 'value' => 'node.sticky.',
- 'label' => 'node.sticky... (Sticky at top of lists)',
- ],
- [
- 'value' => 'node.title',
- 'label' => 'node.title (Title)',
- ],
- [
- 'value' => 'node.title.',
- 'label' => 'node.title... (Title)',
- ],
- [
- 'value' => 'node.type',
- // @todo Remove this once Drupal 8.0.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.type (Type)' : 'node.type (Content type)',
- ],
- [
- 'value' => 'node.type.',
- // @todo Remove this once Drupal 8.0.x is unsupported.
- 'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.type... (Type)' : 'node.type... (Content type)',
- ],
- [
- 'value' => 'node.uid',
- 'label' => 'node.uid (Authored by)',
- ],
- [
- 'value' => 'node.uid.',
- 'label' => 'node.uid... (Authored by)',
- ],
- [
- 'value' => 'node.uuid',
- 'label' => 'node.uuid (UUID)',
- ],
- [
- 'value' => 'node.uuid.',
- 'label' => 'node.uuid... (UUID)',
- ],
- [
- 'value' => 'node.vid',
- 'label' => 'node.vid (Revision ID)',
- ],
- [
- 'value' => 'node.vid.',
- 'label' => 'node.vid... (Revision ID)',
- ],
- ];
- // Because this is a huge array run the assertion per entry because that is
- // easier for debugging.
- foreach ($expected as $index => $entry) {
- $this->assertSame($entry, $results[$index]);
- }
-
- // Tests that "node.uid.entity.na" returns "node.uid.entity.name".
- $results = $component->autocomplete('node.uid.entity.na');
- $this->assertSame([
- [
- 'value' => 'node.uid.entity.name',
- 'label' => 'node.uid.entity.name (Name)',
- ],
- [
- 'value' => 'node.uid.entity.name.',
- 'label' => 'node.uid.entity.name... (Name)',
- ],
- ], $results);
-
- // A multi-valued field should show numeric indices suggestions.
- $results = $component->autocomplete('node.field_integer.');
- $this->assertSame([
- [
- 'value' => 'node.field_integer.0',
- 'label' => 'node.field_integer.0',
- ],
- [
- 'value' => 'node.field_integer.0.',
- 'label' => 'node.field_integer.0...',
- ],
- [
- 'value' => 'node.field_integer.1',
- 'label' => 'node.field_integer.1',
- ],
- [
- 'value' => 'node.field_integer.1.',
- 'label' => 'node.field_integer.1...',
- ],
- [
- 'value' => 'node.field_integer.2',
- 'label' => 'node.field_integer.2',
- ],
- [
- 'value' => 'node.field_integer.2.',
- 'label' => 'node.field_integer.2...',
- ],
- [
- 'value' => 'node.field_integer.value',
- 'label' => 'node.field_integer.value (Integer value)',
- ],
- ], $results);
-
- // A single-valued field should not show numeric indices suggestions.
- $results = $component->autocomplete('node.title.');
- $this->assertSame([
- [
- 'value' => 'node.title.value',
- 'label' => 'node.title.value (Text value)',
- ],
- ], $results);
-
- // A single-valued field should not show numeric indices suggestions.
- $results = $component->autocomplete('n');
- $this->assertSame([
- [
- 'value' => 'node',
- 'label' => 'node',
- ],
- [
- 'value' => 'node.',
- 'label' => 'node...',
- ],
- ], $results);
- }
-
- /**
- * Tests that autocomplete results for a flat list are correct.
- */
- public function testListAutocomplete() {
- $rule = $this->expressionManager->createRule();
- $rule->addAction('rules_data_set');
-
- $context_definition = ContextDefinition::create('integer');
- $context_definition->setMultiple();
- $component = RulesComponent::create($rule)
- ->addContextDefinition('list', $context_definition);
-
- $results = $component->autocomplete('list.');
- $this->assertSame([
- [
- 'value' => 'list.0',
- 'label' => 'list.0',
- ],
- [
- 'value' => 'list.1',
- 'label' => 'list.1',
- ],
- [
- 'value' => 'list.2',
- 'label' => 'list.2',
- ],
- ], $results);
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/Engine/MetadataAssertionTest.php b/modules/rules/tests/src/Kernel/Engine/MetadataAssertionTest.php
deleted file mode 100644
index ad0fac1..0000000
--- a/modules/rules/tests/src/Kernel/Engine/MetadataAssertionTest.php
+++ /dev/null
@@ -1,173 +0,0 @@
-installSchema('system', ['sequences']);
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
- $this->installConfig(['field']);
-
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- FieldStorageConfig::create([
- 'field_name' => 'field_text',
- 'type' => 'string',
- 'entity_type' => 'node',
- 'cardinality' => 1,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'field_text',
- 'entity_type' => 'node',
- 'bundle' => 'page',
- ])->save();
- }
-
- /**
- * Tests asserting metadata using the EntityIfOfBundle condition.
- */
- public function testAssertingEntityBundle() {
- // When trying to use the field_text field without knowledge of the bundle,
- // the field is not available.
- $rule = $this->expressionManager->createRule();
- $rule->addAction('rules_system_message', ContextConfig::create()
- ->map('message', 'node.field_text.value')
- ->setValue('type', 'status')
- );
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $this->assertEquals(
- 'Data selector %selector for context %context_name is invalid. @message',
- $violation_list->get(0)->getMessage()->getUntranslatedString()
- );
-
- // Now add the EntityIsOfBundle condition and try again.
- $rule->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
- ->map('entity', 'node')
- ->setValue('type', 'node')
- ->setValue('bundle', 'page')
- );
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->checkIntegrity();
- $this->assertEquals(0, iterator_count($violation_list));
- }
-
- /**
- * Tests asserted metadata is handled correctly in OR and AND containers.
- */
- public function testAssertingWithLogicalOperations() {
- // Add an nested AND and make sure it keeps working.
- $rule = $this->expressionManager->createRule();
- $and = $this->expressionManager->createAnd();
- $and->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
- ->map('entity', 'node')
- ->setValue('type', 'node')
- ->setValue('bundle', 'page')
- );
- $rule->addExpressionObject($and);
- $rule->addAction('rules_system_message', ContextConfig::create()
- ->map('message', 'node.field_text.value')
- ->setValue('type', 'status')
- );
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->checkIntegrity();
- $this->assertEquals(0, iterator_count($violation_list));
-
- // Add an nested OR and make sure it is ignored.
- $rule = $this->expressionManager->createRule();
- $or = $this->expressionManager->createOr();
- $or->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
- ->map('entity', 'node')
- ->setValue('type', 'node')
- ->setValue('bundle', 'page')
- );
- $rule->addExpressionObject($or);
- $rule->addAction('rules_system_message', ContextConfig::create()
- ->map('message', 'node.field_text.value')
- ->setValue('type', 'status')
- );
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- }
-
- /**
- * Tests asserted metadata of negated conditions is ignored.
- */
- public function testAssertingOfNegatedConditions() {
- // Negate the condition only and make sure it is ignored.
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
- ->map('entity', 'node')
- ->setValue('type', 'node')
- ->setValue('bundle', 'page')
- )->negate(TRUE);
- $rule->addAction('rules_system_message', ContextConfig::create()
- ->map('message', 'node.field_text.value')
- ->setValue('type', 'status')
- );
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
-
- // Add an negated AND and make sure it is ignored.
- $rule = $this->expressionManager->createRule();
- $and = $this->expressionManager->createAnd();
- $and->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
- ->map('entity', 'node')
- ->setValue('type', 'node')
- ->setValue('bundle', 'page')
- );
- $and->negate(TRUE);
- $rule->addExpressionObject($and);
- $rule->addAction('rules_system_message', ContextConfig::create()
- ->map('message', 'node.field_text.value')
- ->setValue('type', 'status')
- );
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/EntityViewTest.php b/modules/rules/tests/src/Kernel/EntityViewTest.php
deleted file mode 100644
index 41ace4b..0000000
--- a/modules/rules/tests/src/Kernel/EntityViewTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-installConfig(['system']);
- $this->installConfig(['field']);
- $this->installConfig(['node']);
- $this->installSchema('system', ['sequences']);
-
- // Drupal 8.0.x needs the router table installed which is done automatically
- // in Drupal 8.1.x. Remove this once Drupal 8.0.x is unsupported.
- if (!empty(drupal_get_module_schema('system', 'router'))) {
- $this->installSchema('system', ['router']);
- }
-
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
-
- // Make sure that the node routes get picked when used during rendering.
- $this->container->get('router.builder')->rebuild();
- }
-
- /**
- * Tests that rules_entity_view() can be invoked correctly.
- */
- public function testEntityViewHook() {
- // Create a node.
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create([
- 'type' => 'page',
- 'display_submitted' => FALSE,
- ])
- ->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
- $node->save();
-
- // Build the node render array and render it, so that hook_entity_view() is
- // invoked.
- $view_builder = $entity_type_manager->getViewBuilder('node');
- $build = $view_builder->view($node);
- $this->container->get('renderer')->renderPlain($build);
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/EventIntegrationTest.php b/modules/rules/tests/src/Kernel/EventIntegrationTest.php
deleted file mode 100644
index 5f7b4ff..0000000
--- a/modules/rules/tests/src/Kernel/EventIntegrationTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-storage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-
- $this->installConfig(['system']);
- $this->installConfig(['field']);
- $this->installConfig(['node']);
- $this->installSchema('node', ['node_access']);
- $this->installSchema('system', ['sequences']);
-
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
- }
-
- /**
- * Test that the user login hook triggers the Rules event listener.
- */
- public function testUserLoginEvent() {
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_test_true');
- $rule->addAction('rules_test_log',
- ContextConfig::create()
- ->map('message', 'account.name.0.value')
- );
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- 'events' => [['event_name' => 'rules_user_login']],
- 'expression' => $rule->getConfiguration(),
- ]);
- $config_entity->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- $account = User::create(['name' => 'test_user']);
- // Invoke the hook manually which should trigger the rule.
- rules_user_login($account);
-
- // Test that the action in the rule logged something.
- $this->assertRulesLogEntryExists('test_user');
- }
-
- /**
- * Test that the user logout hook triggers the Rules event listener.
- */
- public function testUserLogoutEvent() {
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_test_true');
- $rule->addAction('rules_test_log');
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- 'events' => [['event_name' => 'rules_user_logout']],
- 'expression' => $rule->getConfiguration(),
- ]);
- $config_entity->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- $account = $this->container->get('current_user');
- // Invoke the hook manually which should trigger the rule.
- rules_user_logout($account);
-
- // Test that the action in the rule logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Test that the cron hook triggers the Rules event listener.
- */
- public function testCronEvent() {
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_test_true');
- $rule->addAction('rules_test_log');
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- 'events' => [['event_name' => 'rules_system_cron']],
- 'expression' => $rule->getConfiguration(),
- ]);
- $config_entity->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- // Run cron.
- $this->container->get('cron')->run();
-
- // Test that the action in the rule logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Test that a Logger message trigger the Rules logger listener.
- */
- public function testSystemLoggerEvent() {
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_test_true');
- $rule->addAction('rules_test_log');
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- 'events' => [['event_name' => 'rules_system_logger_event']],
- 'expression' => $rule->getConfiguration(),
- ]);
- $config_entity->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- // Creates a logger-item, that must be dispatched as event.
- $this->container->get('logger.factory')->get('rules_test')
- ->notice("This message must get logged and dispatched as rules_system_logger_event");
-
- // Test that the action in the rule logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Test that Drupal initializing triggers the Rules logger listener.
- */
- public function testInitEvent() {
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_test_true');
- $rule->addAction('rules_test_log');
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- 'events' => [['event_name' => KernelEvents::REQUEST]],
- 'expression' => $rule->getConfiguration(),
- ]);
- $config_entity->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- $dispatcher = $this->container->get('event_dispatcher');
-
- // Remove all the listeners except Rules before triggering an event.
- $listeners = $dispatcher->getListeners(KernelEvents::REQUEST);
- foreach ($listeners as $listener) {
- if (empty($listener[1]) || $listener[1] != 'onRulesEvent') {
- $dispatcher->removeListener(KernelEvents::REQUEST, $listener);
- }
- }
- // Manually trigger the initialization event.
- $dispatcher->dispatch(KernelEvents::REQUEST);
-
- // Test that the action in the rule logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Test that rules config supports multiple events.
- */
- public function testMultipleEvents() {
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_test_true');
- $rule->addAction('rules_test_log');
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- ]);
- $config_entity->set('events', [
- ['event_name' => 'rules_user_login'],
- ['event_name' => 'rules_user_logout'],
- ]);
- $config_entity->set('expression', $rule->getConfiguration());
- $config_entity->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- $account = User::create(['name' => 'test_user']);
- // Invoke the hook manually which should trigger the rules_user_login event.
- rules_user_login($account);
- // Invoke the hook manually which should trigger the rules_user_logout
- // event.
- rules_user_logout($account);
-
- // Test that the action in the rule logged something.
- $this->assertRulesLogEntryExists('action called');
- $this->assertRulesLogEntryExists('action called', 1);
- }
-
- /**
- * Tests that the entity presave/update events work with original entities.
- *
- * @param string $event_name
- * The event name that should be configured in the test rule.
- *
- * @dataProvider providerTestEntityOriginal
- */
- public function testEntityOriginal($event_name) {
- // Create a node that we will change and save later.
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create([
- 'type' => 'page',
- 'display_submitted' => FALSE,
- ])
- ->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
- $node->save();
-
- // Create a rule with a condition to compare the changed node title. If the
- // title has changed the action is executed.
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_data_comparison', ContextConfig::create()
- ->map('data', 'node.title.value')
- ->map('value', 'node_unchanged.title.value')
- ->negateResult()
- );
- $rule->addAction('rules_test_log');
-
- $config_entity = $this->storage->create([
- 'id' => 'test_rule',
- 'events' => [['event_name' => $event_name]],
- 'expression' => $rule->getConfiguration(),
- ]);
- $config_entity->save();
-
- // The logger instance has changed, refresh it.
- $this->logger = $this->container->get('logger.channel.rules');
-
- // Now change the title and trigger the presave event by savoing the node.
- $node->setTitle('new title');
- $node->save();
-
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Provides test data for testentityOrigfinal().
- */
- public function providerTestEntityOriginal() {
- return [
- ['rules_entity_presave:node'],
- ['rules_entity_update:node'],
- ];
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RedirectEventSubscriberTest.php b/modules/rules/tests/src/Kernel/RedirectEventSubscriberTest.php
deleted file mode 100644
index 65db584..0000000
--- a/modules/rules/tests/src/Kernel/RedirectEventSubscriberTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-installSchema('system', ['router']);
- $this->container->get('router.builder')->rebuild();
- }
- }
-
- /**
- * Test the response is a redirect if a redirect url is added to the request.
- *
- * @covers ::checkRedirectIssued
- */
- public function testCheckRedirectIssued() {
- /** @var \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel */
- $http_kernel = $this->container->get('http_kernel');
-
- $request = Request::create('/');
- $request->attributes->set('_rules_redirect_action_url', '/test/redirect/url');
-
- $response = $http_kernel->handle($request);
-
- $this->assertInstanceOf(RedirectResponse::class, $response, "The response is a redirect.");
- $this->assertEquals('/test/redirect/url', $response->getTargetUrl(), "The redirect target is the provided url.");
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesDrupalTestBase.php b/modules/rules/tests/src/Kernel/RulesDrupalTestBase.php
deleted file mode 100644
index fb14451..0000000
--- a/modules/rules/tests/src/Kernel/RulesDrupalTestBase.php
+++ /dev/null
@@ -1,99 +0,0 @@
-logger = $this->container->get('logger.channel.rules');
- // Clear the log from any stale entries that are bleeding over from previous
- // tests.
- $this->logger->clearLogs();
-
- $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
- $this->conditionManager = $this->container->get('plugin.manager.condition');
- $this->typedDataManager = $this->container->get('typed_data_manager');
- }
-
- /**
- * Creates a new condition.
- *
- * @param string $id
- * The condition plugin id.
- *
- * @return \Drupal\rules\Core\RulesConditionInterface
- * The created condition plugin.
- */
- protected function createCondition($id) {
- $condition = $this->expressionManager->createInstance('rules_condition', [
- 'condition_id' => $id,
- ]);
- return $condition;
- }
-
- /**
- * Checks if particular message is in the log with given delta.
- *
- * @param string $message
- * Log message.
- * @param int $log_item_index
- * Log item's index in log entries stack.
- */
- protected function assertRulesLogEntryExists($message, $log_item_index = 0) {
- // Test that the action has logged something.
- $logs = $this->logger->getLogs();
- $this->assertEqual($logs[$log_item_index]['message'], $message);
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesEngineTest.php b/modules/rules/tests/src/Kernel/RulesEngineTest.php
deleted file mode 100644
index 5ff207c..0000000
--- a/modules/rules/tests/src/Kernel/RulesEngineTest.php
+++ /dev/null
@@ -1,171 +0,0 @@
-installEntitySchema('user');
- }
-
- /**
- * Tests creating a rule and iterating over the rule elements.
- */
- public function testRuleCreation() {
- // Create an 'and' condition container and add conditions to it.
- $and = $this->expressionManager->createAnd()
- ->addCondition('rules_test_false')
- ->addCondition('rules_test_true', ContextConfig::create()->negateResult())
- ->negate();
-
- // Test that the 'and' condition container evaluates to TRUE.
- $this->assertTrue($and->execute());
-
- // Create an 'or' condition container and add conditions to it, including
- // the previously created 'and' condition container.
- $or = $this->expressionManager->createOr()
- ->addCondition('rules_test_true', ContextConfig::create()->negateResult())
- ->addCondition('rules_test_false')
- ->addExpressionObject($and);
-
- // Test that the 'or' condition container evaluates to TRUE.
- $this->assertTrue($or->execute());
-
- // Create a rule and add conditions to it, including the previously created
- // 'or' condition container.
- $rule = $this->expressionManager->createRule();
- $rule->addCondition('rules_test_true')
- ->addCondition('rules_test_true')
- ->addExpressionObject($or);
-
- // Test that the rule's condition container evaluates to TRUE.
- $this->assertTrue($rule->getConditions()->execute());
-
- // Add an action to it and execute the rule.
- $rule->addAction('rules_test_log');
- $rule->execute();
-
- // Test that the action logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Tests passing a string context to a condition.
- */
- public function testContextPassing() {
- $rule = $this->expressionManager->createRule();
-
- $rule->addCondition('rules_test_string_condition', ContextConfig::create()
- ->map('text', 'test')
- );
- $rule->addAction('rules_test_log');
-
- RulesComponent::create($rule)
- ->addContextDefinition('test', ContextDefinition::create('string'))
- ->setContextValue('test', 'test value')
- ->execute();
-
- // Test that the action logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Tests that a condition can provide a value and another one can consume it.
- */
- public function testProvidedVariables() {
- $rule = $this->expressionManager->createRule();
-
- // The first condition provides a "provided_text" variable.
- $rule->addCondition('rules_test_provider');
- // The second condition consumes the variable.
- $rule->addCondition('rules_test_string_condition', ContextConfig::create()
- ->map('text', 'provided_text')
- );
-
- $rule->addAction('rules_test_log');
-
- $component = RulesComponent::create($rule);
-
- $violations = $component->checkIntegrity();
- $this->assertEquals(0, iterator_count($violations));
-
- $component->execute();
- // Test that the action logged something.
- $this->assertRulesLogEntryExists('action called');
- }
-
- /**
- * Tests that provided variables can be renamed with configuration.
- */
- public function testRenamingOfProvidedVariables() {
- $rule = $this->expressionManager->createRule();
-
- // The condition provides a "provided_text" variable.
- $rule->addCondition('rules_test_provider', ContextConfig::create()
- ->provideAs('provided_text', 'newname')
- );
-
- $state = ExecutionState::create();
- $rule->executeWithState($state);
-
- // Check that the newly named variable exists and has the provided value.
- $variable = $state->getVariable('newname');
- $this->assertEqual($variable->getValue(), 'test value');
- }
-
- /**
- * Tests that multiple actions can consume and provide context variables.
- */
- public function testActionProvidedContext() {
- // @todo: Convert the test to make use of actions instead of conditions.
- $rule = $this->expressionManager->createRule();
-
- // The condition provides a "provided_text" variable.
- $rule->addCondition('rules_test_provider');
-
- // The action provides a "concatenated" variable.
- $rule->addAction('rules_test_string', ContextConfig::create()
- ->map('text', 'provided_text')
- );
-
- // Add the same action again which will provide a "concatenated2" variable
- // now.
- $rule->addAction('rules_test_string', ContextConfig::create()
- ->map('text', 'concatenated')
- ->provideAs('concatenated', 'concatenated2')
- );
-
- $state = ExecutionState::create();
- $rule->executeWithState($state);
-
- // Check that the created variables exists and have the provided values.
- $concatenated = $state->getVariable('concatenated');
- $this->assertEqual($concatenated->getValue(), 'test valuetest value');
- $concatenated2 = $state->getVariable('concatenated2');
- $this->assertEqual($concatenated2->getValue(), 'test valuetest valuetest valuetest value');
- }
-
- /**
- * Verifies swapping out core services works.
- */
- public function testSwappedCoreServices() {
- $condition_manager = $this->container->get('plugin.manager.condition');
- $this->assertTrue($condition_manager instanceof ConditionManager);
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesMailTest.php b/modules/rules/tests/src/Kernel/RulesMailTest.php
deleted file mode 100644
index 7452c9b..0000000
--- a/modules/rules/tests/src/Kernel/RulesMailTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-container->get('config.factory')->getEditable('system.mail')
- ->set('interface.default', 'test_mail_collector')
- ->save();
-
- // Reset the state variable that holds sent messages.
- $this->container->get('state')->set('system.test_mail_collector', []);
-
- $this->actionManager = $this->container->get('plugin.manager.rules_action');
- }
-
- /**
- * Checks the From: and Reply-to: headers.
- */
- public function testSubjectAndBody() {
- // Create action to send email.
- $action = $this->actionManager->createInstance('rules_send_email');
-
- // Add context values to action.
- $action->setContextValue('to', ['mail@example.com'])
- ->setContextValue('subject', 'subject')
- ->setContextValue('message', 'hello');
-
- // Send email.
- $action->execute();
-
- // Retrieve sent message.
- $captured_emails = $this->container->get('state')->get('system.test_mail_collector');
- $sent_message = end($captured_emails);
-
- // Check to make sure that our subject and body are as expected.
- $this->assertEquals($sent_message['to'], 'mail@example.com');
- $this->assertEquals($sent_message['subject'], 'subject');
- // Need to trim the email body to get rid of newline at end.
- $this->assertEquals(trim($sent_message['body']), 'hello');
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesUiEmbedTest.php b/modules/rules/tests/src/Kernel/RulesUiEmbedTest.php
deleted file mode 100644
index 738120c..0000000
--- a/modules/rules/tests/src/Kernel/RulesUiEmbedTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-rulesUiManager = $this->container->get('plugin.manager.rules_ui');
-
- $this->installConfig(['system']);
- $this->installConfig(['rules_test_ui_embed']);
- $this->installSchema('system', ['sequences']);
- }
-
- /**
- * @cover \Drupal\rules\Ui\RulesUiManager
- */
- public function testUiManager() {
- $definition = $this->rulesUiManager->getDefinitions();
- $this->assertTrue(isset($definition['rules_test_ui_embed.settings_conditions']));
- $this->assertInstanceOf(RulesUiDefinition::class, $definition['rules_test_ui_embed.settings_conditions']);
- $this->assertTrue(!empty($definition['rules_test_ui_embed.settings_conditions']->label));
- $this->assertEquals(RulesUiConfigHandler::class, $definition['rules_test_ui_embed.settings_conditions']->getClass());
- }
-
-}
diff --git a/modules/rules/tests/src/Kernel/TokenIntegrationTest.php b/modules/rules/tests/src/Kernel/TokenIntegrationTest.php
deleted file mode 100644
index e2db1b3..0000000
--- a/modules/rules/tests/src/Kernel/TokenIntegrationTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-expressionManager->createInstance('rules_action',
- ContextConfig::create()
- ->setValue('message', "The date is {{ date | format_date('custom', 'Y-m') }}!")
- ->setValue('type', 'status')
- ->process('message', 'rules_tokens')
- ->setConfigKey('action_id', 'rules_system_message')
- ->toArray()
- );
-
- $rule = $this->expressionManager->createRule();
- $rule->addExpressionObject($action);
- RulesComponent::create($rule)
- ->addContextDefinition('date', ContextDefinition::create('timestamp'))
- ->setContextValue('date', REQUEST_TIME)
- ->execute();
-
- $messages = drupal_set_message();
- /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
- $date_formatter = $this->container->get('date.formatter');
- $date = $date_formatter->format(REQUEST_TIME, 'custom', 'Y-m');
- $this->assertEquals("The date is $date!", (string) $messages['status'][0]);
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/ActionSetTest.php b/modules/rules/tests/src/Unit/ActionSetTest.php
deleted file mode 100644
index 3577491..0000000
--- a/modules/rules/tests/src/Unit/ActionSetTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-actionSet = new ActionSet([], '', [], $this->expressionManager->reveal());
- }
-
- /**
- * Tests that an action in the set fires.
- */
- public function testActionExecution() {
- // The method on the test action must be called once.
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $this->actionSet->addExpressionObject($this->testActionExpression->reveal())->execute();
- }
-
- /**
- * Tests that two actions in the set fire both.
- */
- public function testTwoActionExecution() {
- // The method on the test action must be called twice.
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $second_action = $this->prophesize(ActionExpressionInterface::class);
- $second_action->executeWithState(Argument::type(ExecutionStateInterface::class))
- ->shouldBeCalledTimes(1);
- $second_action->getUuid()->willReturn('uuid2');
-
- $this->actionSet->addExpressionObject($this->testActionExpression->reveal())
- ->addExpressionObject($second_action->reveal())
- ->execute();
- }
-
- /**
- * Tests that nested action sets work.
- */
- public function testNestedActionExecution() {
- // The method on the test action must be called twice.
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(2);
-
- $inner = new ActionSet([], '', [], $this->expressionManager->reveal());
- $inner->addExpressionObject($this->testActionExpression->reveal());
-
- $this->actionSet->addExpressionObject($this->testActionExpression->reveal())
- ->addExpressionObject($inner)
- ->execute();
- }
-
- /**
- * Tests that a nested action can be retrieved by UUID.
- */
- public function testLookupAction() {
- $this->actionSet->addExpressionObject($this->testActionExpression->reveal());
- $uuid = $this->testActionExpression->reveal()->getUuid();
- $lookup_action = $this->actionSet->getExpression($uuid);
- $this->assertSame($this->testActionExpression->reveal(), $lookup_action);
- $this->assertFalse($this->actionSet->getExpression('invalid UUID'));
- }
-
- /**
- * Tests deleting an action from the container.
- */
- public function testDeletingAction() {
- $this->actionSet->addExpressionObject($this->testActionExpression->reveal());
- $second_action = $this->prophesize(RulesAction::class);
- $this->actionSet->addExpressionObject($second_action->reveal());
-
- // Get the UUID of the first action added.
- $uuid = $this->testActionExpression->reveal()->getUuid();
- $this->assertTrue($this->actionSet->deleteExpression($uuid));
-
- // Now only the second action remains.
- foreach ($this->actionSet as $action) {
- $this->assertSame($second_action->reveal(), $action);
- }
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/ContextHandlerTraitTest.php b/modules/rules/tests/src/Unit/ContextHandlerTraitTest.php
deleted file mode 100644
index e1039b7..0000000
--- a/modules/rules/tests/src/Unit/ContextHandlerTraitTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-setExpectedException('\Drupal\rules\Exception\EvaluationException', 'Required context test is missing for plugin testplugin');
-
- // Set 'getContextValue' as mocked method.
- $trait = $this->getMockForTrait(ContextHandlerTrait::class, [], '', TRUE, TRUE, TRUE, ['getContextValue']);
- $context_definition = $this->prophesize(ContextDefinitionInterface::class);
-
- // Let the trait work with an empty configuration.
- $trait->configuration = ContextConfig::create()->toArray();
-
- // Make the context required in the definition.
- $context_definition->isRequired()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
- $plugin = $this->prophesize(ContextAwarePluginInterface::class);
- $plugin->getContextDefinitions()
- ->willReturn(['test' => $context_definition->reveal()])
- ->shouldBeCalled(1);
- $plugin->getContextValue('test')
- ->willReturn(NULL)
- ->shouldBeCalled(1);
- $plugin->getPluginId()->willReturn('testplugin')->shouldBeCalledTimes(1);
-
- $state = $this->prophesize(ExecutionStateInterface::class);
-
- // Make the 'mapContext' method visible.
- $reflection = new \ReflectionClass($trait);
- $method = $reflection->getMethod('prepareContext');
- $method->setAccessible(TRUE);
- $method->invokeArgs($trait, [$plugin->reveal(), $state->reveal()]);
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/BanIPTest.php b/modules/rules/tests/src/Unit/Integration/Action/BanIPTest.php
deleted file mode 100644
index 4a7dd68..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/BanIPTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-enableModule('ban');
- $this->banManager = $this->prophesize(BanIpManagerInterface::class);
- $this->container->set('ban.ip_manager', $this->banManager->reveal());
-
- $this->request = $this->prophesize(Request::class);
- $this->container->set('request', $this->request->reveal());
-
- $this->action = $this->actionManager->createInstance('rules_ban_ip');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Ban an IP address', $this->action->summary());
- }
-
- /**
- * Tests the action execution with Context IPv4.
- *
- * See http://en.wikipedia.org/wiki/Reserved_IP_addresses
- * See https://tools.ietf.org/html/rfc3330 : "192.0.2.0/24 - This block is
- * assigned as "TEST-NET" for use in documentation and example code. It is
- * often used in conjunction with domain names example.com or example.net in
- * vendor and protocol documentation. Addresses within this block should not
- * appear on the public Internet."
- *
- * @covers ::execute
- */
- public function testActionExecutionWithContextIpv4() {
- // TEST-NET-1 IPv4.
- $ipv4 = '192.0.2.0';
- $this->action->setContextValue('ip', $ipv4);
-
- $this->banManager->banIp($ipv4)->shouldBeCalledTimes(1);
-
- $this->action->execute();
-
- }
-
- /**
- * Tests the action execution with Context IPv6.
- *
- * See http://en.wikipedia.org/wiki/Reserved_IP_addresses
- * See https://tools.ietf.org/html/rfc3330 : "192.0.2.0/24 - This block is
- * assigned as "TEST-NET" for use in documentation and example code. It is
- * often used in conjunction with domain names example.com or example.net in
- * vendor and protocol documentation. Addresses within this block should not
- * appear on the public Internet."
- *
- * @covers ::execute
- */
- public function testActionExecutionWithContextIpv6() {
- // TEST-NET-1 IPv4 '192.0.2.0' converted to IPv6.
- $ipv6 = '2002:0:0:0:0:0:c000:200';
- $this->action->setContextValue('ip', $ipv6);
-
- $this->banManager->banIp($ipv6)->shouldBeCalledTimes(1);
-
- $this->action->execute();
-
- }
-
- /**
- * Tests the action execution without Context IP set.
- *
- * Should fallback to the current IP of the request.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithoutContextIp() {
- // TEST-NET-1 IPv4.
- $ip = '192.0.2.0';
-
- $this->request->getClientIp()->willReturn($ip)->shouldBeCalledTimes(1);
-
- $this->banManager->banIp($ip)->shouldBeCalledTimes(1);
-
- $this->action->execute();
-
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataCalculateValueTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataCalculateValueTest.php
deleted file mode 100644
index 4cb0001..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataCalculateValueTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-action = $this->actionManager->createInstance('rules_data_calculate_value');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Calculates a numeric value', $this->action->summary());
- }
-
- /**
- * Tests the addition of two numeric values.
- *
- * @covers ::execute
- */
- public function testAdditionAction() {
- $input_1 = mt_rand();
- $input_2 = mt_rand();
- $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
- ->setContextValue('operator', $this->getTypedData('string', '+'))
- ->setContextValue('input_2', $this->getTypedData('float', $input_2));
- $this->action->execute();
- $result = $this->action->getProvidedContext('result')->getContextValue();
- $this->assertEquals($input_1 + $input_2, $result, "Addition calculation correct");
- }
-
- /**
- * Tests the subtraction of one numeric value from another.
- *
- * @covers ::execute
- */
- public function testSubtractionAction() {
- $input_1 = mt_rand();
- $input_2 = mt_rand();
- $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
- ->setContextValue('operator', $this->getTypedData('string', '-'))
- ->setContextValue('input_2', $this->getTypedData('float', $input_2));
- $this->action->execute();
- $result = $this->action->getProvidedContext('result')->getContextValue();
- $this->assertEquals($input_1 - $input_2, $result, "Subtraction calculation correct");
- }
-
- /**
- * Tests the multiplication of one numeric by another.
- *
- * @covers ::execute
- */
- public function testMultiplicationAction() {
- $input_1 = mt_rand();
- $input_2 = mt_rand();
- $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
- ->setContextValue('operator', $this->getTypedData('string', '*'))
- ->setContextValue('input_2', $this->getTypedData('float', $input_2));
- $this->action->execute();
- $result = $this->action->getProvidedContext('result')->getContextValue();
- $this->assertEquals($input_1 * $input_2, $result, "Subtraction calculation correct");
- }
-
- /**
- * Tests the division of one numeric by another.
- *
- * @covers ::execute
- */
- public function testDivisionAction() {
- $input_1 = mt_rand();
- $input_2 = mt_rand();
- $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
- ->setContextValue('operator', $this->getTypedData('string', '/'))
- ->setContextValue('input_2', $this->getTypedData('float', $input_2));
- $this->action->execute();
- $result = $this->action->getProvidedContext('result')->getContextValue();
- $this->assertEquals($input_1 / $input_2, $result, "Subtraction calculation correct");
- }
-
- /**
- * Tests the use of min operator for 2 input values.
- *
- * @covers ::execute
- */
- public function testMinimumAction() {
- $input_1 = mt_rand();
- $input_2 = mt_rand();
- $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
- ->setContextValue('operator', $this->getTypedData('string', 'min'))
- ->setContextValue('input_2', $this->getTypedData('float', $input_2));
- $this->action->execute();
- $result = $this->action->getProvidedContext('result')->getContextValue();
- $this->assertEquals(min($input_1, $input_2), $result, "Min calculation correct");
- }
-
- /**
- * Tests the use of max operator for 2 input values.
- *
- * @covers ::execute
- */
- public function testMaximumAction() {
- $input_1 = mt_rand();
- $input_2 = mt_rand();
- $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
- ->setContextValue('operator', $this->getTypedData('string', 'max'))
- ->setContextValue('input_2', $this->getTypedData('float', $input_2));
- $this->action->execute();
- $result = $this->action->getProvidedContext('result')->getContextValue();
- $this->assertEquals(max($input_1, $input_2), $result, "Max calculation correct");
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataConvertTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataConvertTest.php
deleted file mode 100644
index 7d4bc61..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataConvertTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-executeAction($value, 'integer');
- $this->assertInternalType('integer', $converted);
-
- // Test the conversion to integer and floor down.
- $converted = $this->executeAction($value, 'integer', 'down');
- $this->assertInternalType('integer', $converted);
- $this->assertEquals(1, $converted);
-
- // Test the conversion to integer and ceil up.
- $converted = $this->executeAction($value, 'integer', 'up');
- $this->assertInternalType('integer', $converted);
- $this->assertEquals(2, $converted);
-
- // Test the conversion to integer and round.
- $converted = $this->executeAction($value, 'integer', 'round');
- $this->assertInternalType('integer', $converted);
- $this->assertEquals(2, $converted);
-
- $converted = $this->executeAction('+123', 'integer');
- $this->assertInternalType('integer', $converted);
- $this->assertEquals(123, $converted);
- }
-
- /**
- * Test the conversion to float.
- *
- * @covers ::execute
- */
- public function testConvertToFloat() {
- $value = '1.5';
-
- $converted = $this->executeAction($value, 'float');
- $this->assertInternalType('float', $converted);
- $this->assertEquals(1.5, $converted);
-
- $converted = $this->executeAction('+1.5', 'float');
- $this->assertInternalType('float', $converted);
- $this->assertEquals(1.5, $converted);
- }
-
- /**
- * Test the conversion to text.
- *
- * @covers ::execute
- */
- public function testConvertToString() {
- // Test the conversion to test/string.
- $value = 1.5;
-
- $converted = $this->executeAction($value, 'string');
- $this->assertInternalType('string', $converted);
- $this->assertEquals('1.5', $converted);
- }
-
- /**
- * Test the behavior if nonsense context values is set.
- *
- * @covers ::execute
- */
- public function testInvalidValueException() {
- // Set the expected exception class and message.
- $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Only scalar values are supported.');
-
- $this->executeAction(['some-array'], 'integer');
- }
-
- /**
- * Test the behavior if rounding behavior is used with non integers.
- *
- * @covers ::execute
- */
- public function testInvalidRoundingBehavior() {
- // Set the expected exception class and message.
- $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'A rounding behavior only makes sense with an integer target type.');
-
- $converted = $this->executeAction('some', 'decimal', 'down');
- $this->assertInternalType('float', $converted);
- }
-
- /**
- * Test the behavior if nonsense rounding_behaviors is set.
- *
- * @covers ::execute
- */
- public function testInvalidRoundingBehaviorException() {
- // Set the expected exception class and message.
- $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Unknown rounding behavior: invalid rounding');
-
- $value = 5.5;
- $rounding_behavior = 'invalid rounding';
- $this->executeAction($value, 'integer', $rounding_behavior);
- }
-
- /**
- * Test the behavior if nonsense target_type is set.
- *
- * @covers ::execute
- */
- public function testInvalidTargetTypeException() {
- // Set the expected exception class and message.
- $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Unknown target type: invalid type');
- $value = 5.5;
- $target_type = 'invalid type';
- $this->executeAction($value, $target_type);
- }
-
- /**
- * Shortcut method to execute the convert action and to avoid duplicate code.
- *
- * @param mixed $value
- * The value to be converted.
- * @param string $target_type
- * The target type $value should be converted to.
- * @param null|string $rounding_behavior
- * Definition for the rounding direction.
- *
- * @return mixed
- * The raw conversion result as a scalar value.
- */
- protected function executeAction($value, $target_type, $rounding_behavior = NULL) {
-
- $action = $this->actionManager->createInstance('rules_data_convert');
-
- $action->setContextValue('value', $value);
- $action->setContextValue('target_type', $target_type);
-
- if (!empty($rounding_behavior)) {
- $action->setContextValue('rounding_behavior', $rounding_behavior);
- }
-
- $action->execute();
- $result = $action->getProvidedContext('conversion_result');
- return $result->getContextValue();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataListItemAddTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataListItemAddTest.php
deleted file mode 100644
index 429f95b..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataListItemAddTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-action = $this->actionManager->createInstance('rules_list_item_add');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Add list item', $this->action->summary());
- }
-
- /**
- * Tests the action execution with default values.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithDefaults() {
- // Test adding a value at the end (default position).
- $list = ['One', 'Two', 'Three'];
-
- $this->action
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Four');
-
- $this->action->execute();
-
- // The list should contain four items, with the new item at the end.
- $this->assertArrayEquals([
- 'One',
- 'Two',
- 'Three',
- 'Four',
- ], $this->action->getContextValue('list'));
- }
-
- /**
- * Tests the action execution - item append.
- *
- * @covers ::execute
- */
- public function testActionExecutionItemAppend() {
- // Test adding a value at the end.
- $list = ['One', 'Two', 'Three'];
-
- $this->action
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Four')
- ->setContextValue('pos', 'end');
-
- $this->action->execute();
-
- // The list should contain four items, with the new item added at the end.
- $this->assertArrayEquals([
- 'One',
- 'Two',
- 'Three',
- 'Four',
- ], $this->action->getContextValue('list'));
- }
-
- /**
- * Tests the action execution - item prepend.
- *
- * @covers ::execute
- */
- public function testActionExecutionItemPrepend() {
- // Test adding a value at the start.
- $list = ['One', 'Two', 'Three'];
-
- $this->action
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Zero')
- ->setContextValue('pos', 'start');
-
- $this->action->execute();
-
- // The list should contain four items, with the new item added at the start.
- $this->assertArrayEquals([
- 'Zero',
- 'One',
- 'Two',
- 'Three',
- ], $this->action->getContextValue('list'));
- }
-
- /**
- * Tests the action execution - enforce unique items.
- *
- * @covers ::execute
- */
- public function testActionExecutionEnforceUnique() {
- // Test unique.
- $list = ['One', 'Two', 'Three', 'Four'];
-
- $this->action
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Four')
- ->setContextValue('unique', TRUE);
-
- $this->action->execute();
-
- // The list should remain the same.
- $this->assertArrayEquals([
- 'One',
- 'Two',
- 'Three',
- 'Four',
- ], $this->action->getContextValue('list'));
- }
-
- /**
- * Tests the action execution - add non-unique items.
- *
- * @covers ::execute
- */
- public function testActionExecutionNonUnique() {
- // Test non-unique.
- $list = ['One', 'Two', 'Three', 'Four'];
-
- $this->action
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Four')
- ->setContextValue('unique', FALSE)
- ->setContextValue('pos', 'end');
-
- $this->action->execute();
-
- // The list should contain five items, with the new item added at the end.
- $this->assertArrayEquals(['One', 'Two', 'Three', 'Four', 'Four'], $this->action->getContextValue('list'));
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataListItemRemoveTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataListItemRemoveTest.php
deleted file mode 100644
index b6f79e3..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataListItemRemoveTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-action = $this->actionManager->createInstance('rules_list_item_remove');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Remove item from list', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- $list = ['One', 'Two', 'Three'];
-
- $this->action
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Two');
-
- $this->action->execute();
-
- // The second item should be removed from the list.
- $this->assertArrayEquals(['One', 'Three'], array_values($this->action->getContextValue('list')));
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataSetTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataSetTest.php
deleted file mode 100644
index 7cf10a2..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataSetTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-action = $this->actionManager->createInstance('rules_data_set');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Set a data value', $this->action->summary());
- }
-
- /**
- * Tests that primitive values can be set.
- *
- * @covers ::execute
- */
- public function testPrimitiveValues() {
- $this->action->setContextValue('data', 'original')
- ->setContextValue('value', 'replacement');
- $this->action->execute();
-
- $this->assertSame('replacement', $this->action->getContextValue('data'));
- $this->assertSame([], $this->action->autoSaveContext());
- }
-
- /**
- * Tests that a variable can be set to NULL.
- */
- public function testSetToNull() {
- // We don't need to set the 'value' context, it is NULL by default.
- $this->action->setContextValue('data', 'original');
- $this->action->execute();
-
- $this->assertNull($this->action->getContextValue('data'));
- $this->assertSame([], $this->action->autoSaveContext());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityCreateTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityCreateTest.php
deleted file mode 100644
index eec6522..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityCreateTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-prophesize(BaseFieldDefinition::class);
- $bundle_field_definition_optional = $this->prophesize(BaseFieldDefinition::class);
- $bundle_field_definition_required = $this->prophesize(BaseFieldDefinition::class);
-
- $property_definition = $this->prophesize(DataDefinitionInterface::class);
- $property_definition->getDataType()->willReturn('string');
-
- $item_definition = $this->prophesize(FieldItemDataDefinition::class);
- $item_definition->getPropertyDefinition(Argument::any())
- ->willReturn($property_definition->reveal());
- $item_definition->getMainPropertyName()->willReturn('value');
-
- // The next methods are mocked because EntityCreateDeriver executes them,
- // and the mocked field definition is instantiated without the necessary
- // information.
- $bundle_field_definition->getItemDefinition()
- ->willReturn($item_definition->reveal());
- $bundle_field_definition->getCardinality()->willReturn(1)
- ->shouldBeCalledTimes(1);
- $bundle_field_definition->getType()->willReturn('string');
- $bundle_field_definition->getLabel()->willReturn('Bundle')
- ->shouldBeCalledTimes(1);
- $bundle_field_definition->getDescription()
- ->willReturn('Bundle mock description')
- ->shouldBeCalledTimes(1);
-
- $bundle_field_definition_required->getItemDefinition()
- ->willReturn($item_definition->reveal());
- $bundle_field_definition_required->getCardinality()->willReturn(1)
- ->shouldBeCalledTimes(1);
- $bundle_field_definition_required->getType()->willReturn('string');
- $bundle_field_definition_required->getLabel()->willReturn('Required field')
- ->shouldBeCalledTimes(1);
- $bundle_field_definition_required->getDescription()
- ->willReturn('Required field mock description')
- ->shouldBeCalledTimes(1);
- $bundle_field_definition_required->isRequired()
- ->willReturn(TRUE)
- ->shouldBeCalledTimes(1);
-
- $bundle_field_definition_optional->isRequired()
- ->willReturn(FALSE)
- ->shouldBeCalledTimes(1);
-
- // Prepare mocked entity storage.
- $entity_type_storage = $this->prophesize(EntityStorageBase::class);
- $entity_type_storage->create(['bundle' => 'test', 'field_required' => NULL])
- ->willReturn(self::ENTITY_REPLACEMENT);
-
- // Return the mocked storage controller.
- $this->entityTypeManager->getStorage('test')
- ->willReturn($entity_type_storage->reveal());
-
- // Return a mocked list of base fields definitions.
- $this->entityFieldManager->getBaseFieldDefinitions('test')
- ->willReturn([
- 'bundle' => $bundle_field_definition->reveal(),
- 'field_required' => $bundle_field_definition_required->reveal(),
- 'field_optional' => $bundle_field_definition_optional->reveal(),
- ]);
-
- // Instantiate the action we are testing.
- $this->action = $this->actionManager->createInstance('rules_entity_create:test');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Create a new test', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- $this->action->setContextValue('bundle', 'test');
- $this->action->execute();
- $entity = $this->action->getProvidedContext('entity')->getContextValue();
- $this->assertEquals(self::ENTITY_REPLACEMENT, $entity);
- }
-
- /**
- * Tests context definitions for the bundle and required fields.
- *
- * @covers \Drupal\rules\Plugin\RulesAction\EntityCreateDeriver::getDerivativeDefinitions
- */
- public function testRequiredContexts() {
- $context_definitions = $this->action->getContextDefinitions();
- $this->assertCount(2, $context_definitions);
-
- $this->assertArrayHasKey('bundle', $context_definitions);
- $this->assertEquals(ContextDefinition::ASSIGNMENT_RESTRICTION_INPUT, $context_definitions['bundle']->getAssignmentRestriction());
- $this->assertTrue($context_definitions['bundle']->isRequired());
-
- $this->assertArrayHasKey('field_required', $context_definitions);
- $this->assertNull($context_definitions['field_required']->getAssignmentRestriction());
- $this->assertFalse($context_definitions['field_required']->isRequired());
- }
-
- /**
- * Tests the context refining.
- *
- * @covers ::refineContextDefinitions
- */
- public function testRefiningContextDefinitions() {
- $this->action->setContextValue('bundle', 'bundle_test');
- $this->action->refineContextDefinitions([]);
- $this->assertEquals(
- $this->action->getProvidedContextDefinition('entity')
- ->getDataType(), 'entity:test:bundle_test'
- );
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityDeleteTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityDeleteTest.php
deleted file mode 100644
index c59f0c1..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityDeleteTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-action = $this->actionManager->createInstance('rules_entity_delete');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Delete entity', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- $entity = $this->prophesizeEntity(EntityInterface::class);
- $entity->delete()->shouldBeCalledTimes(1);
-
- $this->action->setContextValue('entity', $entity->reveal());
- $this->action->execute();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByFieldTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByFieldTest.php
deleted file mode 100644
index c994926..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByFieldTest.php
+++ /dev/null
@@ -1,177 +0,0 @@
-action = $this->actionManager->createInstance('rules_entity_fetch_by_field');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Fetch entities by field', $this->action->summary());
- }
-
- /**
- * Tests action execution when no value for limit is provided.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithNoLimit() {
- // Create variables for action context values.
- $entity_type = 'entity_test';
- $field_name = 'test_field';
- $field_value = 'llama';
-
- // Create an array of dummy entities.
- $entities = [];
- for ($i = 0; $i < 2; $i++) {
- $entity = $this->prophesize(EntityInterface::class);
- $entities[] = $entity->reveal();
- }
-
- // Create dummy entity storage object.
- $entity_storage = $this->prophesize(EntityStorageInterface::class);
- $entity_storage->loadByProperties([$field_name => $field_value])
- ->willReturn($entities);
- $this->entityTypeManager->getStorage($entity_type)
- ->willReturn($entity_storage->reveal());
-
- // Set context values for EntityFetchByField action and execute.
- $this->action->setContextValue('type', $entity_type)
- ->setContextValue('field_name', $field_name)
- ->setContextValue('field_value', $field_value)
- ->execute();
-
- // Test that executing action without a value for limit returns the dummy
- // entities array.
- $this->assertEquals($entities, $this->action->getProvidedContext('entity_fetched')->getContextValue('entity_fetched'));
- }
-
- /**
- * Tests action execution when a value for limit is provided.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithLimit() {
- $entity_type = 'entity_test';
- $field_name = 'test_field';
- $field_value = 'llama';
- $limit = 2;
-
- // Create an array of dummy entities.
- $entities = array_map(function () {
- return $this->prophesize(EntityInterface::class)->reveal();
- }, range(1, $limit));
-
- // Creates entity ids for new dummy array of entities.
- $entity_ids = range(1, $limit);
-
- // Create dummy query object.
- $query = $this->prophesize(QueryInterface::class);
- $query->condition($field_name, $field_value, '=')
- ->willReturn($query->reveal())
- ->shouldBeCalledTimes(1);
- $query->range(0, $limit)
- ->willReturn($query->reveal())
- ->shouldBeCalledTimes(1);
- $query->execute()
- ->willReturn($entity_ids)
- ->shouldBeCalledTimes(1);
-
- // Create dummy entity storage object.
- $entity_storage = $this->prophesize(EntityStorageInterface::class);
- $entity_storage->loadMultiple($entity_ids)
- ->willReturn($entities)
- ->shouldBeCalledTimes(1);
- $entity_storage->getQuery()
- ->willReturn($query)
- ->shouldBeCalledTimes(1);
- $this->entityTypeManager->getStorage($entity_type)
- ->willReturn($entity_storage->reveal())
- ->shouldBeCalledTimes(1);
-
- // Set context values for EntityFetchByField action and execute.
- $this->action->setContextValue('type', $entity_type)
- ->setContextValue('field_name', $field_name)
- ->setContextValue('field_value', $field_value)
- ->setContextValue('limit', $limit)
- ->execute();
-
- // Test that executing action with a value for limit returns the dummy
- // entities array.
- $this->assertEquals($entities, $this->action->getProvidedContext('entity_fetched')->getContextValue('entity_fetched'));
- }
-
- /**
- * Tests that the action execution loads the entity from storage.
- *
- * @covers ::execute
- */
- public function testActionExecutionProvidedContextEntityType() {
- // Create variables for action context values.
- $entity_type = 'entity_test';
- $field_name = 'test_field';
- $field_value = 'llama';
-
- // Create an array of dummy entities.
- $entities = [];
- for ($i = 0; $i < 2; $i++) {
- $entity = $this->prophesize(EntityInterface::class)->reveal();
- $entities[] = $entity;
- }
-
- // Create dummy entity storage object.
- $entity_storage = $this->prophesize(EntityStorageInterface::class);
- $entity_storage->loadByProperties([$field_name => $field_value])
- ->willReturn($entities);
- $this->entityTypeManager->getStorage($entity_type)
- ->willReturn($entity_storage->reveal())
- ->shouldBeCalledTimes(1);
-
- // Set context values for EntityFetchByField action and execute.
- $this->action->setContextValue('type', $entity_type)
- ->setContextValue('field_name', $field_name)
- ->setContextValue('field_value', $field_value)
- ->execute();
- }
-
- /**
- * @covers ::refineContextDefinitions
- */
- public function testRefiningContextDefinitions() {
- $this->action->setContextValue('type', 'entity_test');
- $this->action->refineContextDefinitions([]);
- $this->assertEquals(
- $this->action->getProvidedContextDefinition('entity_fetched')
- ->getDataType(), 'entity:entity_test'
- );
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByIdTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByIdTest.php
deleted file mode 100644
index daf222d..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByIdTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-action = $this->actionManager->createInstance('rules_entity_fetch_by_id');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Fetch entity by id', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- $entity_type = 'entity_test';
-
- // Prepare entity storage to return dummy entity on the 'load' execution.
- $entity = $this->prophesize(EntityInterface::class);
- $entity_storage = $this->prophesize(EntityStorageInterface::class);
- $entity_storage->load(1)->willReturn($entity->reveal())
- ->shouldBeCalledTimes(1);
- $this->entityTypeManager->getStorage($entity_type)
- ->willReturn($entity_storage->reveal())
- ->shouldBeCalledTimes(1);
-
- // Set context values for EntityFetchByField action and execute.
- $this->action
- ->setContextValue('type', $entity_type)
- ->setContextValue('entity_id', 1)
- ->execute();
- // Test that entity load with type 'test' and id '1' should return the
- // dummy entity.
- $this->assertEquals($entity->reveal(), $this->action->getProvidedContext('entity_fetched')->getContextValue('entity_fetched'), 'Action returns the loaded entity for fetching entity by id.');
- }
-
- /**
- * @covers ::refineContextDefinitions
- */
- public function testRefiningContextDefinitions() {
- $this->action->setContextValue('type', 'entity_test');
- $this->action->refineContextDefinitions([]);
- $this->assertEquals(
- $this->action->getProvidedContextDefinition('entity_fetched')
- ->getDataType(), 'entity:entity_test'
- );
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityPathAliasCreateTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityPathAliasCreateTest.php
deleted file mode 100644
index c37d143..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityPathAliasCreateTest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-aliasStorage = $this->prophesize(AliasStorageInterface::class);
-
- $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
- // Instantiate the action we are testing.
- $this->action = $this->actionManager->createInstance('rules_entity_path_alias_create:entity:test');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Create test path alias', $this->action->summary());
- }
-
- /**
- * Tests the action execution with an unsaved entity.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithUnsavedEntity() {
- // Test that the alias is only saved once.
- $this->aliasStorage->save('test/1', 'about', 'en')->shouldBeCalledTimes(1);
-
- $entity = $this->getMockEntity();
- $entity->isNew()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
- // Test that new entities are saved first.
- $entity->save()->shouldBeCalledTimes(1);
-
- $this->action->setContextValue('entity', $entity->reveal())
- ->setContextValue('alias', 'about');
-
- $this->action->execute();
- }
-
- /**
- * Tests the action execution with a saved entity.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithSavedEntity() {
- // Test that the alias is only saved once.
- $this->aliasStorage->save('test/1', 'about', 'en')->shouldBeCalledTimes(1);
-
- $entity = $this->getMockEntity();
- $entity->isNew()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
- // Test that existing entities are not saved again.
- $entity->save()->shouldNotBeCalled();
-
- $this->action->setContextValue('entity', $entity->reveal())
- ->setContextValue('alias', 'about');
-
- $this->action->execute();
- }
-
- /**
- * Creates a mock entity.
- *
- * @return \Drupal\Core\Entity\EntityInterface|\Prophecy\Prophecy\ProphecyInterface
- * The mocked entity object.
- */
- protected function getMockEntity() {
- $language = $this->languageManager->reveal()->getCurrentLanguage();
-
- $entity = $this->prophesizeEntity(EntityInterface::class);
- $entity->language()->willReturn($language)->shouldBeCalledTimes(1);
-
- $url = $this->prophesize(Url::class);
- $url->getInternalPath()->willReturn('test/1')->shouldBeCalledTimes(1);
-
- $entity->urlInfo(Argument::any())->willReturn($url->reveal())
- ->shouldBeCalledTimes(1);
-
- return $entity;
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntitySaveTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntitySaveTest.php
deleted file mode 100644
index 12e6a06..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntitySaveTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-entity = $this->prophesizeEntity(EntityInterface::class);
-
- $this->action = $this->actionManager->createInstance('rules_entity_save');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Save entity', $this->action->summary());
- }
-
- /**
- * Tests the action execution when saving immediately.
- *
- * @covers ::execute
- */
- public function testActionExecutionImmediately() {
- $this->entity->save()->shouldBeCalledTimes(1);
-
- $this->action->setContextValue('entity', $this->entity->reveal())
- ->setContextValue('immediate', TRUE);
-
- $this->action->execute();
- $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the entity has been saved already.');
- }
-
- /**
- * Tests the action execution when saving is postponed.
- *
- * @covers ::execute
- */
- public function testActionExecutionPostponed() {
- $this->entity->save()->shouldNotBeCalled();
-
- $this->action->setContextValue('entity', $this->entity->reveal());
- $this->action->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), ['entity'], 'Action returns the entity context name for auto saving.');
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/PathAliasCreateTest.php b/modules/rules/tests/src/Unit/Integration/Action/PathAliasCreateTest.php
deleted file mode 100644
index 0d50a99..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/PathAliasCreateTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-aliasStorage = $this->prophesize(AliasStorageInterface::class);
- $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
- $this->action = $this->actionManager->createInstance('rules_path_alias_create');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Create any path alias', $this->action->summary());
- }
-
- /**
- * Tests the action execution when no language is specified.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithoutLanguage() {
- $this->aliasStorage->save('node/1', 'about', LanguageInterface::LANGCODE_NOT_SPECIFIED)
- ->shouldBeCalledTimes(1);
-
- $this->action->setContextValue('source', 'node/1')
- ->setContextValue('alias', 'about');
-
- $this->action->execute();
- }
-
- /**
- * Tests the action execution when a language is specified.
- *
- * @covers ::execute
- */
- public function testActionExecutionWithLanguage() {
- $language = $this->prophesize(LanguageInterface::class);
- $language->getId()->willReturn('en');
-
- $this->aliasStorage->save('node/1', 'about', 'en')
- ->shouldBeCalledTimes(1);
-
- $this->action->setContextValue('source', 'node/1')
- ->setContextValue('alias', 'about')
- ->setContextValue('language', $language->reveal());
-
- $this->action->execute();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByAliasTest.php b/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByAliasTest.php
deleted file mode 100644
index 1215c3e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByAliasTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-aliasStorage = $this->prophesize(AliasStorageInterface::class);
- $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
- $this->action = $this->actionManager->createInstance('rules_path_alias_delete_by_alias');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Delete path alias', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- $alias = 'about/team';
-
- $this->aliasStorage->delete(['alias' => $alias])->shouldBeCalledTimes(1);
-
- $this->action->setContextValue('alias', $alias);
-
- $this->action->execute();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByPathTest.php b/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByPathTest.php
deleted file mode 100644
index be8e35f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByPathTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-aliasStorage = $this->prophesize(AliasStorageInterface::class);
-
- $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
- $this->action = $this->actionManager->createInstance('rules_path_alias_delete_by_path');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Delete all aliases for a path', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
-
- $path = 'node/1';
-
- $this->aliasStorage->delete(['path' => $path])->shouldBeCalledTimes(1);
-
- $this->action
- ->setContextValue('path', $path);
-
- $this->action->execute();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/RulesActionAccessTest.php b/modules/rules/tests/src/Unit/Integration/Action/RulesActionAccessTest.php
deleted file mode 100644
index 0e7c867..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/RulesActionAccessTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-actionManager->createInstance('rules_test_string');
- $definition = $plugin->getPluginDefinition();
- $this->assertNotEmpty($definition['configure_permissions'], "Plugin has configuration permission info.");
- $perms = $definition['configure_permissions'];
- $this->assertTrue(is_array($perms), "configure_permissions is an array");
- $this->assertContains("access test configuration", $perms, "Expected permission found in configure_permissions.");
-
- // Now see if the permission is actually used.
- $user_with_perm = $this->prophesize(AccountInterface::class);
- $user_with_perm
- ->hasPermission("access test configuration")
- ->willReturn(TRUE)
- ->shouldBeCalledTimes(2);
- $user_with_perm
- ->hasPermission(Argument::type('string'))
- ->willReturn(FALSE);
-
- $this->container->set('current_user', $user_with_perm->reveal());
- $this->assertTrue($plugin->checkConfigurationAccess(), "User with permission has configuration access.");
-
- $object_result = $plugin->checkConfigurationAccess($user_with_perm->reveal(), TRUE);
- $this->assertTrue($object_result->isAllowed(), "AccessResult in allowed state if an object is requested.");
-
- $user_without_perm = $this->prophesize(AccountInterface::class);
- $user_without_perm
- ->hasPermission("access test configuration")
- ->willReturn(FALSE)
- ->shouldBeCalledTimes(2);
- $user_without_perm
- ->hasPermission(Argument::type('string'))
- ->willReturn(FALSE);
-
- $this->assertFalse($plugin->checkConfigurationAccess($user_without_perm->reveal()),
- "User without permission does not have configuration access.");
- $object_result = $plugin->checkConfigurationAccess($user_without_perm->reveal(), TRUE);
- $this->assertTrue($object_result->isNeutral(), "an AccessResultNeutral object is returned on not allowed if an object is requested.");
-
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/RulesComponentActionTest.php b/modules/rules/tests/src/Unit/Integration/Action/RulesComponentActionTest.php
deleted file mode 100644
index 386b578..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/RulesComponentActionTest.php
+++ /dev/null
@@ -1,193 +0,0 @@
-rulesExpressionManager->createRule();
-
- $rules_config = new RulesComponentConfig([
- 'id' => 'test_rule',
- 'label' => 'Test rule',
- ], 'rules_component');
- $rules_config->setExpression($rule);
-
- $this->prophesizeStorage([$rules_config]);
-
- $definition = $this->actionManager->getDefinition('rules_component:test_rule');
- $this->assertEquals('Components', $definition['category']);
- $this->assertEquals('Rule: Test rule', (string) $definition['label']);
- }
-
- /**
- * Tests that the execution of the action invokes the Rules component.
- */
- public function testExecute() {
- // Set up a rules component that will just save an entity.
- $nested_rule = $this->rulesExpressionManager->createRule();
- $nested_rule->addAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'entity')
- );
-
- $rules_config = new RulesComponentConfig([
- 'id' => 'test_rule',
- 'label' => 'Test rule',
- ], 'rules_component');
- $rules_config->setExpression($nested_rule);
- $rules_config->setContextDefinitions(['entity' => ContextDefinition::create('entity')]);
-
- $this->prophesizeStorage([$rules_config]);
-
- // Invoke the rules component in another rule.
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_component:test_rule', ContextConfig::create()
- ->map('entity', 'entity')
- );
-
- // The call to save the entity means that the action was executed.
- $entity = $this->prophesizeEntity(EntityInterface::class);
- $entity->save()->shouldBeCalledTimes(1);
-
- RulesComponent::create($rule)
- ->addContextDefinition('entity', ContextDefinition::create('entity'))
- ->setContextValue('entity', $entity->reveal())
- ->execute();
- }
-
- /**
- * Tests that context definitions are available on the derived action.
- */
- public function testContextDefinitions() {
- $rule = $this->rulesExpressionManager->createRule();
- $rule
- ->addAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'entity')
- )
- ->addAction('rules_test_string', ContextConfig::create()
- ->setValue('text', 'x')
- );
-
- $rules_config = new RulesComponentConfig([
- 'id' => 'test_rule',
- 'label' => 'Test rule',
- ], 'rules_component');
- $rules_config->setExpression($rule);
-
- $context_definitions = ['entity' => ContextDefinition::create('entity')];
- $rules_config->setContextDefinitions($context_definitions);
- $provided_definitions = ['concatenated' => ContextDefinition::create('string')];
- $rules_config->setProvidedContextDefinitions($provided_definitions);
-
- $this->prophesizeStorage([$rules_config]);
-
- $definition = $this->actionManager->getDefinition('rules_component:test_rule');
- $this->assertEquals($context_definitions, $definition['context']);
- $this->assertEquals($provided_definitions, $definition['provides']);
- }
-
- /**
- * Tests that a rules component in an action can also provide variables.
- */
- public function testExecutionProvidedVariables() {
- // Create a rule that produces a provided string variable.
- $nested_rule = $this->rulesExpressionManager->createRule();
- $nested_rule->addAction('rules_test_string', ContextConfig::create()
- ->setValue('text', 'x')
- );
-
- $rules_config = new RulesComponentConfig([
- 'id' => 'test_rule',
- 'label' => 'Test rule',
- ], 'rules_component');
- $rules_config->setExpression($nested_rule);
- $rules_config->setProvidedContextDefinitions(['concatenated' => ContextDefinition::create('string')]);
-
- $this->prophesizeStorage([$rules_config]);
-
- // Invoke the rules component in another rule.
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_component:test_rule');
-
- $result = RulesComponent::create($rule)
- ->provideContext('concatenated')
- ->execute();
-
- $this->assertEquals('xx', $result['concatenated']);
- }
-
- /**
- * Tests that auto saving is only triggered once with nested components.
- */
- public function testAutosaveOnlyOnce() {
- $entity = $this->prophesizeEntity(EntityInterface::class);
-
- $nested_rule = $this->rulesExpressionManager->createRule();
- $nested_rule->addAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'entity')
- );
-
- $rules_config = new RulesComponentConfig([
- 'id' => 'test_rule',
- 'label' => 'Test rule',
- ], 'rules_component');
- $rules_config->setExpression($nested_rule);
- $rules_config->setContextDefinitions(['entity' => ContextDefinition::create('entity')]);
-
- $this->prophesizeStorage([$rules_config]);
-
- // Create a rule with a nested rule. Overall there are 2 actions to set the
- // entity then.
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_component:test_rule', ContextConfig::create()
- ->map('entity', 'entity')
- );
- $rule->addAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'entity')
- );
-
- // Auto-saving should only be triggered once on the entity.
- $entity->save()->shouldBeCalledTimes(1);
-
- RulesComponent::create($rule)
- ->addContextDefinition('entity', ContextDefinition::create('entity'))
- ->setContextValue('entity', $entity->reveal())
- ->execute();
- }
-
- /**
- * Prepares a mocked entity storage that returns the provided Rules configs.
- *
- * @param \Drupal\rules\Engine\RulesComponentConfig[] $rules_configs
- * The Rules componentn config entities that should be returned.
- */
- protected function prophesizeStorage(array $rules_configs) {
- $storage = $this->prophesize(ConfigEntityStorageInterface::class);
- $keyed_configs = [];
-
- foreach ($rules_configs as $rules_config) {
- $keyed_configs[$rules_config->id()] = $rules_config;
- $storage->load($rules_config->id())->willReturn($rules_config);
- }
-
- $storage->loadMultiple(NULL)->willReturn($keyed_configs);
- $this->entityTypeManager->getStorage('rules_component')->willReturn($storage->reveal());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SendAccountEmailTest.php b/modules/rules/tests/src/Unit/Integration/Action/SendAccountEmailTest.php
deleted file mode 100644
index d9a24ef..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SendAccountEmailTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-enableModule('user');
- $this->action = $this->actionManager->createInstance('rules_send_account_email');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Send account e-mail', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- $account = $this->prophesizeEntity(UserInterface::class);
- $mail_type = 'test_mail_type';
- $this->action->setContextValue('user', $account->reveal())
- ->setContextValue('email_type', $mail_type);
-
- $this->action->execute();
-
- // To ge the notifications that were sent, we call the _user_mail_notify()
- // with no parameters.
- $notifications = _user_mail_notify();
- $this->assertSame([$mail_type => 1], $notifications);
- }
-
- }
-
-}
-
-namespace {
-
- /*
- * We fake the _user_mail_notify() when using unit tests and we adapt it so
- * that we can get how many times the function was called with a specific $op.
- */
- if (!function_exists('_user_mail_notify')) {
-
- /**
- * Dummy replacement for testing.
- */
- function _user_mail_notify($op = NULL, $account = NULL, $langcode = NULL) {
- static $notifications_sent;
- if (!empty($op)) {
- if (!isset($notifications_sent[$op])) {
- $notifications_sent[$op] = 0;
- }
- $notifications_sent[$op]++;
- }
- return $notifications_sent;
- }
-
- }
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SystemMessageTest.php b/modules/rules/tests/src/Unit/Integration/Action/SystemMessageTest.php
deleted file mode 100644
index 37a41c6..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SystemMessageTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-action = $this->actionManager->createInstance('rules_system_message');
-
- // Clear the statically stored messages before every test run.
- $this->clearMessages();
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Show a message on the site', $this->action->summary());
- }
-
- /**
- * Tests the action execution.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- $this->action->setContextValue('message', 'test message')
- ->setContextValue('type', 'status')
- ->setContextValue('repeat', FALSE);
-
- // Execute the action multiple times. The message should still only
- // be stored once (repeat is set to FALSE).
- $this->action->execute();
- $this->action->execute();
- $this->action->execute();
-
- $messages = $this->getMessages('status');
- $this->assertNotNull($messages);
- $this->assertArrayEquals(['test message'], $messages);
-
- // Set the 'repeat' context to TRUE and execute the action again.
- $this->action->setContextValue('repeat', TRUE);
- $this->action->execute();
-
- // The message should be repeated now.
- $messages = $this->getMessages('status');
- $this->assertNotNull($messages);
- $this->assertArrayEquals(['test message', 'test message'], $messages);
- }
-
- /**
- * Tests that the action works if the optional repeat flag is not set.
- *
- * @covers ::execute
- */
- public function testOptionalRepeat() {
- $this->action->setContextValue('message', 'test message')
- ->setContextValue('type', 'status');
-
- $this->action->execute();
-
- $messages = $this->getMessages('status');
- $this->assertNotNull($messages);
- $this->assertArrayEquals(['test message'], $messages);
- }
-
- /**
- * Clears the statically stored messages.
- *
- * @param null|string $type
- * (optional) The type of messages to clear. Defaults to NULL which causes
- * all messages to be cleared.
- *
- * @return $this
- */
- protected function clearMessages($type = NULL) {
- $messages = &drupal_set_message();
- if (isset($type)) {
- unset($messages[$type]);
- }
- else {
- $messages = NULL;
- }
- return $this;
- }
-
- /**
- * Retrieves the stored messages.
- *
- * @param null|string $type
- * (optional) The type of messages to return. Defaults to NULL which
- * causes all messages to be returned.
- *
- * @return array|null
- * A multidimensional array with keys corresponding to the set message
- * types. The indexed array values of each contain the set messages for
- * that type. The messages returned are limited to the type specified in
- * the $type parameter. If there are no messages of the specified type,
- * an empty array is returned.
- */
- protected function getMessages($type = NULL) {
- $messages = drupal_set_message();
- if (isset($type)) {
- return isset($messages[$type]) ? $messages[$type] : NULL;
- }
- return $messages;
- }
-
- }
-}
-
-namespace {
-
- if (!function_exists('drupal_set_message')) {
-
- /**
- * Dummy replacement for testing.
- */
- function &drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
- static $messages = NULL;
-
- if (!empty($message)) {
- $messages[$type] = isset($messages[$type]) ? $messages[$type] : [];
- if ($repeat || !in_array($message, $messages[$type])) {
- $messages[$type][] = $message;
- }
- }
-
- return $messages;
- }
-
- }
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SystemPageRedirectTest.php b/modules/rules/tests/src/Unit/Integration/Action/SystemPageRedirectTest.php
deleted file mode 100644
index 05c30ff..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SystemPageRedirectTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-logger = $this->prophesize(LoggerInterface::class);
-
- // Mock the logger service, make it return our mocked logger, and register
- // it in the container.
- $this->loggerFactory = $this->prophesize(LoggerChannelFactoryInterface::class);
- $this->loggerFactory->get('rules')->willReturn($this->logger->reveal());
- $this->container->set('logger.factory', $this->loggerFactory->reveal());
-
- // Mock a parameter bag.
- $this->parameterBag = $this->prophesize(ParameterBag::class);
-
- // Mock a request, and set our mocked parameter bag as it attributes
- // property.
- $this->currentRequest = $this->prophesize(Request::class);
- $this->currentRequest->attributes = $this->parameterBag->reveal();
-
- // Mock the request stack, make it return our mocked request when the
- // current request is requested, and register it in the container.
- $this->requestStack = $this->prophesize(RequestStack::class);
- $this->requestStack->getCurrentRequest()->willReturn($this->currentRequest);
- $this->container->set('request_stack', $this->requestStack->reveal());
-
- // Mock the current path stack.
- $this->currentPathStack = $this->prophesize(CurrentPathStack::class);
- $this->container->set('path.current', $this->currentPathStack->reveal());
-
- // Instantiate the redirect action.
- $this->action = $this->actionManager->createInstance('rules_page_redirect');
- }
-
- /**
- * Tests redirection.
- *
- * @covers ::execute
- */
- public function testRedirect() {
- $this->currentPathStack->getPath()->willReturn('some/random/test/path');
-
- $this->action->setContextValue('url', '/test/url');
- $this->action->execute();
-
- $this->parameterBag->set('_rules_redirect_action_url', '/test/url')->shouldHaveBeenCalled();
- }
-
- /**
- * Tests unsuccessful redirection due to ongoing batch process.
- *
- * @covers ::execute
- */
- public function testRedirectBatch() {
- $this->currentPathStack->getPath()->willReturn('some/random/test/path');
- batch_set('Test batch!');
-
- $this->action->setContextValue('url', '/test/url');
- $this->action->execute();
-
- $this->logger->warning('Skipped page redirect during batch processing.')->shouldHaveBeenCalled();
- }
-
- /**
- * Tests unsuccessful redirection due to rules admin page location.
- *
- * @covers ::execute
- */
- public function testRedirectRulesAdminPage() {
- $this->currentPathStack->getPath()->willReturn('admin/config/workflow/rules');
-
- $this->action->setContextValue('url', '/test/url');
- $this->action->execute();
-
- $this->logger->warning('Skipped page redirect on a rules admin page.')->shouldHaveBeenCalled();
- }
-
- }
-}
-
-namespace {
-
- if (!function_exists('batch_get')) {
-
- /**
- * Mock the batch_set() function.
- */
- function batch_set($batch_definition) {
- if ($batch_definition) {
- $batch = &batch_get();
- // Nothing more then current_set should be mocked for testing purposes.
- $batch['current_set'] = $batch_definition;
- }
- }
-
- /**
- * Mock the batch_get() function.
- */
- function &batch_get() {
- static $batch = [];
- return $batch;
- }
-
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SystemSendEmailTest.php b/modules/rules/tests/src/Unit/Integration/Action/SystemSendEmailTest.php
deleted file mode 100644
index d01b29c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SystemSendEmailTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-logger = $this->prophesize(LoggerInterface::class);
- $logger_factory = $this->prophesize(LoggerChannelFactoryInterface::class);
- $logger_factory->get('rules')->willReturn($this->logger->reveal());
-
- $this->mailManager = $this->prophesize(MailManagerInterface::class);
-
- // @todo this is wrong, the logger is no factory.
- $this->container->set('logger.factory', $logger_factory->reveal());
- $this->container->set('plugin.manager.mail', $this->mailManager->reveal());
-
- $this->action = $this->actionManager->createInstance('rules_send_email');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Send email', $this->action->summary());
- }
-
- /**
- * Tests sending a mail to one recipient.
- *
- * @covers ::execute
- */
- public function testSendMailToOneRecipient() {
- $to = ['mail@example.com'];
- $this->action->setContextValue('to', $to)
- ->setContextValue('subject', 'subject')
- ->setContextValue('message', 'hello');
-
- $params = [
- 'subject' => 'subject',
- 'message' => 'hello',
- ];
-
- $this->mailManager->mail(
- 'rules', 'rules_action_mail_' . $this->action->getPluginId(),
- implode(', ', $to),
- LanguageInterface::LANGCODE_SITE_DEFAULT,
- $params,
- NULL
- )
- ->willReturn(['result' => TRUE])
- ->shouldBeCalledTimes(1);
-
- $this->logger->notice(
- // @todo assert the actual message here, but PHPunit goes into an endless
- // loop with that.
- Argument::any(), Argument::any()
- )->shouldBeCalledTimes(1);
-
- $this->action->execute();
- }
-
- /**
- * Tests sending a mail to two recipients.
- *
- * @covers ::execute
- */
- public function testSendMailToTwoRecipients() {
- $to = ['mail@example.com', 'mail2@example.com'];
- $this->action->setContextValue('to', $to)
- ->setContextValue('subject', 'subject')
- ->setContextValue('message', 'hello');
-
- $params = [
- 'subject' => 'subject',
- 'message' => 'hello',
- ];
-
- $this->mailManager->mail(
- 'rules', 'rules_action_mail_' . $this->action->getPluginId(),
- implode(', ', $to),
- LanguageInterface::LANGCODE_SITE_DEFAULT,
- $params,
- NULL
- )
- ->willReturn(['result' => TRUE])
- ->shouldBeCalledTimes(1);
-
- $this->logger->notice(
- // @todo assert the actual message here, but PHPunit goes into an endless
- // with that.
- Argument::any(), Argument::any()
- )->shouldBeCalledTimes(1);
-
- $this->action->execute();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserBlockTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserBlockTest.php
deleted file mode 100644
index 9591013..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserBlockTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
-enableModule('user');
-
- $this->sessionManager = $this->prophesize(SessionManagerInterface::class);
- $this->container->set('session_manager', $this->sessionManager->reveal());
- $this->action = $this->actionManager->createInstance('rules_user_block');
- }
-
- /**
- * Test the summary method.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Block a user', $this->action->summary());
- }
-
- /**
- * Test execute() method for active and authenticated users.
- *
- * @covers ::execute
- */
- public function testBlockUserWithValidUser() {
- $user = $this->getUserMock(self::ACTIVE, self::AUTHENTICATED);
-
- $user->block()->shouldBeCalledTimes(1);
-
- $user->id()->willReturn('123')->shouldBeCalledTimes(1);
-
- $this->sessionManager->delete('123')->shouldBeCalledTimes(1);
-
- $this->action->setContextValue('user', $user->reveal());
-
- $this->action->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
- }
-
- /**
- * Test execute() method for active and anonymous users.
- *
- * @covers ::execute
- */
- public function testBlockUserWithActiveAnonymousUser() {
- $user = $this->getUserMock(self::ACTIVE, self::ANONYMOUS);
-
- $user->block()->shouldNotBeCalled();
-
- $this->sessionManager->delete()->shouldNotBeCalled();
-
- $this->action->setContextValue('user', $user->reveal());
-
- $this->action->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has not been altered.');
- }
-
- /**
- * Test execute() method for blocked and authenticated users.
- *
- * @covers ::execute
- */
- public function testBlockUserWithBlockedAuthenticatedUser() {
- $user = $this->getUserMock(self::BLOCKED, self::AUTHENTICATED);
-
- $user->block()->shouldNotBeCalled();
-
- $this->sessionManager->delete()->shouldNotBeCalled();
-
- $this->action->setContextValue('user', $user->reveal());
-
- $this->action->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has not been altered.');
- }
-
- /**
- * Test execute() method for blocked and anonymous users.
- *
- * @covers ::execute
- */
- public function testBlockUserWithBlockedAnonymousUser() {
- $user = $this->getUserMock(self::BLOCKED, self::ANONYMOUS);
-
- $user->block()->shouldNotBeCalled();
-
- $this->sessionManager->delete()->shouldNotBeCalled();
-
- $this->action->setContextValue('user', $user->reveal());
-
- $this->action->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has not been altered.');
- }
-
- /**
- * Creates a mock user.
- *
- * @param bool $active
- * Is user activated.
- * @param bool $authenticated
- * Is user authenticated.
- *
- * @return \Drupal\user\UserInterface|\Prophecy\Prophecy\ProphecyInterface
- * The mocked user object.
- */
- protected function getUserMock($active, $authenticated) {
- $user = $this->prophesizeEntity(UserInterface::class);
-
- $user->isActive()->willReturn($active);
- $user->isAuthenticated()->willReturn($authenticated);
-
- return $user;
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserRoleAddTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserRoleAddTest.php
deleted file mode 100644
index 2a94205..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserRoleAddTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-enableModule('user');
- $this->action = $this->actionManager->createInstance('rules_user_role_add');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Add user role', $this->action->summary());
- }
-
- /**
- * Tests adding of one role to user. User should not be saved.
- *
- * @covers ::execute
- */
- public function testAddOneRoleNoSave() {
- // Set-up a mock user.
- $account = $this->prophesizeEntity(UserInterface::class);
-
- $account->hasRole('administrator')->willReturn(FALSE);
- $account->addRole('administrator')->shouldBeCalledTimes(1);
- // We do noe expect call of the 'save' method because user should be
- // auto-saved later.
- $account->save()->shouldNotBeCalled();
-
- // Mock the 'administrator' user role.
- $administrator = $this->prophesize(RoleInterface::class);
- $administrator->id()->willReturn('administrator');
-
- // Test adding of one role.
- $this->action
- ->setContextValue('user', $account->reveal())
- ->setContextValue('roles', [$administrator->reveal()])
- ->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
- }
-
- /**
- * Tests adding of three roles to user.
- *
- * @covers ::execute
- */
- public function testAddThreeRoles() {
- // Set-up a mock user.
- $account = $this->prophesizeEntity(UserInterface::class);
- // Mock hasRole.
- $account->hasRole('manager')->willReturn(FALSE)->shouldBeCalledTimes(1);
- $account->hasRole('editor')->willReturn(FALSE)->shouldBeCalledTimes(1);
- $account->hasRole('administrator')->willReturn(FALSE)->shouldBeCalledTimes(1);
-
- // Mock addRole.
- $account->addRole('manager')->shouldBeCalledTimes(1);
- $account->addRole('editor')->shouldBeCalledTimes(1);
- $account->addRole('administrator')->shouldBeCalledTimes(1);
-
- // Mock user roles.
- $manager = $this->prophesize(RoleInterface::class);
- $manager->id()->willReturn('manager');
- $editor = $this->prophesize(RoleInterface::class);
- $editor->id()->willReturn('editor');
- $administrator = $this->prophesize(RoleInterface::class);
- $administrator->id()->willReturn('administrator');
-
- // Test adding of three roles role.
- $this->action
- ->setContextValue('user', $account->reveal())
- ->setContextValue('roles', [
- $manager->reveal(),
- $editor->reveal(),
- $administrator->reveal(),
- ])
- ->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
- }
-
- /**
- * Tests adding of existing role to user.
- *
- * @covers ::execute
- */
- public function testAddExistingRole() {
- // Set-up a mock user with role 'administrator'.
- $account = $this->prophesizeEntity(UserInterface::class);
- $account->hasRole('administrator')->willReturn(TRUE);
-
- // We do not expect a call of the 'addRole' method.
- $account->addRole(Argument::any())->shouldNotBeCalled();
-
- // Mock the 'administrator' user role.
- $administrator = $this->prophesize(RoleInterface::class);
- $administrator->id()->willReturn('administrator');
-
- // Test adding one role.
- $this->action
- ->setContextValue('user', $account->reveal())
- ->setContextValue('roles', [$administrator->reveal()])
- ->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has the role already.');
- }
-
- /**
- * Tests adding of one existing and one nonexistent role to user.
- *
- * @covers ::execute
- */
- public function testAddExistingAndNonexistentRole() {
- // Set-up a mock user with role 'administrator' but without 'editor'.
- $account = $this->prophesizeEntity(UserInterface::class);
- $account->hasRole('administrator')->willReturn(TRUE)
- ->shouldBeCalledTimes(1);
- $account->hasRole('editor')->willReturn(FALSE)
- ->shouldBeCalledTimes(1);
-
- // We expect only one call of the 'addRole' method.
- $account->addRole('editor')->shouldBeCalledTimes(1);
-
- // Mock user roles.
- $editor = $this->prophesize(RoleInterface::class);
- $editor->id()->willReturn('editor');
- $administrator = $this->prophesize(RoleInterface::class);
- $administrator->id()->willReturn('administrator');
-
- // Test adding one role.
- $this->action
- ->setContextValue('user', $account->reveal())
- ->setContextValue('roles', [$administrator->reveal(), $editor->reveal()])
- ->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserRoleRemoveTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserRoleRemoveTest.php
deleted file mode 100644
index 23e1a8b..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserRoleRemoveTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-enableModule('user');
- $this->action = $this->actionManager->createInstance('rules_user_role_remove');
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Remove user role', $this->action->summary());
- }
-
- /**
- * Tests removing role from user. User should not be saved.
- *
- * @covers ::execute
- */
- public function testRemoveExistingRoleNoSave() {
-
- // Set-up a mock user with role 'editor'.
- $account = $this->prophesizeEntity(UserInterface::class);
- $account->hasRole('editor')->willReturn(TRUE);
- $account->removeRole('editor')->shouldBeCalledTimes(1);
-
- // We do not expect call of the 'save' method because user should be
- // auto-saved later.
- $account->save()->shouldNotBeCalled();
-
- // Mock the 'editor' user role.
- $editor = $this->prophesize(RoleInterface::class);
- $editor->id()->willReturn('editor');
-
- // Test removing of one role.
- $this->action
- ->setContextValue('user', $account->reveal())
- ->setContextValue('roles', [$editor->reveal()])
- ->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
- }
-
- /**
- * Tests removing non-existing role from user.
- *
- * @covers ::execute
- */
- public function testRemoveNonExistingRole() {
-
- // Set-up a mock user with role 'editor'.
- $account = $this->prophesizeEntity(UserInterface::class);
- $account->hasRole('editor')->willReturn(FALSE);
- $account->removeRole('editor')->shouldNotBeCalled();
-
- // Mock the 'editor' user role.
- $editor = $this->prophesize(RoleInterface::class);
- $editor->id()->willReturn('editor');
-
- // Test removing of one role.
- $this->action
- ->setContextValue('user', $account->reveal())
- ->setContextValue('roles', [$editor->reveal()])
- ->execute();
-
- $this->assertNotEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserUnblockTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserUnblockTest.php
deleted file mode 100644
index eb6d80f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserUnblockTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-enableModule('user');
- $this->action = $this->actionManager->createInstance('rules_user_unblock');
- }
-
- /**
- * Test the summary method.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Unblock a user', $this->action->summary());
- }
-
- /**
- * Test execute() method for users with different status.
- *
- * @dataProvider userProvider
- *
- * @covers ::execute
- */
- public function testUnblockUser($active, $authenticated, $expects, $autosave_names) {
- // Set-up a mock user.
- $account = $this->prophesizeEntity(UserInterface::class);
- // Mock isBlocked.
- $account->isBlocked()->willReturn(!$active);
- // Mock isAuthenticated.
- $account->isAuthenticated()->willReturn($authenticated);
- // Mock activate.
- $account->activate()->shouldBeCalledTimes($expects);
- // We do noe expect call of the 'save' method because user should be
- // auto-saved later.
- $account->save()->shouldNotBeCalled();
- // Test unblocking the user.
- $this->action
- ->setContextValue('user', $account->reveal())
- ->execute();
-
- $this->assertEquals($this->action->autoSaveContext(), $autosave_names, 'Action returns correct context name for auto saving.');
- }
-
- /**
- * Data provider for ::testUnblockUser.
- */
- public function userProvider() {
- return [
- // Test blocked authenticated user.
- [self::BLOCKED, self::AUTHENTICATED, 1, ['user']],
- // Test active anonymous user.
- [self::ACTIVE, self::ANONYMOUS, 0, []],
- // Test active authenticated user.
- [self::ACTIVE, self::AUTHENTICATED, 0, []],
- // Test blocked anonymous user.
- [self::BLOCKED, self::ANONYMOUS, 0, []],
- ];
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/VariableAddTest.php b/modules/rules/tests/src/Unit/Integration/Action/VariableAddTest.php
deleted file mode 100644
index b6eed9e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/VariableAddTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-actionManager->createInstance('rules_variable_add');
- $action->setContextValue('type', 'string');
- $action->setContextValue('value', $variable);
- $action->refineContextDefinitions([]);
- $action->execute();
-
- $result = $action->getProvidedContext('variable_added');
- $this->assertEquals($variable, $result->getContextValue());
- $this->assertEquals('string', $result->getContextDefinition()->getDataType());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ConditionAccessTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ConditionAccessTest.php
deleted file mode 100644
index 2a6b39c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ConditionAccessTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-conditionManager->createInstance('rules_test_string_condition');
- $this->assertNotNull($plugin, "The rules_test condition was found.");
- $definition = $plugin->getPluginDefinition();
- $this->assertNotEmpty($definition['configure_permissions'], "Plugin has configure permission info.");
- $perms = $definition['configure_permissions'];
- $this->assertTrue(is_array($perms), "configure_permissions is an array");
- $this->assertContains("access test configuration", $perms, "Expected permission found in configure_permissions.");
-
- // Now see if the permission is actually used.
- $user_with_perm = $this->prophesize(AccountInterface::class);
- $user_with_perm
- ->hasPermission("access test configuration")
- ->willReturn(TRUE)
- ->shouldBeCalledTimes(2);
- $user_with_perm
- ->hasPermission(Argument::type('string'))
- ->willReturn(FALSE);
-
- $this->container->set('current_user', $user_with_perm->reveal());
- $this->assertTrue($plugin->checkConfigurationAccess(),
- "User with permission has configure permission.");
- $this->assertTrue($plugin->checkConfigurationAccess($user_with_perm->reveal(), TRUE)->isAllowed(),
- "Condition returns isAllowed()");
-
- $user_without_perm = $this->prophesize(AccountInterface::class);
- $user_without_perm
- ->hasPermission("access test configuration")
- ->willReturn(FALSE)
- ->shouldBeCalledTimes(2);
- $user_without_perm
- ->hasPermission(Argument::type('string'))
- ->willReturn(FALSE);
-
- $this->assertFalse($plugin->checkConfigurationAccess($user_without_perm->reveal()),
- "User without permission does not have configure permission.");
- $this->assertTrue($plugin->checkConfigurationAccess($user_without_perm->reveal(), TRUE)->isNeutral(),
- "User without permission gets isNeutral().");
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ConditionManagerTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ConditionManagerTest.php
deleted file mode 100644
index 3b99a2c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ConditionManagerTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-conditionManager->getDefinitions();
- // Make sure all context definitions are using the class provided by Rules.
- foreach ($definitions as $definition) {
- if (!empty($definition['context'])) {
- foreach ($definition['context'] as $context_definition) {
- $this->assertInstanceOf(ContextDefinitionInterface::class, $context_definition);
- }
- }
- }
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/DataComparisonTest.php b/modules/rules/tests/src/Unit/Integration/Condition/DataComparisonTest.php
deleted file mode 100644
index 6afae54..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/DataComparisonTest.php
+++ /dev/null
@@ -1,218 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_data_comparison');
- }
-
- /**
- * Tests evaluating the condition with the "equals" operator.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationOperatorEquals() {
- // Test that when a boolean data does not equal a boolean value
- // and the operator is not set - should fallback to '=='.
- $this->condition
- ->setContextValue('data', TRUE)
- ->setContextValue('value', FALSE);
- $this->assertFalse($this->condition->evaluate());
-
- // Test that when both data and value are false booleans
- // and the operator is not set - should fallback to '=='.
- $this->condition
- ->setContextValue('data', FALSE)
- ->setContextValue('value', FALSE);
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when the data string equals the value string and the operator
- // is '==', TRUE is returned.
- $this->condition
- ->setContextValue('data', 'Llama')
- ->setContextValue('operation', '==')
- ->setContextValue('value', 'Llama');
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when the data string does not equal the value string and the
- // operation is '==', FALSE is returned.
- $this->condition
- ->setContextValue('data', 'Kitten')
- ->setContextValue('operation', '==')
- ->setContextValue('value', 'Llama');
- $this->assertFalse($this->condition->evaluate());
-
- // Test that when both data and value are false booleans and the operation
- // is '==', TRUE is returned.
- $this->condition
- ->setContextValue('data', FALSE)
- ->setContextValue('operation', '==')
- ->setContextValue('value', FALSE);
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when a boolean data does not equal a boolean value
- // and the operation is '==', FALSE is returned.
- $this->condition
- ->setContextValue('data', TRUE)
- ->setContextValue('operation', '==')
- ->setContextValue('value', FALSE);
- $this->assertFalse($this->condition->evaluate());
- }
-
- /**
- * Tests evaluating the condition with the "contains" operation.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationOperatorContains() {
- // Test that when the data string contains the value string, and the
- // operation is 'CONTAINS', TRUE is returned.
- $this->condition
- ->setContextValue('data', 'Big Llama')
- ->setContextValue('operation', 'contains')
- ->setContextValue('value', 'Llama');
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when the data string does not contain the value string, and
- // the operation is 'contains', TRUE is returned.
- $this->condition
- ->setContextValue('data', 'Big Kitten')
- ->setContextValue('operation', 'contains')
- ->setContextValue('value', 'Big Kitten');
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when a data array contains the value string, and the operation
- // is 'CONTAINS', TRUE is returned.
- $this->condition
- ->setContextValue('data', ['Llama', 'Kitten'])
- ->setContextValue('operation', 'contains')
- ->setContextValue('value', 'Llama');
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when a data array does not contain the value array, and the
- // operation is 'CONTAINS', TRUE is returned.
- $this->condition
- ->setContextValue('data', ['Kitten'])
- ->setContextValue('operation', 'contains')
- ->setContextValue('value', ['Llama']);
- $this->assertFalse($this->condition->evaluate());
- }
-
- /**
- * Tests evaluating the condition with the "IN" operation.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationOperatorIn() {
- // Test that when the data string is 'IN' the value array, TRUE is returned.
- $this->condition
- ->setContextValue('data', 'Llama')
- ->setContextValue('operation', 'IN')
- ->setContextValue('value', ['Llama', 'Kitten']);
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when the data array is not in the value array, and the
- // operation is 'IN', FALSE is returned.
- $this->condition
- ->setContextValue('data', ['Llama'])
- ->setContextValue('operation', 'IN')
- ->setContextValue('value', ['Kitten']);
- $this->assertFalse($this->condition->evaluate());
- }
-
- /**
- * Tests evaluating the condition with the "is less than" operation.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationOperatorLessThan() {
- // Test that when data is less than value and operation is '<',
- // TRUE is returned.
- $this->condition
- ->setContextValue('data', 1)
- ->setContextValue('operation', '<')
- ->setContextValue('value', 2);
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when data is greater than value and operation is '<',
- // FALSE is returned.
- $this->condition
- ->setContextValue('data', 2)
- ->setContextValue('operation', '<')
- ->setContextValue('value', 1);
- $this->assertFalse($this->condition->evaluate());
- }
-
- /**
- * Tests evaluating the condition with the "is greater than" operation.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationOperatorGreaterThan() {
- // Test that when data is greater than value and operation is '>',
- // TRUE is returned.
- $this->condition
- ->setContextValue('data', 2)
- ->setContextValue('operation', '>')
- ->setContextValue('value', 1);
- $this->assertTrue($this->condition->evaluate());
-
- // Test that when data is less than value and operation is '>',
- // FALSE is returned.
- $this->condition
- ->setContextValue('data', 1)
- ->setContextValue('operation', '>')
- ->setContextValue('value', 2);
- $this->assertFalse($this->condition->evaluate());
- }
-
- /**
- * Tests the summary.
- *
- * @covers ::summary
- */
- public function testSummary() {
- $this->assertEquals('Data comparison', $this->condition->summary());
- }
-
- /**
- * @covers ::refineContextDefinitions
- */
- public function testRefineContextDefinitions() {
- // When a string is selected for comparison, the value must be string also.
- $this->condition->refineContextDefinitions([
- 'data' => DataDefinition::create('string'),
- ]);
- $this->assertEquals('string', $this->condition->getContextDefinition('value')->getDataType());
-
- // IN operation requires a list of strings as value.
- $this->condition->setContextValue('operation', 'IN');
- $this->condition->refineContextDefinitions([
- 'data' => DataDefinition::create('string'),
- ]);
- $this->assertEquals('string', $this->condition->getContextDefinition('value')->getDataType());
- $this->assertTrue($this->condition->getContextDefinition('value')->isMultiple());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/DataIsEmptyTest.php b/modules/rules/tests/src/Unit/Integration/Condition/DataIsEmptyTest.php
deleted file mode 100644
index 7286576..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/DataIsEmptyTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_data_is_empty');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- // Test a ComplexDataInterface object.
- $entity_adapter_empty = $this->prophesize(ComplexDataInterface::class);
- $entity_adapter_empty->isEmpty()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
- $context = $this->condition->getContext('data');
- $context = Context::createFromContext($context, $entity_adapter_empty->reveal());
- $this->condition->setContext('data', $context);
- $this->assertTrue($this->condition->evaluate());
-
- $entity_adapter_full = $this->prophesize(ComplexDataInterface::class);
- $entity_adapter_full->isEmpty()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
- $context = Context::createFromContext($context, $entity_adapter_full->reveal());
- $this->condition->setContext('data', $context);
- $this->assertFalse($this->condition->evaluate());
-
- // These should all return FALSE.
- // A non-empty array.
- $context = Context::createFromContext(
- $context,
- $this->getTypedData('list', [1, 2, 3])
- );
- $this->condition->setContext('data', $context);
- $this->assertFalse($this->condition->evaluate());
-
- // An array containing an empty list.
- $context = Context::createFromContext($context, $this->getTypedData('list', [[]]));
- $this->condition->setContext('data', $context);
- $this->assertFalse($this->condition->evaluate());
-
- // An array with a zero-value element.
- $context = Context::createFromContext($context, $this->getTypedData('list', [0]));
- $this->condition->setContext('data', $context);
- $this->assertFalse($this->condition->evaluate());
-
- // A scalar value.
- $context = Context::createFromContext($context, $this->getTypedData('integer', 1));
- $this->condition->setContext('data', $context);
- $this->assertFalse($this->condition->evaluate());
-
- $context = Context::createFromContext($context, $this->getTypedData('string', 'short string'));
- $this->condition->setContext('data', $context);
- $this->assertFalse($this->condition->evaluate());
-
- // These should all return TRUE.
- // An empty array.
- $context = Context::createFromContext($context, $this->getTypedData('list', []));
- $this->condition->setContext('data', $context);
- $this->assertTrue($this->condition->evaluate());
-
- // The false/zero/NULL values.
- $context = Context::createFromContext($context, $this->getTypedData('boolean', FALSE));
- $this->condition->setContext('data', $context);
- $this->assertTrue($this->condition->evaluate());
-
- $context = Context::createFromContext($context, $this->getTypedData('integer', 0));
- $this->condition->setContext('data', $context);
- $this->assertTrue($this->condition->evaluate());
-
- $context = Context::createFromContext($context, $this->getTypedData('string', NULL));
- $this->condition->setContext('data', $context);
- $this->assertTrue($this->condition->evaluate());
-
- // An empty string.
- $context = Context::createFromContext($context, $this->getTypedData('string', ''));
- $this->condition->setContext('data', $context);
- $this->assertTrue($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityHasFieldTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityHasFieldTest.php
deleted file mode 100644
index ace166c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityHasFieldTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_entity_has_field');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $entity = $this->prophesizeEntity(ContentEntityInterface::class);
- $entity->hasField('existing-field')->willReturn(TRUE)
- ->shouldBeCalledTimes(1);
- $entity->hasField('non-existing-field')->willReturn(FALSE)
- ->shouldBeCalledTimes(1);
-
- $this->condition->setContextValue('entity', $entity->reveal());
-
- // Test with an existing field.
- $this->condition->setContextValue('field', 'existing-field');
- $this->assertTrue($this->condition->evaluate());
-
- // Test with a non-existing field.
- $this->condition->setContextValue('field', 'non-existing-field');
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsNewTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityIsNewTest.php
deleted file mode 100644
index cbe768f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsNewTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_entity_is_new');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $entity = $this->prophesizeEntity(EntityInterface::class);
- $entity->isNew()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
- // Add the test node to our context as the evaluated entity.
- $this->condition->setContextValue('entity', $entity->reveal());
- $this->assertTrue($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfBundleTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfBundleTest.php
deleted file mode 100644
index 2d1b0e6..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfBundleTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_entity_is_of_bundle');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $entity = $this->prophesizeEntity(EntityInterface::class);
-
- $entity->getEntityTypeId()->willReturn('node')->shouldBeCalledTimes(3);
- $entity->bundle()->willReturn('page')->shouldBeCalledTimes(3);
-
- // Add the test node to our context as the evaluated entity, along with
- // explicit entity type and bundle strings.
- // First, test with values that should evaluate TRUE.
- $this->condition->setContextValue('entity', $entity->reveal())
- ->setContextValue('type', 'node')
- ->setContextValue('bundle', 'page');
-
- $this->assertTrue($this->condition->evaluate());
-
- // Then test with values that should evaluate FALSE.
- $this->condition->setContextValue('bundle', 'article');
- $this->assertFalse($this->condition->evaluate());
-
- $this->condition->setContextValue('type', 'taxonomy_term')
- ->setContextValue('bundle', 'page');
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfTypeTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfTypeTest.php
deleted file mode 100644
index fb2c42c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfTypeTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_entity_is_of_type');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $entity = $this->prophesizeEntity(EntityInterface::class);
- $entity->getEntityTypeId()->willReturn('node')->shouldBeCalledTimes(2);
-
- // Add the test node to our context as the evaluated entity, along with an
- // explicit entity type string.
- // First, test with a value that should evaluate TRUE.
- $this->condition->setContextValue('entity', $entity->reveal())
- ->setContextValue('type', 'node');
- $this->assertTrue($this->condition->evaluate());
-
- // Then test with values that should evaluate FALSE.
- $this->condition->setContextValue('type', 'taxonomy_term');
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ListContainsTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ListContainsTest.php
deleted file mode 100644
index b0e43a0..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ListContainsTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_list_contains');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
-
- // Test array of string values.
- $list = ['One', 'Two', 'Three'];
-
- // Test that the list doesn't contain 'Zero'.
- $this->condition
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Zero');
- $this->assertFalse($this->condition->evaluate());
-
- // Test that the list contains 'One'.
- $this->condition
- ->setContextValue('list', $list)
- ->setContextValue('item', 'One');
- $this->assertTrue($this->condition->evaluate());
-
- // Test that the list contains 'Two'.
- $this->condition
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Two');
- $this->assertTrue($this->condition->evaluate());
-
- // Test that the list contains 'Three'.
- $this->condition
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Three');
- $this->assertTrue($this->condition->evaluate());
-
- // Test that the list doesn't contain 'Four'.
- $this->condition
- ->setContextValue('list', $list)
- ->setContextValue('item', 'Four');
- $this->assertFalse($this->condition->evaluate());
-
- // Create array of mock entities.
- $entity_zero = $this->prophesizeEntity(EntityInterface::class);
- $entity_zero->id()->willReturn('entity_zero_id');
-
- $entity_one = $this->prophesizeEntity(EntityInterface::class);
- $entity_one->id()->willReturn('entity_one_id');
-
- $entity_two = $this->prophesizeEntity(EntityInterface::class);
- $entity_two->id()->willReturn('entity_two_id');
-
- $entity_three = $this->prophesizeEntity(EntityInterface::class);
- $entity_three->id()->willReturn('entity_three_id');
-
- $entity_four = $this->prophesizeEntity(EntityInterface::class);
- $entity_four->id()->willReturn('entity_four_id');
-
- // Test array of entities.
- $entity_list = [
- $entity_one->reveal(),
- $entity_two->reveal(),
- $entity_three->reveal(),
- ];
-
- // Test that the list of entities doesn't contain entity 'entity_zero'.
- $this->condition
- ->setContextValue('list', $entity_list)
- ->setContextValue('item', $entity_zero->reveal());
- $this->assertFalse($this->condition->evaluate());
-
- // Test that the list of entities contains entity 'entity_one'.
- $this->condition
- ->setContextValue('list', $entity_list)
- ->setContextValue('item', $entity_one->reveal());
- $this->assertTrue($this->condition->evaluate());
-
- // Test that the list of entities contains entity 'entity_two'.
- $this->condition
- ->setContextValue('list', $entity_list)
- ->setContextValue('item', $entity_two->reveal());
- $this->assertTrue($this->condition->evaluate());
-
- // Test that the list of entities contains entity 'entity_three'.
- $this->condition
- ->setContextValue('list', $entity_list)
- ->setContextValue('item', $entity_three->reveal());
- $this->assertTrue($this->condition->evaluate());
-
- // Test that the list of entities doesn't contain entity 'entity_four'.
- $this->condition
- ->setContextValue('list', $entity_list)
- ->setContextValue('item', $entity_four->reveal());
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ListCountIsTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ListCountIsTest.php
deleted file mode 100644
index 6c7e988..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ListCountIsTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_list_count_is');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- // Test that the list count is greater than 2.
- $condition = $this->condition
- ->setContextValue('list', [1, 2, 3, 4])
- ->setContextValue('operator', '>')
- ->setContextValue('value', '2');
- $this->assertTrue($condition->evaluate());
-
- // Test that the list count is less than 4.
- $condition = $this->condition
- ->setContextValue('list', [1, 2, 3])
- ->setContextValue('operator', '<')
- ->setContextValue('value', '4');
- $this->assertTrue($condition->evaluate());
-
- // Test that the list count is equal to 3.
- $condition = $this->condition
- ->setContextValue('list', [1, 2, 3])
- ->setContextValue('operator', '==')
- ->setContextValue('value', '3');
- $this->assertTrue($condition->evaluate());
-
- // Test that the list count is equal to 0.
- $condition = $this->condition
- ->setContextValue('list', [])
- ->setContextValue('operator', '==')
- ->setContextValue('value', '0');
- $this->assertTrue($condition->evaluate());
-
- // Test that the list count is not less than 2.
- $condition = $this->condition
- ->setContextValue('list', [1, 2])
- ->setContextValue('operator', '<')
- ->setContextValue('value', '2');
- $this->assertFalse($condition->evaluate());
-
- // Test that list count is not greater than 5.
- $condition = $this->condition
- ->setContextValue('list', [1, 2, 3])
- ->setContextValue('operator', '>')
- ->setContextValue('value', '5');
- $this->assertFalse($condition->evaluate());
-
- // Test that the list count is not equal to 0.
- $condition = $this->condition
- ->setContextValue('list', [1, 2, 3])
- ->setContextValue('operator', '==')
- ->setContextValue('value', '0');
- $this->assertFalse($condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsOfTypeTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsOfTypeTest.php
deleted file mode 100644
index fab998e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsOfTypeTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-enableModule('node');
- $this->condition = $this->conditionManager->createInstance('rules_node_is_of_type');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $node = $this->prophesizeEntity(NodeInterface::class);
- $node->getType()->willReturn('page');
-
- // Set the node context value.
- $this->condition->setContextValue('node', $node->reveal());
-
- // Test evaluation with a list that contains the actual node type.
- $this->condition->setContextValue('types', ['page', 'article']);
- $this->assertTrue($this->condition->evaluate());
-
- // Test with a list that does not contain the actual node type.
- $this->condition->setContextValue('types', ['apple', 'banana']);
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPromotedTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPromotedTest.php
deleted file mode 100644
index 1e3e88f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPromotedTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-enableModule('node');
- $this->condition = $this->conditionManager->createInstance('rules_node_is_promoted');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $promoted_node = $this->prophesizeEntity(NodeInterface::class);
-
- $promoted_node->isPromoted()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
- // Set the node context value.
- $this->condition->setContextValue('node', $promoted_node->reveal());
-
- $this->assertTrue($this->condition->evaluate());
-
- $unpromoted_node = $this->prophesizeEntity(NodeInterface::class);
-
- $unpromoted_node->isPromoted()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
- // Set the node context value.
- $this->condition->setContextValue('node', $unpromoted_node->reveal());
-
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPublishedTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPublishedTest.php
deleted file mode 100644
index 2c8a493..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPublishedTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-enableModule('node');
- $this->condition = $this->conditionManager->createInstance('rules_node_is_published');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $published_node = $this->prophesizeEntity(NodeInterface::class);
-
- $published_node->isPublished()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
- // Set the node context value.
- $this->condition->setContextValue('node', $published_node->reveal());
-
- $this->assertTrue($this->condition->evaluate());
-
- $unpublished_node = $this->prophesizeEntity(NodeInterface::class);
-
- $unpublished_node->isPublished()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
- // Set the node context value.
- $this->condition->setContextValue('node', $unpublished_node->reveal());
-
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsStickyTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsStickyTest.php
deleted file mode 100644
index 5d8d189..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsStickyTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-enableModule('node');
- $this->condition = $this->conditionManager->createInstance('rules_node_is_sticky');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $sticky_node = $this->prophesizeEntity(NodeInterface::class);
-
- $sticky_node->isSticky()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
- // Set the node context value.
- $this->condition->setContextValue('node', $sticky_node->reveal());
-
- $this->assertTrue($this->condition->evaluate());
-
- $unsticky_node = $this->prophesizeEntity(NodeInterface::class);
-
- $unsticky_node->isSticky()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
- // Set the node context value.
- $this->condition->setContextValue('node', $unsticky_node->reveal());
-
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/PathAliasExistsTest.php b/modules/rules/tests/src/Unit/Integration/Condition/PathAliasExistsTest.php
deleted file mode 100644
index 212d212..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/PathAliasExistsTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_path_alias_exists');
-
- $this->englishLanguage = $this->prophesize(LanguageInterface::class);
- $this->englishLanguage->getId()->willReturn('en');
- }
-
- /**
- * Tests that the dependencies are properly set in the constructor.
- *
- * @covers ::__construct
- */
- public function testConstructor() {
- $property = new \ReflectionProperty($this->condition, 'aliasManager');
- $property->setAccessible(TRUE);
-
- $this->assertSame($this->aliasManager->reveal(), $property->getValue($this->condition));
- }
-
- /**
- * Tests evaluating the condition for an alias that can be resolved.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationAliasWithPath() {
- $this->aliasManager->getPathByAlias('alias-for-path', NULL)
- ->willReturn('path-with-alias')
- ->shouldBeCalledTimes(1);
-
- $this->aliasManager->getPathByAlias('alias-for-path', 'en')
- ->willReturn('path-with-alias')
- ->shouldBeCalledTimes(1);
-
- // First, only set the path context.
- $this->condition->setContextValue('alias', 'alias-for-path');
-
- // Test without language context set.
- $this->assertTrue($this->condition->evaluate());
-
- // Test with language context set.
- $this->condition->setContextValue('language', $this->englishLanguage->reveal());
- $this->assertTrue($this->condition->evaluate());
- }
-
- /**
- * Tests evaluating the condition for an alias that can not be resolved.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationAliasWithoutPath() {
- $this->aliasManager->getPathByAlias('alias-for-path-that-does-not-exist', NULL)
- ->willReturn('alias-for-path-that-does-not-exist')
- ->shouldBeCalledTimes(1);
-
- $this->aliasManager->getPathByAlias('alias-for-path-that-does-not-exist', 'en')
- ->willReturn('alias-for-path-that-does-not-exist')
- ->shouldBeCalledTimes(1);
-
- // First, only set the path context.
- $this->condition->setContextValue('alias', 'alias-for-path-that-does-not-exist');
-
- // Test without language context set.
- $this->assertFalse($this->condition->evaluate());
-
- // Test with language context set.
- $this->condition->setContextValue('language', $this->englishLanguage->reveal());
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/PathHasAliasTest.php b/modules/rules/tests/src/Unit/Integration/Condition/PathHasAliasTest.php
deleted file mode 100644
index c066703..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/PathHasAliasTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-condition = $this->conditionManager->createInstance('rules_path_has_alias');
-
- $this->englishLanguage = $this->prophesize(LanguageInterface::class);
- $this->englishLanguage->getId()->willReturn('en');
- }
-
- /**
- * Tests that the dependencies are properly set in the constructor.
- *
- * @covers ::__construct
- */
- public function testConstructor() {
- $property = new \ReflectionProperty($this->condition, 'aliasManager');
- $property->setAccessible(TRUE);
-
- $this->assertSame($this->aliasManager->reveal(), $property->getValue($this->condition));
- }
-
- /**
- * Tests evaluating the condition for a path with an alias.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationPathWithAlias() {
- $this->aliasManager->getAliasByPath('path-with-alias', NULL)
- ->willReturn('alias-for-path')
- ->shouldBeCalledTimes(1);
-
- $this->aliasManager->getAliasByPath('path-with-alias', 'en')
- ->willReturn('alias-for-path')
- ->shouldBeCalledTimes(1);
-
- // First, only set the path context.
- $this->condition->setContextValue('path', 'path-with-alias');
-
- // Test without language context set.
- $this->assertTrue($this->condition->evaluate());
-
- // Test with language context set.
- $this->condition->setContextValue('language', $this->englishLanguage->reveal());
- $this->assertTrue($this->condition->evaluate());
- }
-
- /**
- * Tests evaluating the condition for path without an alias.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluationPathWithoutAlias() {
- $this->aliasManager->getAliasByPath('path-without-alias', NULL)
- ->willReturn('path-without-alias')
- ->shouldBeCalledTimes(1);
-
- $this->aliasManager->getAliasByPath('path-without-alias', 'en')
- ->willReturn('path-without-alias')
- ->shouldBeCalledTimes(1);
-
- // First, only set the path context.
- $this->condition->setContextValue('path', 'path-without-alias');
-
- // Test without language context set.
- $this->assertFalse($this->condition->evaluate());
-
- // Test with language context set.
- $this->condition->setContextValue('language', $this->englishLanguage->reveal());
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/UserHasEntityFieldAccessTest.php b/modules/rules/tests/src/Unit/Integration/Condition/UserHasEntityFieldAccessTest.php
deleted file mode 100644
index 0f391d9..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/UserHasEntityFieldAccessTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-enableModule('user');
- $this->condition = $this->conditionManager->createInstance('rules_entity_field_access');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $account = $this->prophesizeEntity(UserInterface::class);
- $entity = $this->prophesizeEntity(ContentEntityInterface::class);
- $items = $this->prophesize(FieldItemListInterface::class);
-
- $entity->getEntityTypeId()->willReturn('user');
- $entity->hasField('potato-field')->willReturn(TRUE)
- ->shouldBeCalledTimes(3);
-
- $definition = $this->prophesize(FieldDefinitionInterface::class);
- $entity->getFieldDefinition('potato-field')
- ->willReturn($definition->reveal())
- ->shouldBeCalledTimes(2);
-
- $entity->get('potato-field')->willReturn($items->reveal())
- ->shouldBeCalledTimes(2);
-
- $this->condition->setContextValue('entity', $entity->reveal())
- ->setContextValue('field', 'potato-field')
- ->setContextValue('user', $account->reveal());
-
- $this->entityAccess->access($entity->reveal(), 'view', $account->reveal())
- ->willReturn(TRUE)
- ->shouldBeCalledTimes(1);
- $this->entityAccess->access($entity->reveal(), 'edit', $account->reveal())
- ->willReturn(TRUE)
- ->shouldBeCalledTimes(1);
- $this->entityAccess->access($entity->reveal(), 'delete', $account->reveal())
- ->willReturn(FALSE)
- ->shouldBeCalledTimes(1);
-
- $this->entityAccess->fieldAccess('view', $definition->reveal(), $account->reveal(), $items->reveal())
- ->willReturn(TRUE)
- ->shouldBeCalledTimes(1);
- $this->entityAccess->fieldAccess('edit', $definition->reveal(), $account->reveal(), $items->reveal())
- ->willReturn(FALSE)
- ->shouldBeCalledTimes(1);
-
- // Test with 'view', 'edit' and 'delete'. Both 'view' and 'edit' will have
- // general entity access, but the 'potato-field' should deny access for the
- // 'edit' operation. Hence, 'edit' and 'delete' should return FALSE.
- $this->condition->setContextValue('operation', 'view');
- $this->assertTrue($this->condition->evaluate());
- $this->condition->setContextValue('operation', 'edit');
- $this->assertFalse($this->condition->evaluate());
- $this->condition->setContextValue('operation', 'delete');
- $this->assertFalse($this->condition->evaluate());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/UserHasRoleTest.php b/modules/rules/tests/src/Unit/Integration/Condition/UserHasRoleTest.php
deleted file mode 100644
index b5ca4ba..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/UserHasRoleTest.php
+++ /dev/null
@@ -1,111 +0,0 @@
-enableModule('user');
- $this->condition = $this->conditionManager->createInstance('rules_user_has_role');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- // Set-up a mock object with roles 'authenticated' and 'editor', but not
- // 'administrator'.
- $account = $this->prophesizeEntity(UserInterface::class);
- $account->getRoles()->willReturn(['authenticated', 'editor'])
- ->shouldBeCalledTimes(7);
-
- $this->condition->setContextValue('user', $account->reveal());
-
- $authenticated = $this->prophesize(RoleInterface::class);
- $authenticated->id()->willReturn('authenticated');
- $editor = $this->prophesize(RoleInterface::class);
- $editor->id()->willReturn('editor');
- $administrator = $this->prophesize(RoleInterface::class);
- $administrator->id()->willReturn('administrator');
-
- // First test the default AND condition with both roles the user has.
- $this->condition->setContextValue('roles', [$authenticated->reveal(), $editor->reveal()]);
- $this->assertTrue($this->condition->evaluate());
-
- // User doesn't have the administrator role, this should fail.
- $this->condition->setContextValue('roles', [$authenticated->reveal(), $administrator->reveal()]);
- $this->assertFalse($this->condition->evaluate());
-
- // Only one role, should succeed.
- $this->condition->setContextValue('roles', [$authenticated->reveal()]);
- $this->assertTrue($this->condition->evaluate());
-
- // A role the user doesn't have.
- $this->condition->setContextValue('roles', [$administrator->reveal()]);
- $this->assertFalse($this->condition->evaluate());
-
- // Only one role, the user has with OR condition, should succeed.
- $this->condition->setContextValue('roles', [$authenticated->reveal()]);
- $this->condition->setContextValue('operation', 'OR');
- $this->assertTrue($this->condition->evaluate());
-
- // User doesn't have the administrator role, but has the authenticated,
- // should succeed.
- $this->condition->setContextValue('roles', [$authenticated->reveal(), $administrator->reveal()]);
- $this->condition->setContextValue('operation', 'OR');
- $this->assertTrue($this->condition->evaluate());
-
- // User doesn't have the administrator role. This should fail.
- $this->condition->setContextValue('roles', [$administrator->reveal()]);
- $this->condition->setContextValue('operation', 'OR');
- $this->assertFalse($this->condition->evaluate());
- }
-
- /**
- * Test the behavior with unsupported operations.
- *
- * @covers ::execute
- */
- public function testInvalidOperationException() {
- // Set the expected exception class and message.
- $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Either use "AND" or "OR". Leave empty for default "AND" behavior.');
-
- // Set-up a mock object with roles 'authenticated' and 'editor', but not
- // 'administrator'.
- $account = $this->prophesizeEntity(UserInterface::class);
- $account->getRoles()->willReturn(['authenticated', 'editor']);
-
- $this->condition->setContextValue('user', $account->reveal());
-
- $authenticated = $this->prophesize(RoleInterface::class);
- $authenticated->id()->willReturn('authenticated');
-
- // Now test INVALID as operation. An exception must be thrown.
- $this->condition->setContextValue('roles', [$authenticated->reveal()]);
- $this->condition->setContextValue('operation', 'INVALID');
- $this->condition->evaluate();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/UserIsBlockedTest.php b/modules/rules/tests/src/Unit/Integration/Condition/UserIsBlockedTest.php
deleted file mode 100644
index 31664fb..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/UserIsBlockedTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-enableModule('user');
- $this->condition = $this->conditionManager->createInstance('rules_user_is_blocked');
- }
-
- /**
- * Tests evaluating the condition.
- *
- * @covers ::evaluate
- */
- public function testConditionEvaluation() {
- $blocked_user = $this->prophesizeEntity(UserInterface::class);
- $blocked_user->isBlocked()->willReturn(TRUE)->shouldbeCalledTimes(1);
-
- // Set the user context value.
- $this->condition->setContextValue('user', $blocked_user->reveal());
-
- $this->assertTrue($this->condition->evaluate());
-
- $active_user = $this->prophesizeEntity(UserInterface::class);
- $active_user->isBlocked()->willReturn(FALSE)->shouldbeCalledTimes(1);
-
- // Set the user context value.
- $this->condition->setContextValue('user', $active_user->reveal());
-
- $this->assertFalse($this->condition->evaluate());;
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/AnnotationProcessingTest.php b/modules/rules/tests/src/Unit/Integration/Engine/AnnotationProcessingTest.php
deleted file mode 100644
index a6ba554..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/AnnotationProcessingTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-enableModule('user');
- // Some of our plugins assume sessions exist:
- $session_manager = $this->prophesize(SessionManagerInterface::class);
- $this->container->set('session_manager', $session_manager->reveal());
- }
-
- /**
- * Make sure @ Translation annotations do not leak out into the wild.
- */
- public function testTranslationSquelching() {
- // Get a sample Rules plugin.
- $plugin = $this->conditionManager->createInstance('rules_list_contains');
- $context = $plugin->getContext('list');
- $definition = $context->getContextDefinition();
-
- // These can reasonable be string or TranslatableMarkup, but never
- // a Translation object.
- $label = $definition->getLabel();
- $description = $definition->getDescription();
- $this->assertFalse($label instanceof Translation, 'Label is not a Translation object');
- $this->assertFalse($description instanceof Translation, 'Description is not a Translation object');
-
- // Check also the toArray() path.
- $definition = $context->getContextDefinition();
- $values = $definition->toArray();
- $label = $values['label'];
- $description = $values['description'];
- $this->assertFalse($label instanceof Translation, "\$values['label'] is not a Translation object");
- $this->assertFalse($description instanceof Translation, "\$values['description'] is not a Translation object");
- }
-
- /**
- * Tests if our ContextDefinition annotations are correctly processed.
- *
- * @param string $plugin_type
- * Type of rules plugin to test (for now, 'action' or 'condition').
- * @param string $plugin_id
- * Plugin ID for the plugin to be tested.
- * @param string $context_name
- * The name of the plugin's context to test.
- * @param string $expected
- * The type of context as defined in the plugin's annotation.
- *
- * @dataProvider provideRulesPlugins
- */
- public function testCheckConfiguration($plugin_type, $plugin_id, $context_name, $expected) {
- $plugin = NULL;
-
- switch ($plugin_type) {
- case 'action':
- $plugin = $this->actionManager->createInstance($plugin_id);
- break;
-
- case 'condition':
- $plugin = $this->conditionManager->createInstance($plugin_id);
- break;
- }
-
- $this->assertNotNull($plugin, "{$plugin_type} plugin {$plugin_id} loads");
-
- $context = $plugin->getContext($context_name);
-
- $this->assertNotNull($context, "Plugin {$plugin_id} has context {$context_name}");
-
- $context_def = $context->getContextDefinition();
- $type = $context_def->getDataType();
-
- $this->assertSame($type, $expected, "Context type for {$context_name} is $expected");
- }
-
- /**
- * Provider for plugins to test.
- *
- * Passes $plugin_type, $plugin_id, $context_name, and $expected.
- *
- * @return array
- * Array of array of values to be passed to our test.
- */
- public function provideRulesPlugins() {
- return [
- [
- 'action',
- 'rules_user_block',
- 'user',
- 'entity:user',
- ],
- [
- 'condition',
- 'rules_entity_is_of_bundle',
- 'entity',
- 'entity',
- ],
- [
- 'condition',
- 'rules_node_is_promoted',
- 'node',
- 'entity:node',
- ],
- [
- 'action',
- 'rules_list_item_add',
- 'list',
- 'list',
- ],
- [
- 'action',
- 'rules_list_item_add',
- 'item',
- 'any',
- ],
- [
- 'action',
- 'rules_list_item_add',
- 'unique',
- 'boolean',
- ],
- [
- 'action',
- 'rules_list_item_add',
- 'pos',
- 'string',
- ],
- ];
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/AutoSaveTest.php b/modules/rules/tests/src/Unit/Integration/Engine/AutoSaveTest.php
deleted file mode 100644
index a06f1d5..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/AutoSaveTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-rulesExpressionManager->createRule();
- // Just leverage the entity save action, which by default uses auto-saving.
- $rule->addAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'entity')
- );
-
- $entity = $this->prophesizeEntity(EntityInterface::class);
- $entity->save()->shouldBeCalledTimes(1);
-
- RulesComponent::create($rule)
- ->addContextDefinition('entity', ContextDefinition::create('entity'))
- ->setContextValue('entity', $entity->reveal())
- ->execute();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/ExpressionSerializationTest.php b/modules/rules/tests/src/Unit/Integration/Engine/ExpressionSerializationTest.php
deleted file mode 100644
index 712acb1..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/ExpressionSerializationTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-rulesExpressionManager
- ->createAction('rules_test_string', ContextConfig::create()
- ->setValue('text', 'test')->toArray()
- );
- $serialized_expression = serialize($action);
- $action = unserialize($serialized_expression);
- $result = RulesComponent::create($action)
- ->provideContext('concatenated')
- ->execute();
- $this->assertSame('testtest', $result['concatenated']);
- }
-
- /**
- * Tests serializing condition expressions.
- */
- public function testConditionExpressionSerialization() {
- $condition = $this->rulesExpressionManager
- ->createCondition('rules_test_false', []);
- $serialized_expression = serialize($condition);
- $condition = unserialize($serialized_expression);
- $result = $condition->execute();
- $this->assertFalse($result);
- }
-
- /**
- * Tests condition container base class serialization.
- */
- public function testConditionContainerExpressionSerialization() {
- $expression = $this->rulesExpressionManager
- ->createAnd();
- $expression->addCondition('rules_test_false');
- $serialized_expression = serialize($expression);
- $expression = unserialize($serialized_expression);
- $result = $expression->execute();
- $this->assertFalse($result);
- }
-
- /**
- * Tests action container base class serialization.
- */
- public function testActionContainerExpressionSerialization() {
- $expression = $this->rulesExpressionManager
- ->createInstance('rules_action_set');
- $expression->addAction('rules_test_string', ContextConfig::create()
- ->setValue('text', 'test'));
- $serialized_expression = serialize($expression);
- $expression = unserialize($serialized_expression);
- $result = RulesComponent::create($expression)
- ->provideContext('concatenated')
- ->execute();
- $this->assertSame('testtest', $result['concatenated']);
- }
-
- /**
- * Tests rule serialization.
- */
- public function testRuleExpressionSerialization() {
- $expression = $this->rulesExpressionManager
- ->createRule();
- $expression->addAction('rules_test_string', ContextConfig::create()
- ->setValue('text', 'test'));
- $condition = $this->rulesExpressionManager
- ->createCondition('rules_test_false', []);
- $condition->negate(TRUE);
- $expression->addExpressionObject($condition);
-
- $serialized_expression = serialize($expression);
- $expression = unserialize($serialized_expression);
- $result = RulesComponent::create($expression)
- ->provideContext('concatenated')
- ->execute();
- $this->assertSame('testtest', $result['concatenated']);
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/IntegrityCheckTest.php b/modules/rules/tests/src/Unit/Integration/Engine/IntegrityCheckTest.php
deleted file mode 100644
index 2990d90..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/IntegrityCheckTest.php
+++ /dev/null
@@ -1,420 +0,0 @@
-rulesExpressionManager->createRule();
- $rule->addAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'entity')
- );
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('entity', ContextDefinition::create('entity'))
- ->checkIntegrity();
- $this->assertEquals(0, iterator_count($violation_list));
- }
-
- /**
- * Tests that a wrongly configured variable name triggers a violation.
- */
- public function testUnknownVariable() {
- $rule = $this->rulesExpressionManager->createRule();
- $action = $this->rulesExpressionManager->createAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'unknown_variable')
- ->toArray()
- );
- $rule->addExpressionObject($action);
-
- $violation_list = RulesComponent::create($rule)
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $violation = $violation_list[0];
- $this->assertEquals(
- 'Data selector unknown_variable for context Entity is invalid. Unable to get variable unknown_variable, it is not defined.',
- (string) $violation->getMessage()
- );
- $this->assertEquals($action->getUuid(), $violation->getUuid());
- }
-
- /**
- * Tests that the integrity check with UUID works.
- */
- public function testCheckUuid() {
- $rule = $this->rulesExpressionManager->createRule();
- // Just use a rule with 2 dummy actions.
- $rule->addAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'unknown_variable_1'));
- $second_action = $this->rulesExpressionManager->createAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'unknown_variable_2')
- ->toArray()
- );
- $rule->addExpressionObject($second_action);
-
- $all_violations = RulesComponent::create($rule)
- ->addContextDefinition('entity', ContextDefinition::create('entity'))
- ->checkIntegrity();
-
- $this->assertEquals(2, iterator_count($all_violations));
-
- $uuid_violations = $all_violations->getFor($second_action->getUuid());
- $this->assertEquals(1, count($uuid_violations));
- $violation = $uuid_violations[0];
- $this->assertEquals(
- 'Data selector unknown_variable_2 for context Entity is invalid. Unable to get variable unknown_variable_2, it is not defined.',
- (string) $violation->getMessage()
- );
- $this->assertEquals($second_action->getUuid(), $violation->getUuid());
- }
-
- /**
- * Tests that an invalid condition plugin ID results in a violation.
- */
- public function testInvalidCondition() {
- $rule = $this->rulesExpressionManager->createRule();
- $condition = $this->rulesExpressionManager->createCondition('invalid_condition_id');
- $rule->addExpressionObject($condition);
-
- $violations = RulesComponent::create($rule)->checkIntegrity();
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals('Condition plugin invalid_condition_id does not exist', (string) $violations[0]->getMessage());
- $this->assertEquals($condition->getUuid(), $violations[0]->getUuid());
- }
-
- /**
- * Tests that a missing condition plugin ID results in a violation.
- */
- public function testMissingCondition() {
- $rule = $this->rulesExpressionManager->createRule();
- $condition = $this->rulesExpressionManager->createCondition('');
- $rule->addExpressionObject($condition);
-
- $violations = RulesComponent::create($rule)->checkIntegrity();
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals('Condition plugin ID is missing', (string) $violations[0]->getMessage());
- $this->assertEquals($condition->getUuid(), $violations[0]->getUuid());
- }
-
- /**
- * Tests that an invalid action plugin ID results in a violation.
- */
- public function testInvalidAction() {
- $rule = $this->rulesExpressionManager->createRule();
- $action = $this->rulesExpressionManager->createAction('invalid_action_id');
- $rule->addExpressionObject($action);
-
- $violations = RulesComponent::create($rule)->checkIntegrity();
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals('Action plugin invalid_action_id does not exist', (string) $violations[0]->getMessage());
- $this->assertEquals($action->getUuid(), $violations[0]->getUuid());
- }
-
- /**
- * Tests that a missing action plugin ID results in a violation.
- */
- public function testMissingAction() {
- $rule = $this->rulesExpressionManager->createRule();
- $action = $this->rulesExpressionManager->createAction('');
- $rule->addExpressionObject($action);
-
- $violations = RulesComponent::create($rule)->checkIntegrity();
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals('Action plugin ID is missing', (string) $violations[0]->getMessage());
- $this->assertEquals($action->getUuid(), $violations[0]->getUuid());
- }
-
- /**
- * Tests invalid characters in provided variables.
- */
- public function testInvalidProvidedName() {
- $rule = $this->rulesExpressionManager->createRule();
-
- // The condition provides a "provided_text" variable.
- $condition = $this->rulesExpressionManager->createCondition('rules_test_provider', ContextConfig::create()
- ->provideAs('provided_text', 'invalid_näme')
- ->toArray()
- );
- $rule->addExpressionObject($condition);
-
- $violation_list = RulesComponent::create($rule)
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $this->assertEquals(
- 'Provided variable name invalid_näme contains not allowed characters.',
- (string) $violation_list[0]->getMessage()
- );
- $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
- }
-
- /**
- * Tests the input restriction on contexts.
- */
- public function testInputRestriction() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $action = $this->rulesExpressionManager->createAction('rules_entity_fetch_by_id', ContextConfig::create()
- // The entity type must be configured as value, so this provokes the
- // violation.
- ->map('type', 'variable_1')
- ->setValue('entity_id', 1)
- ->toArray()
- );
- $rule->addExpressionObject($action);
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('variable_1', ContextDefinition::create('string'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $this->assertEquals(
- 'The context Entity type may not be configured using a selector.',
- (string) $violation_list[0]->getMessage()
- );
- $this->assertEquals($action->getUuid(), $violation_list[0]->getUuid());
- }
-
- /**
- * Tests the data selector restriction on contexts.
- */
- public function testSelectorRestriction() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $action = $this->rulesExpressionManager->createAction('rules_data_set', ContextConfig::create()
- // Setting a data value is only possible with a selector, this will
- // trigger the violation.
- ->setValue('data', 'some value')
- ->setValue('value', 'some new value')
- ->toArray()
- );
- $rule->addExpressionObject($action);
-
- $violation_list = RulesComponent::create($rule)
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $this->assertEquals(
- 'The context Data may only be configured using a selector.',
- (string) $violation_list[0]->getMessage()
- );
- $this->assertEquals($action->getUuid(), $violation_list[0]->getUuid());
- }
-
- /**
- * Tests that a primitive context is assigned something that matches.
- */
- public function testPrimitiveTypeViolation() {
- $rule = $this->rulesExpressionManager->createRule();
-
- // The condition expects a string but we pass a list, which will trigger the
- // violation.
- $condition = $this->rulesExpressionManager->createCondition('rules_test_string_condition', ContextConfig::create()
- ->map('text', 'list_variable')
- ->toArray()
- );
- $rule->addExpressionObject($condition);
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('list_variable', ContextDefinition::create('list'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $this->assertEquals(
- 'Expected a string data type for context Text to compare but got a list data type instead.',
- (string) $violation_list[0]->getMessage()
- );
- $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
- }
-
- /**
- * Tests that a list context is assigned something that matches.
- */
- public function testListTypeViolation() {
- $rule = $this->rulesExpressionManager->createRule();
-
- // The condition expects a list for the type context but we pass a node
- // which will trigger the violation.
- $condition = $this->rulesExpressionManager->createCondition('rules_node_is_of_type', ContextConfig::create()
- ->map('node', 'node')
- ->map('types', 'node')
- ->toArray()
- );
- $rule->addExpressionObject($condition);
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('node', ContextDefinition::create('entity:node'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $this->assertEquals(
- 'Expected a list data type for context Content types but got a entity:node data type instead.',
- (string) $violation_list[0]->getMessage()
- );
- $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
- }
-
- /**
- * Tests that a complex data context is assigned something that matches.
- */
- public function testComplexTypeViolation() {
- $rule = $this->rulesExpressionManager->createRule();
-
- // The condition expects a node context but gets a list instead which cause
- // the violation.
- $condition = $this->rulesExpressionManager->createCondition('rules_node_is_of_type', ContextConfig::create()
- ->map('node', 'list_variable')
- ->map('types', 'list_variable')
- ->toArray()
- );
- $rule->addExpressionObject($condition);
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('list_variable', ContextDefinition::create('list'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- $this->assertEquals(
- 'Expected a entity:node data type for context Node but got a list data type instead.',
- (string) $violation_list[0]->getMessage()
- );
- $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
- }
-
- /**
- * Tests that an absent required context triggers a violation.
- */
- public function testMissingRequiredContext() {
- $rule = $this->rulesExpressionManager->createRule();
-
- // The condition is completely un-configured, missing 2 required contexts.
- $condition = $this->rulesExpressionManager->createCondition('rules_node_is_of_type');
- $rule->addExpressionObject($condition);
-
- $violation_list = RulesComponent::create($rule)
- ->checkIntegrity();
- $this->assertEquals(2, iterator_count($violation_list));
- $this->assertEquals(
- 'The required context Node is missing.',
- (string) $violation_list[0]->getMessage()
- );
- $this->assertEquals(
- 'The required context Content types is missing.',
- (string) $violation_list[1]->getMessage()
- );
- $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
- $this->assertEquals($condition->getUuid(), $violation_list[1]->getUuid());
- }
-
- /**
- * Make sure that nested expression violations have the correct UUID.
- */
- public function testNestedExpressionUuids() {
- $rule = $this->rulesExpressionManager->createRule();
- $action_set = $this->rulesExpressionManager->createInstance('rules_action_set');
- // The most inner action will trigger a violation for an unknown variable.
- $action = $this->rulesExpressionManager->createAction('rules_entity_save', ContextConfig::create()
- ->map('entity', 'unknown_variable')
- ->toArray()
- );
- $action_set->addExpressionObject($action);
- $rule->addExpressionObject($action_set);
-
- $violation_list = RulesComponent::create($rule)
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- // UUID must be that of the most inner action.
- $this->assertEquals($action->getUuid(), $violation_list[0]->getUuid());
- }
-
- /**
- * Tests using provided variables in sub-sequent actions passes checks.
- */
- public function testUsingProvidedVariables() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'any')
- ->setValue('value', 'foo')
- );
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'any')
- ->map('value', 'variable_added')
- );
-
- $violation_list = RulesComponent::create($rule)
- ->checkIntegrity();
- $this->assertEquals(0, iterator_count($violation_list));
- }
-
- /**
- * Tests that refined context is respected when checking context.
- */
- public function testRefinedContextViolation() {
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'integer')
- ->map('value', 'text')
- );
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('text', ContextDefinition::create('string'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- }
-
- /**
- * Tests context can be refined based upon mapped context.
- */
- public function testRefiningContextBasedonMappedContext() {
- // DataComparision condition refines context based on selected data. Thus
- // it for the test and ensure checking integrity passes when the comparison
- // value is of a compatible type and fails else.
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addCondition('rules_data_comparison', ContextConfig::create()
- ->map('data', 'text')
- ->map('value', 'text2')
- );
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('text', ContextDefinition::create('string'))
- ->addContextDefinition('text2', ContextDefinition::create('string'))
- ->checkIntegrity();
- $this->assertEquals(0, iterator_count($violation_list));
-
- $violation_list = RulesComponent::create($rule)
- ->addContextDefinition('text', ContextDefinition::create('string'))
- ->addContextDefinition('text2', ContextDefinition::create('integer'))
- ->checkIntegrity();
- $this->assertEquals(1, iterator_count($violation_list));
- }
-
- /**
- * Tests using provided variables with refined context.
- */
- public function testUsingRefinedProvidedVariables() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'string')
- ->setValue('value', 'foo')
- );
- $rule->addAction('rules_system_message', ContextConfig::create()
- ->map('message', 'variable_added')
- ->setValue('type', 'status')
- );
- // The message action requires a string, thus if the context is not refined
- // it will end up as "any" and integrity check would fail.
- $violation_list = RulesComponent::create($rule)
- ->checkIntegrity();
- $this->assertEquals(0, iterator_count($violation_list));
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/LoopTest.php b/modules/rules/tests/src/Unit/Integration/Engine/LoopTest.php
deleted file mode 100644
index 7c05771..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/LoopTest.php
+++ /dev/null
@@ -1,317 +0,0 @@
-enableModule('node');
- }
-
- /**
- * Tests that list items in the loop can be used during execution.
- */
- public function testListItemUsage() {
- // The rule contains a list of strings that will be concatenated into one
- // variable.
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'string')
- ->setValue('value', '')
- ->provideAs('variable_added', 'result')
- );
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
- $loop->addAction('rules_data_set', ContextConfig::create()
- ->map('data', 'result')
- ->setValue('value', '{{result}} {{list_item}}')
- ->process('value', 'rules_tokens')
- );
-
- $rule->addExpressionObject($loop);
-
- $result = RulesComponent::create($rule)
- ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
- ->provideContext('result')
- ->setContextValue('string_list', ['Hello', 'world', 'this', 'is', 'the',
- 'loop',
- ])
- ->execute();
-
- $this->assertEquals(' Hello world this is the loop', $result['result']);
- }
-
- /**
- * Tests that list items can be renamed for usage in nested loops.
- */
- public function testListItemRenaming() {
- // The rule contains a list of strings that will be concatenated into one
- // variable.
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'string')
- ->setValue('value', '')
- ->provideAs('variable_added', 'result')
- );
-
- $outer_loop = $this->rulesExpressionManager->createInstance('rules_loop', [
- 'list' => 'outer_list',
- 'list_item' => 'outer_item',
- ]);
- $outer_loop->addAction('rules_data_set', ContextConfig::create()
- ->map('data', 'result')
- ->setValue('value', '{{result}} {{outer_item}}')
- ->process('value', 'rules_tokens')
- );
-
- $inner_loop = $this->rulesExpressionManager->createInstance('rules_loop', [
- 'list' => 'inner_list',
- 'list_item' => 'inner_item',
- ]);
- $inner_loop->addAction('rules_data_set', ContextConfig::create()
- ->map('data', 'result')
- ->setValue('value', '{{result}} {{inner_item}}')
- ->process('value', 'rules_tokens')
- );
-
- $outer_loop->addExpressionObject($inner_loop);
- $rule->addExpressionObject($outer_loop);
-
- $result = RulesComponent::create($rule)
- ->addContextDefinition('outer_list', ContextDefinition::create('string')->setMultiple())
- ->addContextDefinition('inner_list', ContextDefinition::create('string')->setMultiple())
- ->provideContext('result')
- ->setContextValue('outer_list', ['Outer 1', 'Outer 2'])
- ->setContextValue('inner_list', ['Inner 1', 'Inner 2', 'Inner 3'])
- ->execute();
-
- $this->assertEquals(' Outer 1 Inner 1 Inner 2 Inner 3 Outer 2 Inner 1 Inner 2 Inner 3', $result['result']);
- }
-
- /**
- * Tests that a list can be chosen with a property path selector.
- */
- public function testPropertyPathList() {
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'string')
- ->setValue('value', '')
- ->provideAs('variable_added', 'result')
- );
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
- 'list' => 'node.field_text',
- ]);
- $loop->addAction('rules_data_set', ContextConfig::create()
- ->map('data', 'result')
- ->setValue('value', '{{result}} {{list_item}}')
- ->process('value', 'rules_tokens')
- );
-
- $rule->addExpressionObject($loop);
-
- // Create a fake field for the fake node for testing.
- $list_definition = $this->typedDataManager->createListDataDefinition('string');
- $field_text = new FieldItemList($list_definition);
- $field_text->setValue(['Hello', 'world', 'this', 'is', 'the', 'loop']);
-
- $node = $this->prophesizeEntity(NodeInterface::class);
- $node->get('field_text')->willReturn($field_text);
-
- // We cannot use EntityDataDefinitionInterface here because the context
- // system in core violates the interface and relies on the actuoal class.
- // @see https://www.drupal.org/node/2660216
- $node_definition = $this->prophesize(EntityDataDefinition::class);
- $node_definition->getPropertyDefinition("field_text")->willReturn($list_definition);
-
- $context_definition = $this->getContextDefinitionFor('entity:node', $node_definition);
-
- $component = RulesComponent::create($rule)
- ->addContextDefinition('node', $context_definition)
- ->provideContext('result')
- ->setContextValue('node', $node->reveal());
-
- $violations = $component->checkIntegrity();
- $this->assertEquals(0, iterator_count($violations));
-
- $result = $component->execute();
-
- $this->assertEquals(' Hello world this is the loop', $result['result']);
- }
-
- /**
- * Test the integrity check for loop item names that conflict with others.
- */
- public function testItemNameConflict() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
- 'list' => 'string_list',
- 'list_item' => 'existing_name',
- ]);
-
- $rule->addExpressionObject($loop);
-
- $violations = RulesComponent::create($rule)
- ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
- ->addContextDefinition('existing_name', ContextDefinition::create('string'))
- ->checkIntegrity();
-
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals(
- 'List item name existing_name conflicts with an existing variable.',
- (string) $violations[0]->getMessage()
- );
- }
-
- /**
- * Tests that the specified list variable exists in the execution state.
- */
- public function testListExists() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
- 'list' => 'unknown_list',
- ]);
-
- $rule->addExpressionObject($loop);
-
- $violations = RulesComponent::create($rule)
- ->checkIntegrity();
-
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals(
- 'List variable unknown_list does not exist. Unable to get variable unknown_list, it is not defined.',
- (string) $violations[0]->getMessage()
- );
- }
-
- /**
- * Tests that a loop must have a list configured.
- */
- public function testMissingList() {
- $rule = $this->rulesExpressionManager->createRule();
-
- // Empty loop configuration, 'list' is missing.
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', []);
- $rule->addExpressionObject($loop);
-
- $violations = RulesComponent::create($rule)
- ->checkIntegrity();
-
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals(
- 'List variable is missing.',
- (string) $violations[0]->getMessage()
- );
- }
-
- /**
- * Tests that a variable used in an action within the loop exists.
- */
- public function testWrongVariableInAction() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
- $loop->addAction('rules_test_string', ContextConfig::create()
- ->map('text', 'unknown_variable')
- );
-
- $rule->addExpressionObject($loop);
-
- $violations = RulesComponent::create($rule)
- ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
- ->checkIntegrity();
-
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals(
- 'Data selector unknown_variable for context Text to concatenate is invalid. Unable to get variable unknown_variable, it is not defined.',
- (string) $violations[0]->getMessage()
- );
- }
-
- /**
- * Tests that the data type used to loop over is a list.
- */
- public function testInvalidListType() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
- 'list' => 'string_variable',
- ]);
-
- $rule->addExpressionObject($loop);
-
- $violations = RulesComponent::create($rule)
- ->addContextDefinition('string_variable', ContextDefinition::create('string'))
- ->checkIntegrity();
-
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals(
- 'The data type of list variable string_variable is not a list.',
- (string) $violations[0]->getMessage()
- );
- }
-
- /**
- * Tests that the loop list item variable is not available after the loop.
- */
- public function testOutOfScopeVariable() {
- $rule = $this->rulesExpressionManager->createRule();
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-
- $rule->addExpressionObject($loop);
- $rule->addAction('rules_test_string', ContextConfig::create()
- ->map('text', 'list_item')
- );
-
- $violations = RulesComponent::create($rule)
- ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
- ->checkIntegrity();
-
- $this->assertEquals(1, iterator_count($violations));
- $this->assertEquals(
- 'Data selector list_item for context Text to concatenate is invalid. Unable to get variable list_item, it is not defined.',
- (string) $violations[0]->getMessage()
- );
- }
-
- /**
- * Tests that the loop list item variable is not available after the loop.
- */
- public function testOutOfScopeVariableExecution() {
- // Set the expected exception class and message.
- $this->setExpectedException('\Drupal\rules\Exception\EvaluationException', 'Unable to get variable list_item, it is not defined.');
-
- $rule = $this->rulesExpressionManager->createRule();
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-
- $rule->addExpressionObject($loop);
- $rule->addAction('rules_test_string', ContextConfig::create()
- ->map('text', 'list_item')
- );
-
- RulesComponent::create($rule)
- ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
- ->setContextValue('string_list', ['one', 'two'])
- ->execute();
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php b/modules/rules/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
deleted file mode 100644
index 3a9a809..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-rulesExpressionManager->createRule();
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'string')
- ->setValue('value', '')
- ->provideAs('variable_added', 'result')
- );
-
- $state = ExecutionMetadataState::create();
- $found = $rule->prepareExecutionMetadataState($state);
- $this->assertTrue($state->hasDataDefinition('result'));
- $this->assertNull($found);
- }
-
- /**
- * Tests partial state setup until an expression is reached in the tree.
- */
- public function testPreparingUntil() {
- // Setup a rule with 2 actions.
- $rule = $this->rulesExpressionManager->createRule();
- $rule->addAction('rules_variable_add', ContextConfig::create()
- ->setValue('type', 'string')
- ->setValue('value', '')
- ->provideAs('variable_added', 'result1')
- );
- $second_action = $this->rulesExpressionManager->createAction('rules_variable_add')
- ->setConfiguration(ContextConfig::create()
- ->setValue('type', 'string')
- ->setValue('value', '')
- ->provideAs('variable_added', 'result2')
- ->toArray()
- );
- $rule->addExpressionObject($second_action);
-
- $state = ExecutionMetadataState::create();
- // Preparing the state until the second action means the variable of the
- // first action is available, but the second is not yet.
- $found = $rule->prepareExecutionMetadataState($state, $second_action);
- $this->assertTrue($state->hasDataDefinition('result1'));
- $this->assertFalse($state->hasDataDefinition('result2'));
- $this->assertTrue($found);
- }
-
- /**
- * Tests that state preparation also works for actions in a loop.
- */
- public function testPrepareInLoop() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
- $action = $this->rulesExpressionManager->createAction('rules_test_string')
- ->setConfiguration(ContextConfig::create()
- ->setValue('text', 'x')
- ->toArray()
- );
- $loop->addExpressionObject($action);
-
- $rule->addExpressionObject($loop);
-
- $state = RulesComponent::create($rule)
- ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
- ->getMetadataState();
-
- $found = $rule->prepareExecutionMetadataState($state, $action);
- $this->assertTrue($state->hasDataDefinition('list_item'));
- $this->assertTrue($found);
- }
-
- /**
- * Tests that the loop list item is removed after the loop.
- */
- public function testPrepareAfterLoop() {
- $rule = $this->rulesExpressionManager->createRule();
-
- $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
- $action = $this->rulesExpressionManager->createAction('rules_test_string')
- ->setConfiguration(ContextConfig::create()
- ->setValue('text', 'x')
- ->toArray()
- );
- $loop->addExpressionObject($action);
-
- $rule->addExpressionObject($loop);
-
- $state = RulesComponent::create($rule)
- ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
- ->getMetadataState();
-
- $found = $rule->prepareExecutionMetadataState($state);
- $this->assertFalse($state->hasDataDefinition('list_item'));
- $this->assertNull($found);
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/RulesComponentTest.php b/modules/rules/tests/src/Unit/Integration/Engine/RulesComponentTest.php
deleted file mode 100644
index c4beb7c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/RulesComponentTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-rulesExpressionManager->createRule();
-
- $rule->addAction('rules_test_string',
- ContextConfig::create()->map('text', 'text')
- );
-
- $result = RulesComponent::create($rule)
- ->addContextDefinition('text', ContextDefinition::create('string'))
- ->provideContext('concatenated')
- ->setContextValue('text', 'foo')
- ->execute();
-
- // Ensure the provided context is returned.
- $this->assertTrue(isset($result['concatenated']) && $result['concatenated'] == 'foofoo');
- }
-
- /**
- * @cover ::getExpression()
- */
- public function testGetExpression() {
- $rule = $this->rulesExpressionManager->createRule();
- $this->assertSame(RulesComponent::create($rule)->getExpression(), $rule);
- }
-
- /**
- * @cover ::getContextDefinitions()
- */
- public function testGetContextDefinitions() {
- $rule = $this->rulesExpressionManager->createRule();
- $definition = ContextDefinition::create('string');
- $component = RulesComponent::create($rule)
- ->addContextDefinition('test', $definition);
-
- $this->assertEquals(array_keys($component->getContextDefinitions()), ['test']);
- $this->assertSame($component->getContextDefinitions()['test'], $definition);
- }
-
- /**
- * @cover ::getProvidedContext()
- */
- public function testGetProvidedContext() {
- $rule = $this->rulesExpressionManager->createRule();
- $component = RulesComponent::create($rule)
- ->provideContext('test');
-
- $this->assertEquals($component->getProvidedContext(), ['test']);
- }
-
- /**
- * @cover ::getState()
- */
- public function testGetState() {
- $rule = $this->rulesExpressionManager->createRule();
- $component = RulesComponent::create($rule);
- $this->assertInstanceOf(ExecutionStateInterface::class, $component->getState());
-
- // Test that set context values are available in the state.
- $component
- ->addContextDefinition('foo', ContextDefinition::create('string'))
- ->setContextValue('foo', 'bar');
-
- $this->assertEquals($component->getState()->getVariableValue('foo'), 'bar');
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityDeleteTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityDeleteTest.php
deleted file mode 100644
index 6e6918e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityDeleteTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-eventManager->getDefinition('rules_entity_delete:test');
- $this->assertSame('After deleting test', (string) $plugin_definition['label']);
- $context_definition = $plugin_definition['context']['test'];
- $this->assertSame('entity:test', $context_definition->getDataType());
- $this->assertSame('Test', $context_definition->getLabel());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityInsertTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityInsertTest.php
deleted file mode 100644
index 55b94fa..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityInsertTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-eventManager->getDefinition('rules_entity_insert:test');
- $this->assertSame('After saving new test', (string) $plugin_definition['label']);
- $context_definition = $plugin_definition['context']['test'];
- $this->assertSame('entity:test', $context_definition->getDataType());
- $this->assertSame('Test', $context_definition->getLabel());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityPresaveTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityPresaveTest.php
deleted file mode 100644
index 38ce7d2..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityPresaveTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-eventManager->getDefinition('rules_entity_presave:test');
- $this->assertSame('Before saving test', (string) $plugin_definition['label']);
- $context_definition = $plugin_definition['context']['test'];
- $this->assertSame('entity:test', $context_definition->getDataType());
- $this->assertSame('Test', $context_definition->getLabel());
-
- // Also check that there is a context for the orginal entity.
- $context_definition = $plugin_definition['context']['test_unchanged'];
- $this->assertSame('entity:test', $context_definition->getDataType());
- $this->assertSame('Unchanged Test', (string) $context_definition->getLabel());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityUpdateTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityUpdateTest.php
deleted file mode 100644
index b6133af..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityUpdateTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-eventManager->getDefinition('rules_entity_update:test');
- $this->assertSame('After updating test', (string) $plugin_definition['label']);
- $context_definition = $plugin_definition['context']['test'];
- $this->assertSame('entity:test', $context_definition->getDataType());
- $this->assertSame('Test', $context_definition->getLabel());
-
- // Also check that there is a context for the orginal entity.
- $context_definition = $plugin_definition['context']['test_unchanged'];
- $this->assertSame('entity:test', $context_definition->getDataType());
- $this->assertSame('Unchanged Test', (string) $context_definition->getLabel());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityViewTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityViewTest.php
deleted file mode 100644
index 14376e4..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityViewTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-eventManager->getDefinition('rules_entity_view:test');
- $this->assertSame('Test is viewed', (string) $plugin_definition['label']);
- $context_definition = $plugin_definition['context']['test'];
- $this->assertSame('entity:test', $context_definition->getDataType());
- $this->assertSame('Test', $context_definition->getLabel());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EventTestBase.php b/modules/rules/tests/src/Unit/Integration/Event/EventTestBase.php
deleted file mode 100644
index c1b56fd..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EventTestBase.php
+++ /dev/null
@@ -1,32 +0,0 @@
-moduleHandler->getModuleDirectories()
- ->willReturn(['rules' => __DIR__ . '/../../../../../']);
- $this->eventManager = new RulesEventManager($this->moduleHandler->reveal());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/SystemLoggerEventTest.php b/modules/rules/tests/src/Unit/Integration/Event/SystemLoggerEventTest.php
deleted file mode 100644
index 9a3a4ba..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/SystemLoggerEventTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-eventManager->createInstance('rules_system_logger_event');
- $logger_entry = $event->getContextDefinition('logger_entry');
-
- // @todo: create a TypedData logger-entry object: https://www.drupal.org/node/2625238
- $this->assertSame('any', $logger_entry->getDataType());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/UserLoginTest.php b/modules/rules/tests/src/Unit/Integration/Event/UserLoginTest.php
deleted file mode 100644
index 9322800..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/UserLoginTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-eventManager->createInstance('rules_user_login');
- $user_context_definition = $event->getContextDefinition('account');
- $this->assertSame('entity:user', $user_context_definition->getDataType());
- $this->assertSame('Logged in user', $user_context_definition->getLabel());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/UserLogoutTest.php b/modules/rules/tests/src/Unit/Integration/Event/UserLogoutTest.php
deleted file mode 100644
index 8fece37..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/UserLogoutTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-eventManager->createInstance('rules_user_logout');
- $user_context_definition = $event->getContextDefinition('account');
- $this->assertSame('entity:user', $user_context_definition->getDataType());
- $this->assertSame('Logged out user', $user_context_definition->getLabel());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesActionManagerTest.php b/modules/rules/tests/src/Unit/Integration/RulesAction/RulesActionManagerTest.php
deleted file mode 100644
index f451475..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesActionManagerTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-actionManager->getDefinitions();
- // Make sure all context definitions are using the class provided by Rules.
- foreach ($definitions as $definition) {
- if (!empty($definition['context'])) {
- foreach ($definition['context'] as $context_definition) {
- $this->assertInstanceOf(ContextDefinitionInterface::class, $context_definition);
- }
- }
- }
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesAdminAccessTest.php b/modules/rules/tests/src/Unit/Integration/RulesAction/RulesAdminAccessTest.php
deleted file mode 100644
index ef1b1c2..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesAdminAccessTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-prophesize(AccountInterface::class);
- $super_admin->hasPermission(Argument::any())->willReturn(TRUE);
-
- $power_user = $this->prophesize(AccountInterface::class);
- $power_user->hasPermission('admin this plugin')->willReturn(TRUE);
- $power_user->hasPermission(Argument::any())->willReturn(FALSE);
-
- $joe_user = $this->prophesize(AccountInterface::class);
- $joe_user->hasPermission(Argument::any())->willReturn(FALSE);
-
- // Our plug-in will behave as if it has the annotation property
- // 'configuration_access'. getPluginDefinition should be called only
- // twice, since the super admin should get approval before it is called.
- // I use getMockBuilder since I need the actual code from the
- // RulesActionBase class for the test.
- $action = $this->getMockBuilder(RulesActionBase::class)
- ->disableOriginalConstructor()
- ->setMethods(['getPluginDefinition'])
- ->getMockForAbstractClass();
-
- $action
- ->expects($this->exactly(2))
- ->method('getPluginDefinition')
- ->willReturn([
- 'plugin_id' => 'some_action',
- 'configure_permissions' => ['admin this plugin'],
- ]);
-
- $user = $super_admin->reveal();
- $this->assertTrue($action->checkConfigurationAccess($user), "Super-user has admin access");
-
- $user = $power_user->reveal();
- $this->assertTrue($action->checkConfigurationAccess($user), "Power-user has admin access");
-
- $user = $joe_user->reveal();
- $this->assertFalse($action->checkConfigurationAccess($user), "Ordinary user lacks admin access");
-
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesEntityIntegrationTestBase.php b/modules/rules/tests/src/Unit/Integration/RulesEntityIntegrationTestBase.php
deleted file mode 100644
index 85a06d0..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesEntityIntegrationTestBase.php
+++ /dev/null
@@ -1,177 +0,0 @@
-root . '/core/includes/entity.inc';
-
- $this->namespaces['Drupal\\Core\\Entity'] = $this->root . '/core/lib/Drupal/Core/Entity';
-
- $language = $this->prophesize(LanguageInterface::class);
- $language->getId()->willReturn('en');
-
- $this->languageManager = $this->prophesize(LanguageManagerInterface::class);
- $this->languageManager->getCurrentLanguage()->willReturn($language->reveal());
- $this->languageManager->getLanguages()->willReturn([$language->reveal()]);
-
- // We need to support multiple entity types, including a test type:
- $type_info = [
- 'test' => [
- 'id' => 'test',
- 'label' => 'Test',
- 'entity_keys' => [
- 'bundle' => 'bundle',
- ],
- ],
- 'user' => [
- 'id' => 'user',
- 'label' => 'Test User',
- 'entity_keys' => [
- 'bundle' => 'user',
- ],
- ],
- 'node' => [
- 'id' => 'node',
- 'label' => 'Test Node',
- 'entity_keys' => [
- 'bundle' => 'dummy',
- ],
- ],
- ];
-
- $type_array = [];
-
- foreach ($type_info as $type => $info) {
- $entity_type = new ContentEntityType($info);
- $type_array[$type] = $entity_type;
-
- $this->entityTypeManager->getDefinition($type)
- ->willReturn($entity_type);
- $this->entityManager->getDefinition($type)
- ->willReturn($entity_type);
- }
-
- // We need a user_role mock as well.
- $role_entity_info = [
- 'id' => 'user_role',
- 'label' => 'Test Role',
- ];
- $role_type = new ConfigEntityType($role_entity_info);
- $type_array['user_role'] = $role_type;
-
- $this->entityTypeManager->getDefinitions()
- ->willReturn($type_array);
- $this->entityManager->getDefinitions()
- ->willReturn($type_array);
-
- $this->entityAccess = $this->prophesize(EntityAccessControlHandlerInterface::class);
-
- $this->entityTypeManager->getAccessControlHandler(Argument::any())
- ->willReturn($this->entityAccess->reveal());
-
- // The base field definitions for our test entity aren't used, and would
- // require additional mocking. It doesn't appear that any of our tests rely
- // on this for any other entity type that we are mocking.
- $this->entityFieldManager->getBaseFieldDefinitions(Argument::any())->willReturn([]);
- $this->entityManager->getBaseFieldDefinitions(Argument::any())->willReturn([]);
-
- // Return some dummy bundle information for now, so that the entity manager
- // does not call out to the config entity system to get bundle information.
- $this->entityTypeBundleInfo->getBundleInfo(Argument::any())
- ->willReturn(['test' => ['label' => 'Test']]);
-
- $this->entityManager->getBundleInfo(Argument::any())
- ->willReturn(['test' => ['label' => 'Test']]);
-
- $this->moduleHandler->getImplementations('entity_type_build')
- ->willReturn([]);
-
- $this->fieldTypeManager = new FieldTypePluginManager(
- $this->namespaces, $this->cacheBackend, $this->moduleHandler->reveal(), $this->typedDataManager
- );
- $this->container->set('plugin.manager.field.field_type', $this->fieldTypeManager);
- }
-
- /**
- * Helper to mock a context definition with a mocked data definition.
- *
- * @param string $data_type
- * The data type, example "entity:node".
- * @param \Prophecy\Prophecy\ProphecyInterface $data_definition
- * A prophecy that represents a data definition object.
- *
- * @return \Drupal\rules\Context\ContextDefinition
- * The context definition with the data definition prophecy in it.
- */
- protected function getContextDefinitionFor($data_type, ProphecyInterface $data_definition) {
- // Mock all the setter calls on the data definition that can be ignored.
- $data_definition->setLabel(Argument::any())->willReturn($data_definition->reveal());
- $data_definition->setDescription(Argument::any())->willReturn($data_definition->reveal());
- $data_definition->setRequired(Argument::any())->willReturn($data_definition->reveal());
- $data_definition->setLabel(Argument::any())->willReturn($data_definition->reveal());
- $data_definition->setConstraints(Argument::any())->willReturn($data_definition->reveal());
-
- $data_definition->getConstraints()->willReturn([]);
- $data_definition->getDataType()->willReturn($data_type);
-
- $original_definition = $this->typedDataManager->getDefinition($data_type);
- $data_definition->getClass()->willReturn($original_definition['class']);
-
- $context_definition = ContextDefinition::create($data_type);
-
- // Inject a fake typed data manger that will return our data definition
- // prophecy if asked for it in the ContextDefinition class.
- $typed_data_manager = $this->prophesize(TypedDataManagerInterface::class);
- $typed_data_manager->createDataDefinition($data_type)->willReturn($data_definition->reveal());
- $context_definition->setTypedDataManager($typed_data_manager->reveal());
-
- return $context_definition;
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesIntegrationTestBase.php b/modules/rules/tests/src/Unit/Integration/RulesIntegrationTestBase.php
deleted file mode 100644
index 3cf226e..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesIntegrationTestBase.php
+++ /dev/null
@@ -1,298 +0,0 @@
-moduleHandler = $this->prophesize(ModuleHandlerInterface::class);
-
- // Set all the modules as being existent.
- $this->enabledModules = new \ArrayObject();
- $this->enabledModules['rules'] = TRUE;
- $this->enabledModules['rules_test'] = TRUE;
- $enabled_modules = $this->enabledModules;
- $this->moduleHandler->moduleExists(Argument::type('string'))
- ->will(function ($arguments) use ($enabled_modules) {
- return [$arguments[0], $enabled_modules[$arguments[0]]];
- });
-
- // Wed don't care about alter() calls on the module handler.
- $this->moduleHandler->alter(Argument::any(), Argument::any(), Argument::any(), Argument::any())
- ->willReturn(NULL);
-
- $this->cacheBackend = new NullBackend('rules');
- $rules_directory = __DIR__ . '/../../../..';
- $this->namespaces = new \ArrayObject([
- 'Drupal\\rules' => $rules_directory . '/src',
- 'Drupal\\rules_test' => $rules_directory . '/tests/modules/rules_test/src',
- 'Drupal\\Core\\TypedData' => $this->root . '/core/lib/Drupal/Core/TypedData',
- 'Drupal\\Core\\Validation' => $this->root . '/core/lib/Drupal/Core/Validation',
- ]);
-
- $this->actionManager = new RulesActionManager($this->namespaces, $this->cacheBackend, $this->moduleHandler->reveal());
- $this->conditionManager = new ConditionManager($this->namespaces, $this->cacheBackend, $this->moduleHandler->reveal());
-
- $uuid_service = new Php();
- $this->rulesExpressionManager = new ExpressionManager($this->namespaces, $this->moduleHandler->reveal(), $uuid_service);
-
- $this->classResolver = $this->prophesize(ClassResolverInterface::class);
-
- $this->typedDataManager = new TypedDataManager(
- $this->namespaces,
- $this->cacheBackend,
- $this->moduleHandler->reveal(),
- $this->classResolver->reveal()
- );
- $this->rulesDataProcessorManager = new DataProcessorManager($this->namespaces, $this->moduleHandler->reveal());
-
- $this->aliasManager = $this->prophesize(AliasManagerInterface::class);
-
- // Keep the deprecated entity manager around because it is still used in a
- // few places.
- $this->entityManager = $this->prophesize(EntityManagerInterface::class);
-
- $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class);
- $this->entityTypeManager->getDefinitions()->willReturn([]);
-
- // Setup a rules_component storage mock which returns nothing by default.
- $storage = $this->prophesize(ConfigEntityStorageInterface::class);
- $storage->loadMultiple(NULL)->willReturn([]);
- $this->entityTypeManager->getStorage('rules_component')->willReturn($storage->reveal());
-
- $this->entityFieldManager = $this->prophesize(EntityFieldManagerInterface::class);
- $this->entityFieldManager->getBaseFieldDefinitions()->willReturn([]);
-
- $this->entityTypeBundleInfo = $this->prophesize(EntityTypeBundleInfoInterface::class);
- $this->entityTypeBundleInfo->getBundleInfo()->willReturn([]);
-
- $this->dataFetcher = new DataFetcher();
-
- $this->dataFilterManager = new DataFilterManager($this->namespaces, $this->moduleHandler->reveal());
- $this->placeholderResolver = new PlaceholderResolver($this->dataFetcher, $this->dataFilterManager);
-
- $container->set('entity.manager', $this->entityManager->reveal());
- $container->set('entity_type.manager', $this->entityTypeManager->reveal());
- $container->set('entity_field.manager', $this->entityFieldManager->reveal());
- $container->set('entity_type.bundle.info', $this->entityTypeBundleInfo->reveal());
- $container->set('context.repository', new LazyContextRepository($container, []));
- $container->set('path.alias_manager', $this->aliasManager->reveal());
- $container->set('plugin.manager.rules_action', $this->actionManager);
- $container->set('plugin.manager.condition', $this->conditionManager);
- $container->set('plugin.manager.rules_expression', $this->rulesExpressionManager);
- $container->set('plugin.manager.rules_data_processor', $this->rulesDataProcessorManager);
- $container->set('typed_data_manager', $this->typedDataManager);
- $container->set('string_translation', $this->getStringTranslationStub());
- $container->set('uuid', $uuid_service);
- $container->set('typed_data.data_fetcher', $this->dataFetcher);
- $container->set('typed_data.placeholder_resolver', $this->placeholderResolver);
-
- \Drupal::setContainer($container);
- $this->container = $container;
- }
-
- /**
- * Fakes the enabling of a module and adds its namespace for plugin loading.
- *
- * Default behaviour works fine for core modules.
- *
- * @param string $name
- * The name of the module that's gonna be enabled.
- * @param array $namespaces
- * Map of the association between module's namespaces and filesystem paths.
- */
- protected function enableModule($name, array $namespaces = []) {
- $this->enabledModules[$name] = TRUE;
-
- if (empty($namespaces)) {
- $namespaces = ['Drupal\\' . $name => $this->root . '/core/modules/' . $name . '/src'];
- }
- foreach ($namespaces as $namespace => $path) {
- $this->namespaces[$namespace] = $path;
- }
- }
-
- /**
- * Returns a typed data object.
- *
- * This helper for quick creation of typed data objects.
- *
- * @param string $data_type
- * The data type to create an object for.
- * @param mixed $value
- * The value to set.
- *
- * @return \Drupal\Core\TypedData\TypedDataInterface
- * The created object.
- */
- protected function getTypedData($data_type, $value) {
- $definition = $this->typedDataManager->createDataDefinition($data_type);
- $data = $this->typedDataManager->create($definition);
- $data->setValue($value);
- return $data;
- }
-
- /**
- * Helper method to mock irrelevant cache methods on entities.
- *
- * @param string $interface
- * The interface that should be mocked, example: EntityInterface::class.
- *
- * @return \Drupal\Core\Entity\EntityInterface|\Prophecy\Prophecy\ProphecyInterface
- * The mocked entity.
- */
- protected function prophesizeEntity($interface) {
- $entity = $this->prophesize($interface);
- // Cache methods are irrelevant for the tests but might be called.
- $entity->getCacheContexts()->willReturn([]);
- $entity->getCacheTags()->willReturn([]);
- $entity->getCacheMaxAge()->willReturn(0);
- return $entity;
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/RuleTest.php b/modules/rules/tests/src/Unit/RuleTest.php
deleted file mode 100644
index 6ec8957..0000000
--- a/modules/rules/tests/src/Unit/RuleTest.php
+++ /dev/null
@@ -1,254 +0,0 @@
-expressionManager = $this->prophesize(ExpressionManagerInterface::class);
-
- $this->conditions = new RulesAnd([], 'rules_and', [], $this->expressionManager->reveal());
- $this->expressionManager->createInstance('rules_and', [])->willReturn($this->conditions);
-
- $this->actions = new ActionSet([], 'rules_action_set', [], $this->expressionManager->reveal());
- $this->expressionManager->createInstance('rules_action_set', [])->willReturn($this->actions);
-
- $this->rule = new Rule([], 'rules_rule', [], $this->expressionManager->reveal());
- }
-
- /**
- * Tests that a rule is constructed with condition and action containers.
- *
- * @covers ::__construct
- */
- public function testContainersOnConstruct() {
- $this->assertSame($this->conditions, $this->rule->getConditions());
- $this->assertSame($this->actions, $this->rule->getActions());
- }
-
- /**
- * Tests the condition container setter and getter.
- *
- * @covers ::setConditions
- * @covers ::getConditions
- */
- public function testSetConditionsGetConditions() {
- $or = new RulesOr([], 'rules_or', [], $this->expressionManager->reveal());
- $this->rule->setConditions($or);
- $this->assertSame($or, $this->rule->getConditions());
-
- $and = new RulesAnd([], 'rules_and', [], $this->expressionManager->reveal());
- $this->rule->setConditions($and);
- $this->assertSame($and, $this->rule->getConditions());
- }
-
- /**
- * Tests the condition container setter and getter.
- *
- * @covers ::setActions
- * @covers ::getActions
- */
- public function testSetActionsGetActions() {
- $action_set = new ActionSet([], '', [], $this->expressionManager->reveal());
- $this->rule->setActions($action_set);
- $this->assertSame($action_set, $this->rule->getActions());
- }
-
- /**
- * Tests that an action fires if a condition passes.
- *
- * @covers ::execute
- */
- public function testActionExecution() {
- // The method on the test action must be called once.
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $this->rule
- ->addExpressionObject($this->trueConditionExpression->reveal())
- ->addExpressionObject($this->testActionExpression->reveal())
- ->execute();
- }
-
- /**
- * Tests that an action does not fire if a condition fails.
- *
- * @covers ::execute
- */
- public function testConditionFails() {
- // The execute method on the action must never be called.
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldNotBeCalled();
-
- $this->rule
- ->addExpressionObject($this->falseConditionExpression->reveal())
- ->addExpressionObject($this->testActionExpression->reveal())
- ->execute();
- }
-
- /**
- * Tests that an action fires if a condition passes.
- *
- * @covers ::execute
- */
- public function testTwoConditionsTrue() {
- // The method on the test action must be called once.
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $second_condition = $this->prophesize(ConditionExpressionInterface::class);
- $second_condition->getUuid()->willReturn('true_uuid2');
-
- $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
- ->willReturn(TRUE);
-
- $this->rule
- ->addExpressionObject($this->trueConditionExpression->reveal())
- ->addExpressionObject($second_condition->reveal())
- ->addExpressionObject($this->testActionExpression->reveal())
- ->execute();
- }
-
- /**
- * Tests that an action does not fire if a condition fails.
- *
- * @covers ::execute
- */
- public function testTwoConditionsFalse() {
- // The execute method on the action must never be called.
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldNotBeCalled();
-
- $this->rule
- ->addExpressionObject($this->trueConditionExpression->reveal())
- ->addExpressionObject($this->falseConditionExpression->reveal())
- ->addExpressionObject($this->testActionExpression->reveal())
- ->execute();
- }
-
- /**
- * Tests that nested rules are properly executed.
- *
- * @covers ::execute
- */
- public function testNestedRules() {
- $this->testActionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $nested = new Rule([], 'rules_rule', [], $this->expressionManager->reveal());
- // We need to replace the action and conditon container to not have the same
- // instances as in the outer rule.
- $nested->setConditions(new RulesAnd([], 'rules_and', [], $this->expressionManager->reveal()));
- $nested->setActions(new ActionSet([], 'rules_action_set', [], $this->expressionManager->reveal()));
-
- $nested->addExpressionObject($this->trueConditionExpression->reveal())
- ->addExpressionObject($this->testActionExpression->reveal());
-
- $this->rule
- ->addExpressionObject($this->trueConditionExpression->reveal())
- ->addExpressionObject($nested)
- ->execute();
- }
-
- /**
- * Tests that a nested expression can be retrieved by UUID.
- */
- public function testLookupExpression() {
- // Test Conditions.
- $this->rule->addExpressionObject($this->trueConditionExpression->reveal());
- $uuid = $this->trueConditionExpression->reveal()->getUuid();
- $this->assertSame($this->trueConditionExpression->reveal(), $this->rule->getExpression($uuid));
-
- // Test actions.
- $this->rule->addExpressionObject($this->testActionExpression->reveal());
- $uuid = $this->testActionExpression->reveal()->getUuid();
- $this->assertSame($this->testActionExpression->reveal(), $this->rule->getExpression($uuid));
-
- $this->assertFalse($this->rule->getExpression('invalid UUID'));
- }
-
- /**
- * Tests that removing expressions by indices works.
- */
- public function testDeletingExpressions() {
- // Create a rule with 2 conditions and 2 actions.
- $this->rule->addExpressionObject($this->trueConditionExpression->reveal());
- $this->rule->addExpressionObject($this->falseConditionExpression->reveal());
- $this->rule->addExpressionObject($this->testActionExpression->reveal());
- $second_action = $this->prophesize(RulesAction::class);
- $second_action->getUuid()->willReturn('action_uuid2');
- $this->rule->addExpressionObject($second_action->reveal());
-
- // Delete the first action.
- $uuid = $this->testActionExpression->reveal()->getUuid();
- $this->rule->deleteExpression($uuid);
- $this->assertEquals(2, count($this->rule->getConditions()->getIterator()));
- $this->assertEquals(1, count($this->rule->getActions()->getIterator()));
-
- // Delete the second condition.
- $uuid = $this->falseConditionExpression->reveal()->getUuid();
- $this->rule->deleteExpression($uuid);
- $this->assertEquals(1, count($this->rule->getConditions()->getIterator()));
- $this->assertEquals(1, count($this->rule->getActions()->getIterator()));
-
- // Delete the remaining action.
- $uuid = $second_action->reveal()->getUuid();
- $this->rule->deleteExpression($uuid);
- $this->assertEquals(1, count($this->rule->getConditions()->getIterator()));
- $this->assertEquals(0, count($this->rule->getActions()->getIterator()));
-
- // Delete the remaining condition, rule should be empty now.
- $uuid = $this->trueConditionExpression->reveal()->getUuid();
- $this->rule->deleteExpression($uuid);
- $this->assertEquals(0, count($this->rule->getConditions()->getIterator()));
- $this->assertEquals(0, count($this->rule->getActions()->getIterator()));
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesActionBaseTest.php b/modules/rules/tests/src/Unit/RulesActionBaseTest.php
deleted file mode 100644
index eb59a76..0000000
--- a/modules/rules/tests/src/Unit/RulesActionBaseTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-setExpectedException('\Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException');
-
- $rules_action_base = $this->getMockForAbstractClass(
- RulesActionBase::class,
- [[], '', '']
- );
- $rules_action_base->summary();
- }
-
- /**
- * Tests that the summary is being parsed from the label annotation.
- *
- * @covers ::summary
- */
- public function testSummaryParsingTheLabelAnnotation() {
- $rules_action_base = $this->getMockForAbstractClass(
- RulesActionBase::class,
- [[], '', ['label' => 'something']]
- );
- $this->assertEquals('something', $rules_action_base->summary());
- }
-
- /**
- * Tests that a translation wrapper label is correctly parsed.
- *
- * @covers ::summary
- */
- public function testTranslatedLabel() {
- $translation_wrapper = $this->prophesize(TranslationWrapper::class);
- $translation_wrapper->__toString()->willReturn('something');
- $rules_action_base = $this->getMockForAbstractClass(
- RulesActionBase::class,
- [[], '', ['label' => $translation_wrapper->reveal()]]
- );
- $this->assertEquals('something', $rules_action_base->summary());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesAndTest.php b/modules/rules/tests/src/Unit/RulesAndTest.php
deleted file mode 100644
index e791573..0000000
--- a/modules/rules/tests/src/Unit/RulesAndTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-and = new RulesAnd([], '', [], $this->expressionManager->reveal());
- }
-
- /**
- * Tests one condition.
- */
- public function testOneCondition() {
- // The method on the test condition must be called once.
- $this->trueConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
- $this->and->addExpressionObject($this->trueConditionExpression->reveal());
- $this->assertTrue($this->and->execute(), 'Single condition returns TRUE.');
- }
-
- /**
- * Tests an empty AND.
- */
- public function testEmptyAnd() {
- $property = new \ReflectionProperty($this->and, 'conditions');
- $property->setAccessible(TRUE);
-
- $this->assertEmpty($property->getValue($this->and));
- $this->assertFalse($this->and->execute(), 'Empty AND returns FALSE.');
- }
-
- /**
- * Tests two true conditions.
- */
- public function testTwoConditions() {
- // The method on the test condition must be called twice.
- $this->trueConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $second_condition = $this->prophesize(ConditionExpressionInterface::class);
- $second_condition->getUuid()->willReturn('true_uuid2');
-
- $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
- ->willReturn(TRUE)
- ->shouldBeCalledTimes(1);
-
- $this->and
- ->addExpressionObject($this->trueConditionExpression->reveal())
- ->addExpressionObject($second_condition->reveal());
-
- $this->assertTrue($this->and->execute(), 'Two conditions returns TRUE.');
- }
-
- /**
- * Tests two false conditions.
- */
- public function testTwoFalseConditions() {
- // The method on the test condition must be called once.
- $this->falseConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $second_condition = $this->prophesize(ConditionExpressionInterface::class);
- $second_condition->getUuid()->willReturn('false_uuid2');
-
- $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
- ->willReturn(FALSE)
- ->shouldNotBeCalled();
-
- $this->and
- ->addExpressionObject($this->falseConditionExpression->reveal())
- ->addExpressionObject($second_condition->reveal());
-
- $this->assertFalse($this->and->execute(), 'Two false conditions return FALSE.');
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesConditionContainerTest.php b/modules/rules/tests/src/Unit/RulesConditionContainerTest.php
deleted file mode 100644
index 0c7158e..0000000
--- a/modules/rules/tests/src/Unit/RulesConditionContainerTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-getMockForAbstractClass(
- ConditionExpressionContainer::class, [
- [],
- 'test_id',
- [],
- $this->prophesize(ExpressionManagerInterface::class)->reveal(),
- ], $class, TRUE, TRUE, TRUE, $methods
- );
- }
-
- /**
- * Tests adding conditions to the condition container.
- *
- * @covers ::addExpressionObject
- */
- public function testAddExpressionObject() {
- $container = $this->getMockConditionContainer();
- $container->addExpressionObject($this->trueConditionExpression->reveal());
-
- $property = new \ReflectionProperty($container, 'conditions');
- $property->setAccessible(TRUE);
-
- $this->assertArrayEquals([$this->trueConditionExpression->reveal()], array_values($property->getValue($container)));
- }
-
- /**
- * Tests negating the result of the condition container.
- *
- * @covers ::negate
- * @covers ::isNegated
- */
- public function testNegate() {
- $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [], '', FALSE);
-
- $this->assertFalse($container->isNegated());
- $this->assertTrue($container->execute());
-
- $container->negate(TRUE);
- $this->assertTrue($container->isNegated());
- $this->assertFalse($container->execute());
- }
-
- /**
- * Tests executing the condition container.
- *
- * @covers ::execute
- */
- public function testExecute() {
- $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [], '', FALSE);
- $this->assertTrue($container->execute());
- }
-
- /**
- * Tests that an expression can be retrieved by UUID.
- */
- public function testLookupExpression() {
- $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
- [],
- 'test_id',
- [],
- $this->prophesize(ExpressionManagerInterface::class)->reveal(),
- ], '', TRUE);
- $container->addExpressionObject($this->trueConditionExpression->reveal());
- $uuid = $this->trueConditionExpression->reveal()->getUuid();
- $this->assertSame($this->trueConditionExpression->reveal(), $container->getExpression($uuid));
- $this->assertFalse($container->getExpression('invalid UUID'));
- }
-
- /**
- * Tests that a nested expression can be retrieved by UUID.
- */
- public function testLookupNestedExpression() {
- $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
- [],
- 'test_id',
- [],
- $this->prophesize(ExpressionManagerInterface::class)->reveal(),
- ], '', TRUE);
- $container->addExpressionObject($this->trueConditionExpression->reveal());
-
- $nested_container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
- [],
- 'test_id',
- [],
- $this->prophesize(ExpressionManagerInterface::class)->reveal(),
- ], '', TRUE);
- $nested_container->addExpressionObject($this->falseConditionExpression->reveal());
-
- $container->addExpressionObject($nested_container);
-
- $uuid = $this->falseConditionExpression->reveal()->getUuid();
- $this->assertSame($this->falseConditionExpression->reveal(), $container->getExpression($uuid));
- }
-
- /**
- * Tests deleting a condition from the container.
- */
- public function testDeletingCondition() {
- $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
- [],
- 'test_id',
- [],
- $this->prophesize(ExpressionManagerInterface::class)->reveal(),
- ], '', TRUE);
- $container->addExpressionObject($this->trueConditionExpression->reveal());
- $container->addExpressionObject($this->falseConditionExpression->reveal());
-
- // Delete the first condition.
- $uuid = $this->trueConditionExpression->reveal()->getUuid();
- $this->assertTrue($container->deleteExpression($uuid));
- foreach ($container as $condition) {
- $this->assertSame($this->falseConditionExpression->reveal(), $condition);
- }
-
- $this->assertFalse($container->deleteExpression('invalid UUID'));
- }
-
- /**
- * Tests deleting a nested condition from the container.
- */
- public function testDeletingNestedCondition() {
- $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
- [],
- 'test_id',
- [],
- $this->prophesize(ExpressionManagerInterface::class)->reveal(),
- ], '', TRUE);
- $container->addExpressionObject($this->trueConditionExpression->reveal());
-
- $nested_container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
- [],
- 'test_id',
- [],
- $this->prophesize(ExpressionManagerInterface::class)->reveal(),
- ], '', TRUE);
- $nested_container->addExpressionObject($this->falseConditionExpression->reveal());
-
- $container->addExpressionObject($nested_container);
-
- $uuid = $this->falseConditionExpression->reveal()->getUuid();
- $this->assertTrue($container->deleteExpression($uuid));
- $this->assertEquals(0, count($nested_container->getIterator()));
- }
-
-}
-
-/**
- * Class used for overriding evalute() as this does not work with PHPunit.
- */
-abstract class RulesConditionContainerTestStub extends ConditionExpressionContainer {
-
- /**
- * {@inheritdoc}
- */
- public function evaluate(ExecutionStateInterface $state) {
- return TRUE;
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesConditionTest.php b/modules/rules/tests/src/Unit/RulesConditionTest.php
deleted file mode 100644
index 6ca3273..0000000
--- a/modules/rules/tests/src/Unit/RulesConditionTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-trueCondition = $this->prophesize(RulesConditionInterface::class);
- $this->trueCondition->execute()->willReturn(TRUE);
- $this->trueCondition->evaluate()->willReturn(TRUE);
-
- $this->conditionManager = $this->prophesize(ConditionManager::class);
-
- $this->processorManager = $this->prophesize(DataProcessorManager::class);
-
- $this->conditionExpression = new RulesCondition(
- ['condition_id' => 'test_condition'], '', [],
- $this->conditionManager->reveal(), $this->processorManager->reveal());
- }
-
- /**
- * Tests that context values get data processed with processor mappings.
- */
- public function testDataProcessor() {
- $this->conditionManager->createInstance('test_condition', ['negate' => FALSE])
- ->willReturn($this->trueCondition->reveal())
- ->shouldBeCalledTimes(1);
-
- $condition = new RulesCondition([
- 'condition_id' => 'test_condition',
- ] + ContextConfig::create()
- // We don't care about the data processor plugin name and
- // configuration since we will use a mock anyway.
- ->process('test', 'foo', [])
- ->toArray(),
- '', [], $this->conditionManager->reveal(), $this->processorManager->reveal());
-
- $this->trueCondition->getContextDefinitions()->willReturn([
- 'test' => $this->prophesize(ContextDefinitionInterface::class)->reveal(),
- ])->shouldBeCalledTimes(1);
-
- $this->trueCondition->getContextDefinition('test')->willReturn(
- $this->prophesize(ContextDefinitionInterface::class)->reveal()
- )->shouldBeCalledTimes(1);
-
- $this->trueCondition->getProvidedContextDefinitions()
- ->willReturn([])
- ->shouldBeCalledTimes(1);
-
- // Mock some original old value that will be replaced by the data processor.
- $this->trueCondition->getContextValue('test')
- ->willReturn('old_value')
- ->shouldBeCalled();
-
- // The outcome of the data processor needs to get set on the condition.
- $this->trueCondition->setContextValue('test', 'new_value')->shouldBeCalledTimes(1);
- $this->trueCondition->refineContextDefinitions([])->shouldBeCalledTimes(1);
-
- $data_processor = $this->prophesize(DataProcessorInterface::class);
- $data_processor->process('old_value', Argument::any())
- ->willReturn('new_value')
- ->shouldBeCalledTimes(1);
-
- $this->processorManager->createInstance('foo', [])
- ->willReturn($data_processor->reveal())
- ->shouldBeCalledTimes(1);
-
- // Build some mocked execution state.
- $state = $this->prophesize(ExecutionStateInterface::class);
- $prophecy = $state->getVariable('test');
- /** @var \Prophecy\Prophecy\MethodProphecy $prophecy */
- $prophecy->willReturn('old_value');
-
- $this->assertTrue($condition->executeWithState($state->reveal()));
- }
-
- /**
- * Tests that negating a condition works.
- */
- public function testNegation() {
- $this->trueCondition->getContextDefinitions()->willReturn([]);
- $this->trueCondition->refineContextDefinitions([])->shouldBeCalledTimes(1);
- $this->trueCondition->getProvidedContextDefinitions()
- ->willReturn([])
- ->shouldBeCalledTimes(1);
-
- $this->conditionManager->createInstance('test_condition', ['negate' => TRUE])
- ->willReturn($this->trueCondition->reveal())
- ->shouldBeCalledTimes(1);
-
- // Create a condition which is negated.
- $condition_expression = new RulesCondition([
- 'condition_id' => 'test_condition',
- 'negate' => TRUE,
- ], '', [], $this->conditionManager->reveal(), $this->processorManager->reveal());
-
- $this->assertFalse($condition_expression->execute());
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesLoggerChannelTest.php b/modules/rules/tests/src/Unit/RulesLoggerChannelTest.php
deleted file mode 100644
index 602c81c..0000000
--- a/modules/rules/tests/src/Unit/RulesLoggerChannelTest.php
+++ /dev/null
@@ -1,204 +0,0 @@
-clearMessages();
-
- $config = $this->getConfigFactoryStub([
- 'rules.settings' => [
- 'log' => $log,
- 'debug_screen' => $debug_screen,
- 'log_level_system' => $psr3_log_error_level,
- 'log_level_screen' => $psr3_log_error_level,
- ],
- ]);
- $channel = new RulesLoggerChannel($config);
- $logger = $this->prophesize(LoggerInterface::class);
- $logger->log($rfc_message_level, $message, Argument::type('array'))
- ->shouldBeCalledTimes($expect_system_log);
-
- $channel->addLogger($logger->reveal());
-
- $channel->log($psr3_message_level, $message);
-
- $messages = drupal_set_message();
- if ($expect_screen_log > 0) {
- $this->assertNotNull($messages);
- $this->assertArrayEquals([$psr3_message_level => [$message]], $messages);
- }
- else {
- $this->assertNull($messages);
- }
- }
-
- /**
- * Clears the statically stored messages.
- *
- * @param null|string $type
- * (optional) The type of messages to clear. Defaults to NULL which causes
- * all messages to be cleared.
- *
- * @return $this
- */
- protected function clearMessages($type = NULL) {
- $messages = &drupal_set_message();
- if (isset($type)) {
- unset($messages[$type]);
- }
- else {
- $messages = NULL;
- }
- return $this;
- }
-
- /**
- * Data provider for self::testLog().
- */
- public function providerTestLog() {
- return [
- [
- 'psr3_message_level' => LogLevel::DEBUG,
- 'rfc_message_level' => RfcLogLevel::DEBUG,
- 'system_log_enabled' => 0,
- 'screen_log_enabled' => 0,
- 'min_psr3_level' => LogLevel::DEBUG,
- 'expected_system_logs' => 0,
- 'expected_screen_logs' => 0,
- 'message' => 'apple',
- ],
- [
- 'psr3_message_level' => LogLevel::DEBUG,
- 'rfc_message_level' => RfcLogLevel::DEBUG,
- 'system_log_enabled' => 0,
- 'screen_log_enabled' => 1,
- 'min_psr3_level' => LogLevel::DEBUG,
- 'expected_system_logs' => 0,
- 'expected_screen_logs' => 1,
- 'message' => 'pear',
- ],
- [
- 'psr3_message_level' => LogLevel::CRITICAL,
- 'rfc_message_level' => RfcLogLevel::CRITICAL,
- 'system_log_enabled' => 1,
- 'screen_log_enabled' => 0,
- 'min_psr3_level' => LogLevel::DEBUG,
- 'expected_system_logs' => 1,
- 'expected_screen_logs' => 0,
- 'message' => 'banana',
- ],
- [
- 'psr3_message_level' => LogLevel::CRITICAL,
- 'rfc_message_level' => RfcLogLevel::CRITICAL,
- 'system_log_enabled' => 1,
- 'screen_log_enabled' => 1,
- 'min_psr3_level' => LogLevel::DEBUG,
- 'expected_system_logs' => 1,
- 'expected_screen_logs' => 1,
- 'message' => 'carrot',
- ],
- [
- 'psr3_message_level' => LogLevel::CRITICAL,
- 'rfc_message_level' => RfcLogLevel::CRITICAL,
- 'system_log_enabled' => 1,
- 'screen_log_enabled' => 0,
- 'min_psr3_level' => LogLevel::DEBUG,
- 'expected_system_logs' => 1,
- 'expected_screen_logs' => 0,
- 'message' => 'orange',
- ],
- [
- 'psr3_message_level' => LogLevel::CRITICAL,
- 'rfc_message_level' => RfcLogLevel::CRITICAL,
- 'system_log_enabled' => 1,
- 'screen_log_enabled' => 1,
- 'min_psr3_level' => LogLevel::DEBUG,
- 'expected_system_logs' => 1,
- 'expected_screen_logs' => 1,
- 'message' => 'kumkwat',
- ],
- [
- 'psr3_message_level' => LogLevel::INFO,
- 'rfc_message_level' => RfcLogLevel::INFO,
- 'system_log_enabled' => 1,
- 'screen_log_enabled' => 0,
- 'min_psr3_level' => LogLevel::CRITICAL,
- 'expected_system_logs' => 0,
- 'expected_screen_logs' => 0,
- 'message' => 'cucumber',
- ],
- [
- 'psr3_message_level' => LogLevel::INFO,
- 'rfc_message_level' => RfcLogLevel::INFO,
- 'system_log_enabled' => 1,
- 'screen_log_enabled' => 1,
- 'min_psr3_level' => LogLevel::CRITICAL,
- 'expected_system_logs' => 0,
- 'expected_screen_logs' => 0,
- 'message' => 'dragonfruit',
- ],
- ];
- }
-
- }
-}
-
-namespace {
-
- if (!function_exists('drupal_set_message')) {
-
- /**
- * Dummy replacement for testing.
- */
- function &drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
- static $messages = NULL;
-
- if (!empty($message)) {
- $messages[$type] = isset($messages[$type]) ? $messages[$type] : [];
- if ($repeat || !in_array($message, $messages[$type])) {
- $messages[$type][] = $message;
- }
- }
-
- return $messages;
- }
-
- }
-}
diff --git a/modules/rules/tests/src/Unit/RulesOrTest.php b/modules/rules/tests/src/Unit/RulesOrTest.php
deleted file mode 100644
index 2dd4247..0000000
--- a/modules/rules/tests/src/Unit/RulesOrTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-or = new RulesOr([], '', [], $this->expressionManager->reveal());
- }
-
- /**
- * Tests one condition.
- */
- public function testOneCondition() {
- // The method on the test condition must be called once.
- $this->trueConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $this->or->addExpressionObject($this->trueConditionExpression->reveal());
- $this->assertTrue($this->or->execute(), 'Single condition returns TRUE.');
- }
-
- /**
- * Tests an empty OR.
- */
- public function testEmptyOr() {
- $property = new \ReflectionProperty($this->or, 'conditions');
- $property->setAccessible(TRUE);
-
- $this->assertEmpty($property->getValue($this->or));
- $this->assertTrue($this->or->execute(), 'Empty OR returns TRUE.');
- }
-
- /**
- * Tests two true condition.
- */
- public function testTwoConditions() {
- // The method on the test condition must be called once.
- $this->trueConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $second_condition = $this->prophesize(ConditionExpressionInterface::class);
- $second_condition->getUuid()->willReturn('true_uuid2');
-
- $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
- ->willReturn(TRUE)
- ->shouldNotBeCalled();
-
- $this->or
- ->addExpressionObject($this->trueConditionExpression->reveal())
- ->addExpressionObject($second_condition->reveal());
-
- $this->assertTrue($this->or->execute(), 'Two conditions returns TRUE.');
- }
-
- /**
- * Tests two false conditions.
- */
- public function testTwoFalseConditions() {
- $this->falseConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
- $second_condition = $this->prophesize(ConditionExpressionInterface::class);
- $second_condition->getUuid()->willReturn('false_uuid2');
-
- $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
- ->willReturn(FALSE)
- ->shouldBeCalledTimes(1);
-
- $this->or
- ->addExpressionObject($this->falseConditionExpression->reveal())
- ->addExpressionObject($second_condition->reveal());
-
- $this->assertFalse($this->or->execute(), 'Two false conditions return FALSE.');
- }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesUnitTestBase.php b/modules/rules/tests/src/Unit/RulesUnitTestBase.php
deleted file mode 100644
index fa519ff..0000000
--- a/modules/rules/tests/src/Unit/RulesUnitTestBase.php
+++ /dev/null
@@ -1,71 +0,0 @@
-trueConditionExpression = $this->prophesize(ConditionExpressionInterface::class);
- $this->trueConditionExpression->getUuid()->willReturn('true_uuid1');
-
- $this->trueConditionExpression->execute()->willReturn(TRUE);
- $this->trueConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->willReturn(TRUE);
-
- $this->falseConditionExpression = $this->prophesize(ConditionExpressionInterface::class);
- $this->falseConditionExpression->getUuid()->willReturn('false_uuid1');
-
- $this->falseConditionExpression->execute()->willReturn(FALSE);
- $this->falseConditionExpression->executeWithState(
- Argument::type(ExecutionStateInterface::class))->willReturn(FALSE);
-
- $this->testActionExpression = $this->prophesize(ActionExpressionInterface::class);
- $this->testActionExpression->getUuid()->willReturn('action_uuid1');
-
- $this->expressionManager = $this->prophesize(ExpressionManagerInterface::class);
- }
-
-}
diff --git a/modules/scheduler/.travis.yml b/modules/scheduler/.travis.yml
deleted file mode 100644
index 19c0dac..0000000
--- a/modules/scheduler/.travis.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-language: php
-# The Travis CI container mode has random functional test fails, so we must use
-# sudo here.
-sudo: true
-
-php:
- - 5.5
- - 5.6
- - 7.0
-
-env:
- global:
- # Make the script re-usable for other modules.
- - MODULE=scheduler
- matrix:
- - DRUPAL_CORE=8.3.x
- - DRUPAL_CORE=8.4.x
- - DRUPAL_CORE=8.5.x
-
-matrix:
- fast_finish: true
-
-# Be sure to cache composer downloads.
-cache:
- directories:
- - $HOME/.composer
-
-before_script:
- - echo $MODULE
-
- # Remove Xdebug as we don't need it and it causes
- # PHP Fatal error: Maximum function nesting level of '256' reached.
- # We also don't care if that file exists or not on PHP 7.
- - phpenv config-rm xdebug.ini || true
-
- # Navigate out of module directory to prevent blown stack by recursive module
- # lookup.
- - cd ..
-
- # Create database.
- - mysql -e "create database $MODULE"
- # Export database variable for kernel tests.
- - export SIMPLETEST_DB=mysql://root:@127.0.0.1/$MODULE
-
- # Download Drupal 8 core from the Github mirror because it is faster.
- - travis_retry git clone --branch $DRUPAL_CORE --depth 1 https://github.com/drupal/drupal.git
- - cd drupal
- # Store the path to Drupal root.
- - DRUPAL_ROOT=$(pwd)
- - echo $DRUPAL_ROOT
-
- # Make a directory for module and copy the built source into it.
- - mkdir $DRUPAL_ROOT/modules/$MODULE
- - cp -R $TRAVIS_BUILD_DIR/* $DRUPAL_ROOT/modules/$MODULE/
-
- # Install dependencies.
- - travis_retry git clone --branch 8.x-3.x --depth 1 https://github.com/fago/rules.git modules/rules
- - travis_retry git clone --branch 8.x-1.x --depth 1 http://git.drupal.org/project/devel.git modules/devel
- - travis_retry git clone --branch 8.x-1.x --depth 1 http://git.drupal.org/project/typed_data.git modules/typed_data
-
- # Run composer install for Drupal 8.1 and up. We need an up-to-date composer
- # when installing Drupal 8.1.
- - travis_retry composer self-update && travis_retry composer install
-
- # Coder is already installed as part of composer install. We just need to set
- # the installed_paths to pick up the Drupal standards.
- - $DRUPAL_ROOT/vendor/bin/phpcs --config-set installed_paths $DRUPAL_ROOT/vendor/drupal/coder/coder_sniffer
-
- # Start a web server on port 8888, run in the background.
- - php -S localhost:8888 &
-
- # Export web server URL for browser tests.
- - export SIMPLETEST_BASE_URL=http://localhost:8888
-
-script:
- # Run the PHPUnit tests.
- - ./vendor/bin/phpunit -c ./core/phpunit.xml.dist ./modules/$MODULE/tests/
-
- # Change directory to our module.
- - cd $DRUPAL_ROOT/modules/$MODULE
-
- # Check for coding standards. First list all the sniffs to be used.
- - $DRUPAL_ROOT/vendor/bin/phpcs -e
-
- # Show the coding standards violations in detail.
- - $DRUPAL_ROOT/vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1
-
- # Run again to give a summary and total count.
- - $DRUPAL_ROOT/vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --report=summary
diff --git a/modules/scheduler/LICENSE.txt b/modules/scheduler/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/scheduler/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/scheduler/README.md b/modules/scheduler/README.md
deleted file mode 100644
index 5849071..0000000
--- a/modules/scheduler/README.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Scheduler
-
-[](https://travis-ci.org/jonathan1055/scheduler)
-
-Scheduler gives content editors the ability to schedule nodes to be published
-and unpublished at specified dates and times in the future.
-
-Scheduler provides hooks and events for third-party modules to interact with
-the processing during node edit and during cron publishing and unpublishing.
-
-For a fuller description of the module, visit the [project page on Drupal.org](https://drupal.org/project/scheduler)
-
-## Requirements
-
- * Scheduler uses the following Drupal 8 Core components:
- Actions, Datetime, Field, Node, Text, Filter, User, System, Views.
-
- * There are no special requirements outside core.
-
-## Integration with other modules
-
- * Rules (https://www.drupal.org/project/rules):
- Scheduler provides actions, conditions and events which can be used in
- Rules to build additional functionality.
-
- * Token (https://www.drupal.org/project/token):
- Scheduler provides tokens for the two scheduling dates.
-
- * Devel (https://www.drupal.org/project/devel):
- When generating new test content via Devel Generate, Scheduler can add
- publishing dates automatically.
-
-## Installation
-
- * Install as you would normally install a contributed Drupal module. See:
- https://drupal.org/documentation/install/modules-themes/modules-8
- for further information.
-
-## Configuration
-
- * Configure user permissions via url /admin/people/permissions#module-scheduler
- or Administration » People » Permissions
-
- - View scheduled content list
-
- Users can always see their own scheduled content, via a tab on their user
- page. This permissions grants additional authority to see the full list of
- scheduled content by any author, providing the user also has the core
- permission 'access content overview'.
-
- - Schedule content publication
-
- Users with this permission can enter dates and times for publishing and/or
- unpublishing, when editing nodes of types which are Scheduler-enabled.
-
- - Administer scheduler
-
- This permission allows the user to alter all Scheduler settings. It should
- therefore only be given to trusted admin roles.
-
- * Configure the Scheduler global options via /admin/config/content/scheduler
- or Administration » Configuration » Content Authoring
-
- - Basic settings for date format, allowing date only, setting default time.
-
- - Lightweight Cron, which gives sites admins the granularity to run
- Scheduler's functions only, on more frequent crontab jobs.
-
- * Configure the Scheduler settings per content type via /admin/structure/types
- or Administration » Structure » Content Types » Edit
-
-## Troubleshooting
-
- * To submit bug reports and feature requests use
- https://drupal.org/project/issues/scheduler
-
- * To get help with crontab jobs, see https://drupal.org/cron
-
-## Maintainers
-
-Current maintainers:
-- Pieter Frenssen 2014(6.x)- https://www.drupal.org/u/pfrenssen
-- Jonathan Smith 2013(6.x)- https://www.drupal.org/u/jonathan1055
-
-Previous maintainers:
-- Rick Manelius 2013(6.x)-2014(7.x) https://www.drupal.org/u/rickmanelius
-- Eric Schaefer 2008(5.x)-2013(7.x) https://www.drupal.org/u/eric-schaefer
-- Sami Kimini 2008(5.x) https://www.drupal.org/u/skiminki
-- Ted Serbinski 2007(4.7) https://www.drupal.org/u/m3avrck
-- Andy Kirkham 2006(4.7)-2008(6.x) https://www.drupal.org/u/ajk
-- David Norman 2006(4.x) https://www.drupal.org/u/deekayen
-- Tom Dobes 2004(4.x) https://www.drupal.org/user/4179
-- Gábor Hojtsy 2003(4.3)-2005(5.x) https://www.drupal.org/u/gábor-hojtsy
-- Moshe Weitzman 2003(4.2)-2006(4.6) https://www.drupal.org/u/moshe-weitzman
diff --git a/modules/scheduler/composer.json b/modules/scheduler/composer.json
deleted file mode 100644
index 0085b59..0000000
--- a/modules/scheduler/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "name": "drupal/scheduler",
- "description": "Automatically publish and unpublish content at specified dates and times.",
- "type": "drupal-module",
- "homepage": "https://drupal.org/project/scheduler",
- "authors": [
- {
- "name": "Eric Schaefer (Eric Schaefer)",
- "homepage": "https://www.drupal.org/u/eric-schaefer",
- "role": "Maintainer"
- },
- {
- "name": "Jonathan Smith (jonathan1055)",
- "homepage": "https://www.drupal.org/u/jonathan1055",
- "role": "Maintainer"
- },
- {
- "name": "Pieter Frenssen (pfrenssen)",
- "homepage": "https://www.drupal.org/u/pfrenssen",
- "role": "Maintainer"
- },
- {
- "name": "Rick Manelius (rickmanelius)",
- "homepage": "https://www.drupal.org/u/rickmanelius",
- "role": "Maintainer"
- }
- ],
- "support": {
- "issues": "https://www.drupal.org/project/issues/scheduler",
- "source": "http://cgit.drupalcode.org/scheduler"
- },
- "license": "GPL-2.0+"
-}
diff --git a/modules/scheduler/config/install/scheduler.settings.yml b/modules/scheduler/config/install/scheduler.settings.yml
deleted file mode 100644
index 4c82158..0000000
--- a/modules/scheduler/config/install/scheduler.settings.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-allow_date_only: false
-date_format: 'Y-m-d H:i:s'
-date_letters: 'djmnFMyY'
-date_only_format: 'Y-m-d'
-default_expand_fieldset: 'when_required'
-default_fields_display_mode: 'vertical_tab'
-default_publish_enable: false
-default_publish_past_date: 'error'
-default_publish_required: false
-default_publish_revision: false
-default_publish_touch: false
-default_time: '00:00:00'
-default_unpublish_enable: false
-default_unpublish_required: false
-default_unpublish_revision: false
-lightweight_cron_access_key: ''
-log: true
-time_letters: 'hHgGisaA'
-time_only_format: 'H:i:s'
diff --git a/modules/scheduler/config/schema/scheduler.schema.yml b/modules/scheduler/config/schema/scheduler.schema.yml
deleted file mode 100644
index 10ee7b0..0000000
--- a/modules/scheduler/config/schema/scheduler.schema.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-# Schema for Scheduler module configuration.
-
-scheduler.settings:
- type: config_object
- label: 'Scheduler settings'
- mapping:
- allow_date_only:
- type: boolean
- label: 'Allow date-only input with time taken from default time setting'
- date_format:
- type: string
- label: 'Full date and time format'
- date_letters:
- type: string
- label: 'The set of PHP date letters allowed in the Scheduler date format'
- date_only_format:
- type: string
- label: 'Date part of the full format'
- default_expand_fieldset:
- type: string
- label: 'Default value for nodetype setting expand_fieldset'
- default_fields_display_mode:
- type: string
- label: 'Default value for nodetype setting fields_display_mode'
- default_publish_enable:
- type: boolean
- label: 'Default value for nodetype setting publish_enable'
- default_publish_past_date:
- type: string
- label: 'Default value for nodetype setting publish_past_date'
- default_publish_required:
- type: boolean
- label: 'Default value for nodetype setting publish_required'
- default_publish_revision:
- type: boolean
- label: 'Default value for nodetype setting publish_revision'
- default_publish_touch:
- type: boolean
- label: 'Default value for nodetype setting publish_touch'
- default_time:
- type: string
- label: 'Default Scheduling Time. This is used with the option to allow date only'
- default_unpublish_enable:
- type: boolean
- label: 'Default value for nodetype setting unpublish_enable'
- default_unpublish_required:
- type: boolean
- label: 'Default value for nodetype setting unpublish_required'
- default_unpublish_revision:
- type: boolean
- label: 'Default value for nodetype setting unpublish_revision'
- lightweight_cron_access_key:
- type: string
- label: 'Lightweight cron access key'
- log:
- type: boolean
- label: 'Log every Scheduler lightweight cron activation and completion message'
- time_letters:
- type: string
- label: 'The set of PHP time letters allowed in the Scheduler time format'
- time_only_format:
- type: string
- label: 'Time part of the full format'
-
-node.type.*.third_party.scheduler:
- type: mapping
- label: 'Scheduler content type settings'
- mapping:
- expand_fieldset:
- type: string
- label: 'Conditions under which to expand the date input fieldset or vertical tab'
- fields_display_mode:
- type: string
- label: 'The way the scheduling fields are displayed in the node form'
- publish_enable:
- type: boolean
- label: 'Enable scheduled publishing'
- publish_past_date:
- type: string
- label: 'Action to be taken for publication dates in the past'
- publish_required:
- type: boolean
- label: 'Require scheduled publishing'
- publish_revision:
- type: boolean
- label: 'Create a new revision on publishing'
- publish_touch:
- type: boolean
- label: 'Change content creation time to match the scheduled publish time'
- unpublish_enable:
- type: boolean
- label: 'Enable scheduled unpublishing'
- unpublish_required:
- type: boolean
- label: 'Require scheduled unpublishing'
- unpublish_revision:
- type: boolean
- label: 'Create a new revision on unpublishing'
diff --git a/modules/scheduler/js/scheduler_vertical_tabs.js b/modules/scheduler/js/scheduler_vertical_tabs.js
deleted file mode 100644
index d090182..0000000
--- a/modules/scheduler/js/scheduler_vertical_tabs.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file
- * jQuery to provide summary information inside vertical tabs.
- */
-
-(function ($) {
-
- 'use strict';
-
- /**
- * Provide summary information for vertical tabs.
- */
- Drupal.behaviors.scheduler_settings = {
- attach: function (context) {
-
- // Provide summary when editing a node.
- $('details#edit-scheduler-settings', context).drupalSetSummary(function (context) {
- var vals = [];
- if ($('#edit-publish-on-0-value-date').val()) {
- vals.push(Drupal.t('Scheduled for publishing'));
- }
- if ($('#edit-unpublish-on-0-value-date').val()) {
- vals.push(Drupal.t('Scheduled for unpublishing'));
- }
- if (!vals.length) {
- vals.push(Drupal.t('Not scheduled'));
- }
- return vals.join('
- Default PHP CodeSniffer configuration for Scheduler.
- .
-
-
-
-
- README.md
-
-
-
-
-
-
-
diff --git a/modules/scheduler/plugins/content_types/scheduler_form_pane.inc b/modules/scheduler/plugins/content_types/scheduler_form_pane.inc
deleted file mode 100644
index 73fa135..0000000
--- a/modules/scheduler/plugins/content_types/scheduler_form_pane.inc
+++ /dev/null
@@ -1,57 +0,0 @@
- TRUE,
- 'edit form' => 'scheduler_form_pane_node_form_menu_content_type_edit_form',
- 'render callback' => 'scheduler_form_pane_content_type_render',
- 'title' => t('Node form scheduler'),
- 'icon' => drupal_get_path('module', 'ctools') . '/plugins/content_types/node_form/icon_node_form.png',
- 'description' => t('Scheduler date options on the Node form.'),
- 'required context' => new ctools_context_required(t('Form'), 'node_form'),
- 'category' => t('Form'),
-];
-
-/**
- * Content type render callback.
- */
-function scheduler_form_pane_content_type_render($subtype, $conf, $panel_args, &$context) {
- $block = new stdClass();
- $block->module = 'node_form';
- $block->title = t('Scheduler options');
- $block->delta = 'scheduler-options';
-
- if (isset($context->form)) {
- if (isset($context->form['scheduler_settings'])) {
- // Lift the form elements from the original form and make sure it renders.
- $block->content['scheduler_settings'] = $context->form['scheduler_settings'];
- unset($block->content['scheduler_settings']['#pre_render']);
- unset($block->content['scheduler_settings']['#theme_wrappers']);
- $block->content['scheduler_settings']['#type'] = '';
-
- // Deny access on the original form element rather than removing so that
- // vertical tabs doesn't clone it. I think this is due to references.
- $context->form['scheduler_settings']['#access'] = FALSE;
- }
- }
- else {
- // Display placeholder information.
- $block->content = t('Scheduler options');
- }
- return $block;
-}
-
-/**
- * Content type form callback.
- */
-function scheduler_form_pane_node_form_menu_content_type_edit_form(array $form, FormStateInterface $form_state) {
- return $form;
-}
diff --git a/modules/scheduler/scheduler.admin.inc b/modules/scheduler/scheduler.admin.inc
deleted file mode 100644
index 94fb146..0000000
--- a/modules/scheduler/scheduler.admin.inc
+++ /dev/null
@@ -1,185 +0,0 @@
-getFormObject()->getEntity();
-
- $form['#attached']['library'][] = 'scheduler/admin';
- $form['#attached']['library'][] = 'scheduler/vertical-tabs';
-
- $form['scheduler'] = [
- '#type' => 'details',
- '#title' => t('Scheduler'),
- '#weight' => 35,
- '#group' => 'additional_settings',
- ];
-
- // Publishing options.
- $form['scheduler']['publish'] = [
- '#type' => 'details',
- '#title' => t('Publishing'),
- '#weight' => 1,
- '#group' => 'scheduler',
- '#open' => TRUE,
- ];
- $form['scheduler']['publish']['scheduler_publish_enable'] = [
- '#type' => 'checkbox',
- '#title' => t('Enable scheduled publishing for this content type'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable')),
- ];
- $form['scheduler']['publish']['scheduler_publish_touch'] = [
- '#type' => 'checkbox',
- '#title' => t('Change content creation time to match the scheduled publish time'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_touch', $config->get('default_publish_touch')),
- '#states' => [
- 'visible' => [
- ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
- ],
- ],
- ];
- $form['scheduler']['publish']['scheduler_publish_required'] = [
- '#type' => 'checkbox',
- '#title' => t('Require scheduled publishing'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_required', $config->get('default_publish_required')),
- '#states' => [
- 'visible' => [
- ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
- ],
- ],
- ];
- $form['scheduler']['publish']['scheduler_publish_revision'] = [
- '#type' => 'checkbox',
- '#title' => t('Create a new revision on publishing'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_revision', $config->get('default_publish_revision')),
- '#states' => [
- 'visible' => [
- ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
- ],
- ],
- ];
- $form['scheduler']['publish']['advanced'] = [
- '#type' => 'details',
- '#title' => t('Advanced options'),
- '#open' => FALSE,
- '#states' => [
- 'visible' => [
- ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
- ],
- ],
- ];
- $form['scheduler']['publish']['advanced']['scheduler_publish_past_date'] = [
- '#type' => 'radios',
- '#title' => t('Action to be taken for publication dates in the past'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_past_date', $config->get('default_publish_past_date')),
- '#options' => [
- 'error' => t('Display an error message - do not allow dates in the past'),
- 'publish' => t('Publish the content immediately after saving'),
- 'schedule' => t('Schedule the content for publication on the next cron run'),
- ],
- ];
-
- // Unpublishing options.
- $form['scheduler']['unpublish'] = [
- '#type' => 'details',
- '#title' => t('Unpublishing'),
- '#weight' => 2,
- '#group' => 'scheduler',
- '#open' => TRUE,
- ];
- $form['scheduler']['unpublish']['scheduler_unpublish_enable'] = [
- '#type' => 'checkbox',
- '#title' => t('Enable scheduled unpublishing for this content type'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable')),
- ];
- $form['scheduler']['unpublish']['scheduler_unpublish_required'] = [
- '#type' => 'checkbox',
- '#title' => t('Require scheduled unpublishing'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'unpublish_required', $config->get('default_unpublish_required')),
- '#states' => [
- 'visible' => [
- ':input[name="scheduler_unpublish_enable"]' => ['checked' => TRUE],
- ],
- ],
- ];
- $form['scheduler']['unpublish']['scheduler_unpublish_revision'] = [
- '#type' => 'checkbox',
- '#title' => t('Create a new revision on unpublishing'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'unpublish_revision', $config->get('default_unpublish_revision')),
- '#states' => [
- 'visible' => [
- ':input[name="scheduler_unpublish_enable"]' => ['checked' => TRUE],
- ],
- ],
- ];
-
- // The 'node_edit_layout' fieldset contains options to alter the layout of
- // node edit pages.
- $form['scheduler']['node_edit_layout'] = [
- '#type' => 'details',
- '#title' => t('Node edit page layout'),
- '#weight' => 3,
- '#group' => 'scheduler',
- // The #states processing only caters for AND and does not do OR. So to set
- // the state to visible if either of the boxes are ticked we use the fact
- // that logical 'X = A or B' is equivalent to 'not X = not A and not B'.
- '#states' => [
- '!visible' => [
- ':input[name="scheduler_publish_enable"]' => ['!checked' => TRUE],
- ':input[name="scheduler_unpublish_enable"]' => ['!checked' => TRUE],
- ],
- ],
- ];
- // @todo Worthwhile to port this to D8 now form displays are configurable?
- $form['scheduler']['node_edit_layout']['scheduler_fields_display_mode'] = [
- '#type' => 'radios',
- '#title' => t('Display scheduling options as'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'fields_display_mode', $config->get('default_fields_display_mode')),
- '#options' => [
- 'vertical_tab' => t('Vertical tab'),
- 'fieldset' => t('Separate fieldset'),
- ],
- '#description' => t('Use this option to specify how the scheduling options will be displayed when editing a node.'),
- ];
- $form['scheduler']['node_edit_layout']['scheduler_expand_fieldset'] = [
- '#type' => 'radios',
- '#title' => t('Expand fieldset or vertical tab'),
- '#default_value' => $type->getThirdPartySetting('scheduler', 'expand_fieldset', $config->get('default_expand_fieldset')),
- '#options' => [
- 'when_required' => t('Expand only when a scheduled date exists or when a date is required'),
- 'always' => t('Always open the fieldset or vertical tab'),
- ],
- ];
-
- $form['#entity_builders'][] = 'scheduler_form_node_type_form_builder';
-}
-
-/**
- * Entity builder for the node type form with scheduler options.
- */
-function scheduler_form_node_type_form_builder($entity_type, NodeTypeInterface $type, &$form, FormStateInterface $form_state) {
- $type->setThirdPartySetting('scheduler', 'expand_fieldset', $form_state->getValue('scheduler_expand_fieldset'));
- $type->setThirdPartySetting('scheduler', 'fields_display_mode', $form_state->getValue('scheduler_fields_display_mode'));
- $type->setThirdPartySetting('scheduler', 'publish_enable', $form_state->getValue('scheduler_publish_enable'));
- $type->setThirdPartySetting('scheduler', 'publish_past_date', $form_state->getValue('scheduler_publish_past_date'));
- $type->setThirdPartySetting('scheduler', 'publish_required', $form_state->getValue('scheduler_publish_required'));
- $type->setThirdPartySetting('scheduler', 'publish_revision', $form_state->getValue('scheduler_publish_revision'));
- $type->setThirdPartySetting('scheduler', 'publish_touch', $form_state->getValue('scheduler_publish_touch'));
- $type->setThirdPartySetting('scheduler', 'unpublish_enable', $form_state->getValue('scheduler_unpublish_enable'));
- $type->setThirdPartySetting('scheduler', 'unpublish_required', $form_state->getValue('scheduler_unpublish_required'));
- $type->setThirdPartySetting('scheduler', 'unpublish_revision', $form_state->getValue('scheduler_unpublish_revision'));
-}
diff --git a/modules/scheduler/scheduler.api.php b/modules/scheduler/scheduler.api.php
deleted file mode 100644
index e55004c..0000000
--- a/modules/scheduler/scheduler.api.php
+++ /dev/null
@@ -1,123 +0,0 @@
-field_approved)) {
- $allowed = TRUE;
- }
- else {
- // Prevent publication of nodes that do not have the 'Approved for
- // publication by the CEO' checkbox ticked.
- $allowed = !empty($node->field_approved->value);
-
- // If publication is denied then inform the user why. This message will be
- // displayed during node edit and save.
- if (!$allowed) {
- drupal_set_message(t('The content will only be published after approval by the CEO.'), 'status', FALSE);
- }
- }
-
- return $allowed;
-}
-
-/**
- * Hook function to deny or allow a node to be unpublished.
- *
- * This hook gives modules the ability to prevent unpblication of a node at the
- * scheduled time. The node may be scheduled, and an attempt to unpublish it
- * will be made during the first cron run after the unpublishing time. If this
- * hook returns FALSE the node will not be unpublished. Attempts at unpublishing
- * will continue on each subsequent cron run until this hook returns TRUE.
- *
- * @param \Drupal\node\NodeInterface $node
- * The scheduled node that is about to be unpublished.
- *
- * @return bool
- * TRUE if the node can be unpublished, FALSE if it should not be unpublished.
- */
-function hook_scheduler_allow_unpublishing(NodeInterface $node) {
- $allowed = TRUE;
-
- // Prevent unpublication of competition entries if not all prizes have been
- // claimed.
- if ($node->getType() == 'competition' && $items = $node->field_competition_prizes->getValue()) {
- $allowed = (bool) count($items);
-
- // If unpublication is denied then inform the user why. This message will be
- // displayed during node edit and save.
- if (!$allowed) {
- drupal_set_message(t('The competition will only be unpublished after all prizes have been claimed by the winners.'));
- }
- }
-
- return $allowed;
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/scheduler/scheduler.drush.inc b/modules/scheduler/scheduler.drush.inc
deleted file mode 100644
index cba3f47..0000000
--- a/modules/scheduler/scheduler.drush.inc
+++ /dev/null
@@ -1,34 +0,0 @@
- 'Lighweight cron to process scheduler tasks.',
- 'core' => ['8+'],
- 'aliases' => ['sch-cron'],
- 'category' => 'scheduler',
- 'options' => [
- 'nomsg' => 'to avoid the "cron completed" message being written to the terminal.',
- ],
- ];
-
- return $items;
-}
-
-/**
- * Run lighweight scheduler cron.
- */
-function drush_scheduler_cron() {
- \Drupal::service('scheduler.manager')->runLightweightCron();
- $nomsg = drush_get_option('nomsg', NULL);
- $nomsg ? NULL : drupal_set_message(t('Scheduler lightweight cron completed'));
-}
diff --git a/modules/scheduler/scheduler.info.yml b/modules/scheduler/scheduler.info.yml
deleted file mode 100644
index f034a76..0000000
--- a/modules/scheduler/scheduler.info.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Scheduler
-type: module
-description: 'Publish and unpublish content automatically on specified dates and times.'
-# core: 8.x
-configure: scheduler.admin_form
-dependencies:
- - drupal:datetime
- - drupal:field
- - drupal:node
- - drupal:views
-test_dependencies:
- - devel:devel_generate
-libraries:
- - scheduler/admin
- - vertical-tabs
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/scheduler.install b/modules/scheduler/scheduler.install
deleted file mode 100644
index 2e4982b..0000000
--- a/modules/scheduler/scheduler.install
+++ /dev/null
@@ -1,105 +0,0 @@
-get('timezone.default') ?: date_default_timezone_get();
- $date_formatter = \Drupal::service('date.formatter');
-
- $t_options = [
- // For %utc specify 'GMT' as the timezone (4th parameter) so that no
- // timezone offset is returned.
- '%utc' => $date_formatter->format($now, 'custom', 'jS F Y, H:i:s P', 'GMT'),
- // For %localtime do not specify any timezone parameter so that the user
- // or site default setting is returned.
- '%localtime' => $date_formatter->format($now, 'custom', 'jS F Y, H:i:s P T e'),
- '%daylight_saving' => $date_formatter->format($now, 'custom', 'I') ? t('currently in daylight saving mode') : t('not in daylight saving mode'),
- '%date_default_timezone' => $date_default_timezone,
- '%date_default_offset' => $date_formatter->format($now, 'custom', 'P', $date_default_timezone),
- '%date_default_code' => $date_formatter->format($now, 'custom', 'T', $date_default_timezone),
- '@account_edit' => Url::fromRoute('entity.user.edit_form', ['user' => $user->id()])->toString(),
- '@admin_regional_settings' => Url::fromRoute('system.regional_settings')->toString(),
- ];
-
- $descriptions = [
- t('In most cases the server time should match Coordinated Universal Time (UTC) / Greenwich Mean Time (GMT).', $t_options),
- t('Default timezone: %date_default_timezone (%date_default_code), offset from UTC/GMT by %date_default_offset hours. This timezone can be changed by admin users with the appropriate access.', $t_options),
- ];
- if ($system_date->get('timezone.user.configurable')) {
- $descriptions[] = t('Local time: %localtime (%daylight_saving). You can change this via your user account .', $t_options);
- if (!$user->getTimezone()) {
- $descriptions[] = t('Note: The user timezone has not been stored, so defaulting to the website timezone.');
- }
- }
- else {
- $descriptions[] = t('Your local time is %localtime (%daylight_saving). This is not configurable by you.', $t_options);
- }
-
- $requirements['scheduler_timecheck'] = [
- 'title' => t('Scheduler Time Check'),
- 'value' => t('Server time: @utc', [
- '@utc' => $date_formatter->format($now, 'custom', 'jS F Y, H:i:s P', 'GMT'),
- ]),
- 'description' => [
- '#type' => 'inline_template',
- '#template' => '{{ description|raw }}',
- '#context' => ['description' => implode('' . t('The Scheduler module provides the functionality for automatic publishing and unpublishing of nodes at specified future dates.') . '
';
- $output .= '' . t('You can read more in the readme file or our project page on Drupal.org .', [
- '@readme' => $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'scheduler') . '/README.md',
- '@project' => 'https://drupal.org/project/scheduler',
- ]) . '
';
- break;
-
- case 'scheduler.admin_form':
- $output = '' . t('Some Scheduler options are set for each different content type, and are accessed via the admin content type list.', ['@link' => Url::fromRoute('entity.node_type.collection')->toString()]) . '';
- $output .= t('The options and settings below are common to all content types.') . '
';
- break;
-
- case 'scheduler.cron_form':
- $base_url = $GLOBALS['base_url'];
- $access_key = \Drupal::config('scheduler.settings')->get('lightweight_cron_access_key');
- $cron_url = $base_url . '/scheduler/cron/' . $access_key;
- $output = '' . t("When you have set up Drupal's standard crontab job cron.php then Scheduler will be executed during each cron run. However, if you would like finer granularity to scheduler, but don't want to run Drupal's cron more often then you can use the lightweight cron handler provided by Scheduler. This is an independent cron job which only runs the scheduler process and does not execute any cron tasks defined by Drupal core or any other modules.") . '
';
- $output .= '' . t("Scheduler's cron is at /scheduler/cron/{access-key} and a sample crontab entry to run scheduler every minute might look like:") . '
';
- $output .= '* * * * * wget -q -O /dev/null "' . $cron_url . '"';
- $output .= '' . t('or') . '
';
- $output .= '* * * * * curl -s -o /dev/null "' . $cron_url . '"content type form display :not_available', [
- '%field' => (string) $form[$field]['widget']['#title'],
- '%correct' => (string) $pluginDefinitions[$correct_widget_id]['label'],
- '%wrong' => (string) $pluginDefinitions[$actual_widget_id]['label'],
- '@link' => \Drupal::moduleHandler()->moduleExists('field_ui') ? Url::fromRoute('entity.entity_form_display.node.default', ['node_type' => $type->get('type')])->toString() : '#',
- ':not_available' => \Drupal::moduleHandler()->moduleExists('field_ui') ? '' : ('(' . t('not available') . ')'),
- ]), 'warning', FALSE);
- }
- }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter() for devel_generate_form_content.
- */
-function scheduler_form_devel_generate_form_content_alter(array &$form, FormStateInterface $form_state) {
- // Add an extra column to the node_types table to show which type are enabled
- // for scheduled publishing and unpublishing.
- $publishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('publish'));
- $unpublishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('unpublish'));
-
- $form['node_types']['#header']['scheduler'] = t('Scheduler settings');
-
- foreach (array_keys($form['node_types']['#options']) as $type) {
- $items = [];
- if (in_array($type, $publishing_enabled_types)) {
- $items[] = t('Enabled for publishing');
- }
- if (in_array($type, $unpublishing_enabled_types)) {
- $items[] = t('Enabled for unpublishing');
- }
- if (empty($items)) {
- $scheduler_settings = t('None');
- }
- else {
- $scheduler_settings = [
- 'data' => [
- '#theme' => 'item_list',
- '#items' => $items,
- ],
- ];
- }
- $form['node_types']['#options'][$type]['scheduler'] = $scheduler_settings;
- }
-
- // Add form items to specify what proportion of generated nodes should have a
- // publish-on and unpublish-on date assigned. See hook_node_presave() for the
- // code which sets the node values.
- $form['scheduler_publishing'] = [
- '#type' => 'number',
- '#title' => t('Publishing date for Scheduler'),
- '#description' => t('Enter the percentage of randomly selected Scheduler-enabled nodes to be given a publish-on date. Enter 0 for none, 100 for all. The date and time will be random within the range starting at node creation date, up to a time in the future matching the same span as selected above for node creation date.'),
- '#default_value' => 50,
- '#required' => TRUE,
- '#min' => 0,
- '#max' => 100,
- ];
- $form['scheduler_unpublishing'] = [
- '#type' => 'number',
- '#title' => t('Unpublishing date for Scheduler'),
- '#description' => t('Enter the percentage of randomly selected Scheduler-enabled nodes to be given an unpublish-on date. Enter 0 for none, 100 for all. The date and time will be random within the range starting at the later of node creation date and publish-on date, up to a time in the future matching the same span as selected above for node creation date.'),
- '#default_value' => 50,
- '#required' => TRUE,
- '#min' => 0,
- '#max' => 100,
- ];
-}
-
-/**
- * Implements hook_entity_base_field_info().
- */
-function scheduler_entity_base_field_info(EntityTypeInterface $entity_type) {
- if ($entity_type->id() === 'node') {
- $fields['publish_on'] = BaseFieldDefinition::create('timestamp')
- ->setLabel(t('Publish on'))
- ->setDisplayOptions('form', [
- 'type' => 'datetime_timestamp_no_default',
- 'weight' => 30,
- ])
- ->setDisplayConfigurable('form', TRUE)
- ->setTranslatable(TRUE)
- ->setRevisionable(TRUE)
- ->addConstraint('SchedulerPublishOn');
-
- $fields['unpublish_on'] = BaseFieldDefinition::create('timestamp')
- ->setLabel(t('Unpublish on'))
- ->setDisplayOptions('form', [
- 'type' => 'datetime_timestamp_no_default',
- 'weight' => 30,
- ])
- ->setDisplayConfigurable('form', TRUE)
- ->setTranslatable(TRUE)
- ->setRevisionable(TRUE)
- ->addConstraint('SchedulerUnpublishOn');
-
- return $fields;
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_view() for node entities.
- */
-function scheduler_node_view(array &$build, EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
- // If the node is going to be unpublished, then add this information to the
- // header for search engines. Only do this when the current page is the
- // full-page view of the node.
- // @see https://googleblog.blogspot.be/2007/07/robots-exclusion-protocol-now-with-even.html
- if (!empty($node->unpublish_on->value) && node_is_page($node)) {
- $unavailable_after = date(DATE_RFC850, $node->unpublish_on->value);
- $build['#attached']['http_header'][] = ['X-Robots-Tag', 'unavailable_after: ' . $unavailable_after];
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave() for node entities.
- */
-function scheduler_node_presave(EntityInterface $node) {
- $config = \Drupal::config('scheduler.settings');
- $entity = $node->type->entity;
-
- // If there is no entity object or the class is incorrect then stop here. This
- // should not really happen but it has been observed, so better to be safe.
- // @see https://www.drupal.org/node/2902512
- if (is_null($entity) || !get_class($entity) == 'Drupal\node\Entity\NodeType') {
- return;
- };
-
- // If this node is being created via Devel Generate then set values for the
- // publish_on and unpublish_on dates as specified in the devel_generate form.
- if (isset($node->devel_generate)) {
- static $publishing_enabled_types;
- static $unpublishing_enabled_types;
- static $publishing_percent;
- static $unpublishing_percent;
- static $time_range;
-
- if (!isset($publishing_enabled_types)) {
- $publishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('publish'));
- $unpublishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('unpublish'));
- $publishing_percent = $node->devel_generate['scheduler_publishing'];
- $unpublishing_percent = $node->devel_generate['scheduler_unpublishing'];
- // Reuse the selected 'node creation' time range for our future date span.
- $time_range = $node->devel_generate['time_range'];
- }
- if ($publishing_percent && in_array($node->getType(), $publishing_enabled_types)) {
- if (rand(1, 100) <= $publishing_percent) {
- // Randomly assign a publish_on value in the range starting with the
- // created date and up to the selected time range in the future.
- $node->set('publish_on', rand($node->created->value + 1, REQUEST_TIME + $time_range));
- }
- }
- if ($unpublishing_percent && in_array($node->getType(), $unpublishing_enabled_types)) {
- if (rand(1, 100) <= $unpublishing_percent) {
- // Randomly assign an unpublish_on value in the range from the later of
- // created date/publish_on date up to the time range in the future.
- $node->set('unpublish_on', rand(max($node->created->value, $node->publish_on->value), REQUEST_TIME + $time_range));
- }
- }
- }
-
- // If the node type is enabled for scheduled publishing and has a publish_on
- // date then check if publishing is allowed and if the content needs to be
- // published immediately.
- if ($entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable')) && !empty($node->publish_on->value)) {
- // Check that other modules allow the action on this node.
- $publication_allowed = \Drupal::service('scheduler.manager')->isAllowed($node, 'publish');
-
- // Publish the node immediately if the publication date is in the past.
- $publish_immediately = $entity->getThirdPartySetting('scheduler', 'publish_past_date', $config->get('default_publish_past_date')) == 'publish';
-
- if ($publication_allowed && $publish_immediately && $node->publish_on->value <= REQUEST_TIME) {
- // Trigger the PRE_PUBLISH_INMEDIATELY event so that modules can react
- // before the node has been published.
- $event = new SchedulerEvent($node);
- \Drupal::service('event_dispatcher')->dispatch(SchedulerEvents::PRE_PUBLISH_IMMEDIATELY, $event);
- $node = $event->getNode();
-
- // If required, set the created date to match published date.
- if ($entity->getThirdPartySetting('scheduler', 'publish_touch', $config->get('default_publish_touch'))) {
- $node->setCreatedTime($node->publish_on->value);
- }
- $node->publish_on->value = NULL;
- $node->setPublished(TRUE);
-
- // Trigger the PUBLISH_IMMEDIATELY event so that modules can react after
- // the node has been published.
- $event = new SchedulerEvent($node);
- \Drupal::service('event_dispatcher')->dispatch(SchedulerEvents::PUBLISH_IMMEDIATELY, $event);
- $node = $event->getNode();
- }
- else {
- // Ensure the node is unpublished as it will be published by cron later.
- $node->setPublished(FALSE);
-
- // Only inform the user that the node is scheduled if publication has not
- // been prevented by other modules. Those modules have to display a
- // message themselves explaining why publication is denied.
- if ($publication_allowed) {
- $date_formatter = \Drupal::service('date.formatter');
- drupal_set_message(t('This post is unpublished and will be published @publish_time.', [
- '@publish_time' => $date_formatter->format($node->publish_on->value, 'long'),
- ]), 'status', FALSE);
- }
- }
- }
-
- if ($entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable')) && !empty($node->unpublish_on->value)) {
- // Scheduler does not do the same 'immediate' processing for unpublishing.
- // However, the api hook should still be called during presave as there may
- // be messages to be displayed if the unpublishing will be disallowed later.
- \Drupal::service('scheduler.manager')->isAllowed($node, 'unpublish');
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_insert() for node entities.
- */
-function scheduler_node_insert(EntityInterface $node) {
- // Removed RULES code but keep the function. There may be code to add here.
- // @TODO remove this comment when done. JSS Sep 2016.
-}
-
-/**
- * Implements hook_ENTITY_TYPE_update() for node entities.
- */
-function scheduler_node_update(EntityInterface $node) {
- // Removed RULES code but keep the function. There may be code to add here.
- // This function is currently called by actions SetPublishingDate and
- // SetUnpublishingDate.
- // @TODO remove this comment when done. JSS Sep 2016.
-}
-
-/**
- * Implements hook_cron().
- */
-function scheduler_cron() {
- // Use drupal_static so that any function can find out if we are running
- // Scheduler cron. Set the default value to FALSE, then turn on the flag.
- // @see scheduler_cron_is_running()
- $scheduler_cron = &drupal_static(__FUNCTION__, FALSE);
- $scheduler_cron = TRUE;
-
- /** @var \Drupal\scheduler\SchedulerManager $scheduler_manager */
- $scheduler_manager = \Drupal::service('scheduler.manager');
- $scheduler_manager->publish();
- $scheduler_manager->unpublish();
-
- // Scheduler 7.x provided hook_scheduler_api() which has been replaced by
- // event dispatching in 8.x. Display a warning in the log if any of these
- // hooks still exist, so that admins and developers are informed.
- foreach (Drupal::moduleHandler()->getImplementations('scheduler_api') as $module) {
- \Drupal::logger('scheduler')->warning('Function %function has not been executed. In Drupal 8, implementations of hook_scheduler_api() should be replaced by Scheduler event listeners.', [
- '%function' => $module . '_scheduler_api',
- ]);
- }
-
- // Reset the static scheduler_cron flag.
- drupal_static_reset(__FUNCTION__);
-}
-
-/**
- * Return whether Scheduler cron is running.
- *
- * This function can be called from any Scheduler function, from any contrib
- * module or from custom PHP in a view or rule.
- *
- * @return bool
- * TRUE if scheduler_cron is currently running. FALSE if not.
- */
-function scheduler_cron_is_running() {
- return drupal_static('scheduler_cron');
-}
-
-/**
- * Implements hook_entity_extra_field_info().
- */
-function scheduler_entity_extra_field_info() {
- $config = \Drupal::config('scheduler.settings');
-
- // Expose the Scheduler group on the 'Manage Form Display' tab when editing a
- // content type. This allows admins to adjust the weight of the group, and it
- // works for vertical tabs and separate fieldsets.
- $fields = [];
- foreach (node_type_get_types() as $type) {
- $publishing_enabled = $type->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'));
- $unpublishing_enabled = $type->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'));
-
- if ($publishing_enabled || $unpublishing_enabled) {
- // Weight 20 puts this below the core fields by default.
- $fields['node'][$type->get('type')]['form']['scheduler_settings'] = [
- 'label' => t('Scheduler Dates'),
- 'description' => t('Fieldset containing Scheduler Publish-on and Unpublish-on date input fields'),
- 'weight' => 20,
- ];
- }
- }
- return $fields;
-}
-
-/**
- * Prepares variables for node templates.
- *
- * Makes the publish_on and unpublish_on data available as theme variables.
- *
- * @see template_preprocess_node()
- */
-function scheduler_preprocess_node(&$variables) {
- $date_formatter = \Drupal::service('date.formatter');
- /* @var $node \Drupal\node\NodeInterface */
- $node = $variables['node'];
- if (!empty($node->publish_on->value) && $node->publish_on->value && is_numeric($node->publish_on->value)) {
- $variables['publish_on'] = $date_formatter->format($node->publish_on->value, 'long');
- }
- if (!empty($node->unpublish_on->value) && $node->unpublish_on->value && is_numeric($node->unpublish_on->value)) {
- $variables['unpublish_on'] = $date_formatter->format($node->unpublish_on->value, 'long');
- }
-}
-
-/**
- * Implements hook_feeds_processor_targets_alter().
- *
- * This function exposes publish_on and unpublish_on as mappable targets to the
- * Feeds module.
- *
- * @todo Port to Drupal 8.
- *
- * @see https://www.drupal.org/node/2651354
- */
-function scheduler_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_name) {
- $config = \Drupal::config('scheduler.settings');
-
- // Scheduler module only works on nodes.
- if ($entity_type == 'node') {
- $publishing_enabled = $entity_type->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'));
- $unpublishing_enabled = $entity_type->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'));
-
- if ($publishing_enabled) {
- $targets['publish_on'] = [
- 'name' => t('Scheduler: publish on'),
- 'description' => t('The date when the Scheduler module will publish the node.'),
- 'callback' => 'scheduler_feeds_set_target',
- ];
- }
- if ($unpublishing_enabled) {
- $targets['unpublish_on'] = [
- 'name' => t('Scheduler: unpublish on'),
- 'description' => t('The date when the Scheduler module will unpublish the node.'),
- 'callback' => 'scheduler_feeds_set_target',
- ];
- }
- }
-}
-
-/**
- * Mapping callback for the Feeds module.
- *
- * @todo Port to Drupal 8.
- *
- * @see https://www.drupal.org/node/2651354
- */
-function scheduler_feeds_set_target($source, $entity, $target, $value, $mapping) {
- // We expect a string or integer, but can accomodate an array, by taking the
- // first item. Use trim() so that a string of blanks is reduced to empty.
- $value = is_array($value) ? trim(reset($value)) : trim($value);
-
- // Convert input from parser to timestamp form. If $value is empty or blank
- // then strtotime() must not be used, otherwise it returns the current time.
- if (!empty($value) && !is_numeric($value)) {
- if (!$timestamp = strtotime($value)) {
- throw new FeedsValidationException(
- // Throw an exception if the date format was not recognized.
- t('Value %value for @source could not be converted to a valid %target date.', [
- '@source' => $mapping['source'],
- '%value' => $value,
- '%target' => $target,
- ])
- );
- }
- }
- else {
- $timestamp = $value;
- }
-
- // If the timestamp is valid then use it to set the target field in the node.
- if (is_numeric($timestamp) && $timestamp > 0) {
- $entity->$target = $timestamp;
- }
-}
-
-/**
- * Returns all content types for which scheduler has been enabled.
- *
- * @param string $action
- * The action that needs to be checked. Can be 'publish' or 'unpublish'.
- *
- * @return \Drupal\node\NodeTypeInterface[]
- * Array of NodeTypeInterface objects
- */
-function _scheduler_get_scheduler_enabled_node_types($action) {
- $config = \Drupal::config('scheduler.settings');
- $node_types = NodeType::loadMultiple();
- return array_filter($node_types, function ($bundle) use ($action, $config) {
- /* @var \Drupal\node\NodeTypeInterface $bundle */
- return $bundle->getThirdPartySetting('scheduler', $action . '_enable', $config->get('default_' . $action . '_enable'));
- });
-}
diff --git a/modules/scheduler/scheduler.permissions.yml b/modules/scheduler/scheduler.permissions.yml
deleted file mode 100644
index 5e36688..0000000
--- a/modules/scheduler/scheduler.permissions.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-'administer scheduler':
- title: 'Administer scheduler'
- description: 'Configure scheduler date formats, pop-up calendar, default times, lightweight cron'
-'schedule publishing of nodes':
- title: 'Schedule content publication'
- description: 'Allows users to set a start and end time for content publication'
-'view scheduled content':
- title: 'View scheduled content list'
- description: 'Allows users to see all content which is scheduled.'
diff --git a/modules/scheduler/scheduler.routing.yml b/modules/scheduler/scheduler.routing.yml
deleted file mode 100644
index 33774ef..0000000
--- a/modules/scheduler/scheduler.routing.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-scheduler.admin_form:
- path: '/admin/config/content/scheduler'
- defaults:
- _title: 'Scheduler'
- _form: '\Drupal\scheduler\Form\SchedulerAdminForm'
- requirements:
- _permission: 'administer scheduler'
-
-scheduler.cron_form:
- path: '/admin/config/content/scheduler/cron'
- defaults:
- _title: 'Lightweight cron'
- _description: 'Configuration form for the lightweight cron.'
- _form: '\Drupal\scheduler\Form\SchedulerCronForm'
- requirements:
- _permission: 'administer scheduler'
-
-scheduler.lightweight_cron:
- path: '/scheduler/cron/{cron_key}'
- defaults:
- _controller: '\Drupal\scheduler\Controller\LightweightCronController::index'
- _description: 'Run the lightweight cron process'
- _title: 'Lightweight cron'
- options:
- no_cache: TRUE
- requirements:
- _custom_access: '\Drupal\scheduler\Controller\LightweightCronController::access'
diff --git a/modules/scheduler/scheduler.services.yml b/modules/scheduler/scheduler.services.yml
deleted file mode 100644
index 00ab742..0000000
--- a/modules/scheduler/scheduler.services.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-services:
- scheduler.manager:
- class: Drupal\scheduler\SchedulerManager
- arguments: ['@date.formatter', '@logger.channel.scheduler', '@module_handler', '@entity.manager', '@config.factory' ]
- logger.channel.scheduler:
- class: Drupal\Core\Logger\LoggerChannel
- factory: logger.factory:get
- arguments: ['scheduler']
- access_checker.scheduler_content:
- class: Drupal\scheduler\Access\ScheduledListAccess
- arguments: ['@current_route_match']
- tags:
- - { name: access_check }
diff --git a/modules/scheduler/scheduler.tokens.inc b/modules/scheduler/scheduler.tokens.inc
deleted file mode 100644
index 550ff60..0000000
--- a/modules/scheduler/scheduler.tokens.inc
+++ /dev/null
@@ -1,66 +0,0 @@
- t('Publish on date'),
- 'description' => t("The date the node will be published."),
- 'type' => 'date',
- ];
- $info['tokens']['node']['scheduler-unpublish'] = [
- 'name' => t('Unpublish on date'),
- 'description' => t("The date the node will be unpublished."),
- 'type' => 'date',
- ];
-
- return $info;
-}
-
-/**
- * Implements hook_tokens().
- */
-function scheduler_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
- $token_service = \Drupal::token();
- $date_formatter = \Drupal::service('date.formatter');
- $language_code = isset($options['language']) ? $options['language']->language : NULL;
- $replacements = [];
-
- if ($type == 'node' && !empty($data['node'])) {
- $node = $data['node'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'scheduler-publish':
- if (isset($node->publish_on->value)) {
- $replacements[$original] = $date_formatter->format($node->publish_on->value, 'medium', '', NULL, $language_code);
- }
- break;
-
- case 'scheduler-unpublish':
- if (isset($node->unpublish_on->value)) {
- $replacements[$original] = $date_formatter->format($node->unpublish_on->value, 'medium', '', NULL, $language_code);
- }
- break;
- }
- }
-
- // Chained token replacement.
- if (isset($node->publish_on->value) && $publish_tokens = $token_service->findWithPrefix($tokens, 'scheduler-publish')) {
- $replacements += $token_service->generate('date', $publish_tokens, ['date' => $node->publish_on->value], $options, $bubbleable_metadata);
- }
- if (isset($node->unpublish_on->value) && $unpublish_tokens = $token_service->findWithPrefix($tokens, 'scheduler-unpublish')) {
- $replacements += $token_service->generate('date', $unpublish_tokens, ['date' => $node->unpublish_on->value], $options, $bubbleable_metadata);
- }
- }
-
- return $replacements;
-}
diff --git a/modules/scheduler/scheduler_handler_field_scheduler_countdown.inc b/modules/scheduler/scheduler_handler_field_scheduler_countdown.inc
deleted file mode 100644
index 9794a58..0000000
--- a/modules/scheduler/scheduler_handler_field_scheduler_countdown.inc
+++ /dev/null
@@ -1,157 +0,0 @@
-ensure_my_table();
- $this->node_table = $this->query->ensure_table('node', $this->relationship);
- $time_field = $this->definition['timestamp_field'];
- $this->field_alias = $this->query->add_field(NULL, 'CASE WHEN (' . $time_field . ' > ' . REQUEST_TIME . ') THEN (' . $time_field . ' - ' . REQUEST_TIME . ') ELSE NULL END', $this->table_alias . '_' . $this->field);
- }
-
- /**
- * Define our display options and provide defaults.
- *
- * @return array
- * An associative array containing the options.
- */
- public function optionDefinition() {
- $options = parent::option_definition();
- $options['countdown_display'] = ['default' => 'smart'];
- $options['units_display'] = ['default' => 'long'];
- return $options;
- }
-
- /**
- * Defines the form for the user to select the display options.
- */
- public function optionsForm(array &$form, FormStateInterface $form_state) {
- parent::options_form($form, $form_state);
- $form['countdown_display'] = [
- '#title' => t('Display countdown as'),
- '#type' => 'radios',
- '#options' => [
- 'smart' => t('Smart mode'),
- 'seconds' => t('Seconds'),
- 'minutes' => t('Minutes'),
- 'hours' => t('Hours'),
- 'days' => t('Days'),
- 'weeks' => t('Weeks'),
- ],
- '#default_value' => $this->options['countdown_display'],
- ];
- $form['units_display'] = [
- '#title' => t('Display time units'),
- '#type' => 'radios',
- '#options' => [
- 'long' => t('Long (for example 3 days)'),
- 'short' => t('Short (for example 3d)'),
- 'none' => t('No units at all'),
- ],
- '#default_value' => $this->options['units_display'],
- ];
- }
-
- /**
- * Callback function to filter out unwanted values.
- *
- * Keep only the array scale values which are smaller than the countdown value
- * being displayed.
- */
- public function scaleFilterCallback($array_value) {
- return ($this->raw_value >= $array_value);
- }
-
- /**
- * Renders the countdown value in the units required.
- */
- public function render($values) {
- $countdown_display = $this->options['countdown_display'];
- $this->raw_value = $values->{$this->field_alias};
-
- $scales = [
- 'weeks' => self::WEEK_SCALE,
- 'days' => self::DAY_SCALE,
- 'hours' => self::HOUR_SCALE,
- 'minutes' => self::MINUTE_SCALE,
- 'seconds' => self::SECOND_SCALE,
- ];
- // If the field has been set to 'Smart', determine the right timescale.
- if ($countdown_display == 'smart') {
- $scales = array_filter($scales, [$this, 'scale_filter_callback']);
- $scale = empty($scales) ? self::SECOND_SCALE : reset($scales);
- }
- // Otherwise use the fixed display requested.
- else {
- $scale = $scales[$countdown_display];
- }
-
- // Get the display value by dividing the original value by the scale.
- $scaled_value = round($this->raw_value / $scale);
-
- switch ($scale) {
- case self::SECOND_SCALE:
- $long = \Drupal::translation()->formatPlural($scaled_value, '1 second', '@count seconds', ['@count' => $scaled_value]);
- $short = t('@counts', ['@count' => $scaled_value]);
- break;
-
- case self::MINUTE_SCALE:
- $long = \Drupal::translation()->formatPlural($scaled_value, '1 minute', '@count minutes', ['@count' => $scaled_value]);
- $short = t('@countm', ['@count' => $scaled_value]);
- break;
-
- case self::HOUR_SCALE:
- $long = \Drupal::translation()->formatPlural($scaled_value, '1 hour', '@count hours', ['@count' => $scaled_value]);
- $short = t('@counth', ['@count' => $scaled_value]);
- break;
-
- case self::DAY_SCALE:
- $long = \Drupal::translation()->formatPlural($scaled_value, '1 day', '@count days', ['@count' => $scaled_value]);
- $short = t('@countd', ['@count' => $scaled_value]);
- break;
-
- case self::WEEK_SCALE:
- $long = \Drupal::translation()->formatPlural($scaled_value, '1 week', '@count weeks', ['@count' => $scaled_value]);
- $short = t('@countw', ['@count' => $scaled_value]);
- break;
- }
-
- switch ($this->options['units_display']) {
- case 'long':
- return $long;
-
- case 'short':
- return $short;
-
- default:
- return $scaled_value;
- }
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.info.yml b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.info.yml
deleted file mode 100644
index 973d9ed..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Scheduler Rules Integration
-type: module
-description: 'Scheduler sub-module providing conditions, actions and events for use with the Rules module.'
-# core: 8.x
-dependencies:
- - rules:rules
- - scheduler:scheduler
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.module b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.module
deleted file mode 100644
index beb0615..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.module
+++ /dev/null
@@ -1,74 +0,0 @@
-publish_on->value)) {
- // @todo: In 7.x we had the dates as parameters. These are available in Rules via node.publish_on.value so maybe we do not need the parms?
- $event = new NewNodeIsScheduledForPublishingEvent($node);
- $event_dispatcher->dispatch(NewNodeIsScheduledForPublishingEvent::EVENT_NAME, $event);
- }
- if (!empty($node->unpublish_on->value)) {
- $event = new NewNodeIsScheduledForUnpublishingEvent($node);
- $event_dispatcher->dispatch(NewNodeIsScheduledForUnpublishingEvent::EVENT_NAME, $event);
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_update() for node entities.
- */
-function scheduler_rules_integration_node_update(EntityInterface $node) {
- // Invoke Rules events to indicate that an existing node has been scheduled.
- $event_dispatcher = \Drupal::service('event_dispatcher');
- if (!empty($node->publish_on->value)) {
- $event = new ExistingNodeIsScheduledForPublishingEvent($node, ['node' => $node]);
- $event_dispatcher->dispatch(ExistingNodeIsScheduledForPublishingEvent::EVENT_NAME, $event);
- }
- if (!empty($node->unpublish_on->value)) {
- $event = new ExistingNodeIsScheduledForUnpublishingEvent($node);
- $event_dispatcher->dispatch(ExistingNodeIsScheduledForUnpublishingEvent::EVENT_NAME, $event);
- }
-}
-
-/**
- * Trigger Rules events during cron.
- *
- * This function is called from the main Scheduler module publish() and
- * unpublish() functions in the SchedulerManager class.
- */
-function _scheduler_rules_integration_dispatch_cron_event(EntityInterface $node, $event_type) {
- $event_dispatcher = \Drupal::service('event_dispatcher');
- if ($event_type == 'publish') {
- // Invoke the event to tell Rules that Scheduler has published this node.
- // @todo 2nd param $publish_on may be needed as the date will no longer be on the node
- $event = new SchedulerHasPublishedThisNodeEvent($node);
- $event_dispatcher->dispatch(SchedulerHasPublishedThisNodeEvent::EVENT_NAME, $event);
- }
- elseif ($event_type == 'unpublish') {
- // Invoke the event to tell Rules that Scheduler has unpublished this node.
- // @todo 2nd param $publish_on may be needed as the date will no longer be on the node
- $event = new SchedulerHasUnpublishedThisNodeEvent($node);
- $event_dispatcher->dispatch(SchedulerHasUnpublishedThisNodeEvent::EVENT_NAME, $event);
- }
-}
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules.events.yml b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules.events.yml
deleted file mode 100644
index c49a780..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules.events.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-scheduler_new_node_is_scheduled_for_publishing_event:
- label: 'After saving new content that is scheduled for publishing'
- category: 'Scheduler'
- context:
- node:
- type: 'entity:node'
- label: 'Scheduled Content Node'
- description: 'The node object representing the scheduled content'
-# These parameters were in the 7.x version. May not be needed, but left here
-# for reference until decision is made.
-# @TODO Add the parameters or remove these commented lines. Sep 2016
-# publish_on:
-# type: 'integer'
-# label: 'Scheduler Publish On date'
-# description: 'Date and time that the node will be published by Scheduler'
-# unpublish_on:
-# type: 'integer'
-# label: 'Scheduler Unpublish On date'
-# description: 'Date and time that the node will be unpublished by Scheduler'
-
-scheduler_existing_node_is_scheduled_for_publishing_event:
- label: 'After updating existing content that is scheduled for publishing'
- category: 'Scheduler'
- context:
- node:
- type: 'entity:node'
- label: 'Scheduled Content Node'
- description: 'The node object representing the scheduled content'
-
-scheduler_new_node_is_scheduled_for_unpublishing_event:
- label: 'After saving new content that is scheduled for unpublishing'
- category: 'Scheduler'
- context:
- node:
- type: 'entity:node'
- label: 'Scheduled Content Node'
- description: 'The node object representing the scheduled content'
-
-scheduler_existing_node_is_scheduled_for_unpublishing_event:
- label: 'After updating existing content that is scheduled for unpublishing'
- category: 'Scheduler'
- context:
- node:
- type: 'entity:node'
- label: 'Scheduled Content Node'
- description: 'The node object representing the scheduled content'
-
-scheduler_has_published_this_node_event:
- label: 'After a node has been published by Scheduler'
- category: 'Scheduler'
- context:
- node:
- type: 'entity:node'
- label: 'Scheduled Content Node'
- description: 'The node object representing the scheduled content'
-
-scheduler_has_unpublished_this_node_event:
- label: 'After a node has been unpublished by Scheduler'
- category: 'Scheduler'
- context:
- node:
- type: 'entity:node'
- label: 'Scheduled Content Node'
- description: 'The node object representing the scheduled content'
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules_defaults.inc b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules_defaults.inc
deleted file mode 100644
index 6ff1dfc..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules_defaults.inc
+++ /dev/null
@@ -1,144 +0,0 @@
-label = t('Send e-mail when content is published by Scheduler');
- $rule->active = FALSE;
- $rule->event('scheduler_node_has_been_published_event')
- ->condition(rules_condition('data_is_empty', ['data:select' => 'node:author:mail', 'value' => TRUE])->negate())
- ->action('mail', [
- 'to' => '[node:author:mail]',
- 'subject' => t("'[node:title]' has been published on [site:name]"),
- // Needs double quotes for the newlines to be evaluated.
- 'message' => t("Dear [node:author:name],\r\nYour [node:type] '[node:title]' has been published on [site:name].\r\nThe link is [node:url]\r\n"),
- ]);
- $rule->tags = ['Scheduler'];
- $configs['scheduler_send_email_after_publishing_node'] = $rule;
-
- // 2. Reaction rule to send an email when Scheduler unpublishes content.
- $rule = rules_reaction_rule();
- $rule->label = t('Send e-mail when content is unpublished by Scheduler');
- $rule->active = FALSE;
- $rule->event('scheduler_node_has_been_unpublished_event')
- ->condition(rules_condition('data_is_empty', ['data:select' => 'node:author:mail', 'value' => TRUE])->negate())
- ->action('mail', [
- 'to' => '[node:author:mail]',
- 'subject' => t("'[node:title]' has been unpublished on [site:name]"),
- 'message' => t("Dear [node:author:name],\r\nYour [node:type] '[node:title]' has been unpublished on [site:name].\r\nThe link is [node:url]\r\n"),
- ]);
- $rule->tags = ['Scheduler'];
- $configs['scheduler_send_email_after_unpublishing_node'] = $rule;
-
- // Define four components which will be available in the 'Components' tab in
- // Rules admin. These are also available in Views Bulk Operations, to allow
- // a user to set or remove scheduling dates in bulk.
- // 1. Component to set the publishing date on a node.
- $rule = rule([
- 'scheduler_node' => [
- 'type' => 'node',
- 'label' => t('Node'),
- 'description' => t('The node for publishing via Scheduler.'),
- ],
- 'scheduler_publish_on_date' => [
- 'type' => 'date',
- 'label' => t('Publish-on Date'),
- 'description' => t('The publishing date to be used by Scheduler.'),
- ],
- ]);
- $rule->label = t('Set scheduled publishing date');
- $rule
- ->condition('scheduler_condition_publishing_is_enabled', [
- 'node:select' => 'scheduler-node',
- ])
- // The keys required below are 'node:select' and 'date:select'. This is made
- // up of the key names defined in scheduler_rules_action_info() followed by
- // :select to specify data selection instead of plain text values.
- ->action('scheduler_set_publish_date_action', [
- 'node:select' => 'scheduler-node',
- 'date:select' => 'scheduler-publish-on-date',
- ]);
- $rule->tags = ['Scheduler'];
- $configs['scheduler_set_publish_date_component'] = $rule;
-
- // 2. Component to set the unpublishing date on a node.
- $rule = rule([
- 'scheduler_node' => [
- 'type' => 'node',
- 'label' => t('Node'),
- 'description' => t('The node for unpublishing via Scheduler.'),
- ],
- 'scheduler_unpublish_on_date' => [
- 'type' => 'date',
- 'label' => t('Unpublish-on Date'),
- 'description' => t('The unpublishing date to be used by Scheduler.'),
- ],
- ]);
- $rule->label = t('Set scheduled unpublishing date');
- $rule
- ->condition('scheduler_condition_unpublishing_is_enabled', [
- 'node:select' => 'scheduler-node',
- ])
- ->action('scheduler_set_unpublish_date_action', [
- 'node:select' => 'scheduler-node',
- 'date:select' => 'scheduler-unpublish-on-date',
- ]);
- $rule->tags = ['Scheduler'];
- $configs['scheduler_set_unpublish_date_component'] = $rule;
-
- // 3. Component to remove the publishing date from a node.
- $rule = rule([
- 'scheduler_node' => [
- 'type' => 'node',
- 'label' => t('The scheduled node'),
- 'description' => t('The node scheduled for publishing via Scheduler.'),
- ],
- ]);
- $rule->label = t('Remove scheduled publishing date');
- $rule
- ->condition('scheduler_condition_node_is_scheduled_for_publishing', [
- 'node:select' => 'scheduler-node',
- ])
- ->action('scheduler_remove_publish_date_action', [
- 'node:select' => 'scheduler-node',
- ]);
- $rule->tags = ['Scheduler'];
- $configs['scheduler_remove_publish_date_component'] = $rule;
-
- // 4. Component to remove the unpublishing date from a node.
- $rule = rule([
- 'scheduler_node' => [
- 'type' => 'node',
- 'label' => t('The scheduled node'),
- 'description' => t('The node scheduled for unpublishing via Scheduler.'),
- ],
- ]);
- $rule->label = t('Remove scheduled unpublishing date');
- $rule
- ->condition('scheduler_condition_node_is_scheduled_for_unpublishing', [
- 'node:select' => 'scheduler-node',
- ])
- ->action('scheduler_remove_unpublish_date_action', [
- 'node:select' => 'scheduler-node',
- ]);
- $rule->tags = ['Scheduler'];
- $configs['scheduler_remove_unpublish_date_component'] = $rule;
-
- return $configs;
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForPublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForPublishingEvent.php
deleted file mode 100644
index d1c7a02..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForPublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-node = $node;
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForUnpublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForUnpublishingEvent.php
deleted file mode 100644
index b51a412..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForUnpublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-node = $node;
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForPublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForPublishingEvent.php
deleted file mode 100644
index 4bafa01..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForPublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-node = $node;
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForUnpublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForUnpublishingEvent.php
deleted file mode 100644
index d002da6..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForUnpublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-node = $node;
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasPublishedThisNodeEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasPublishedThisNodeEvent.php
deleted file mode 100644
index 266b765..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasPublishedThisNodeEvent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-node = $node;
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasUnpublishedThisNodeEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasUnpublishedThisNodeEvent.php
deleted file mode 100644
index 2ba1309..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasUnpublishedThisNodeEvent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-node = $node;
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForPublishing.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForPublishing.php
deleted file mode 100644
index b281a81..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForPublishing.php
+++ /dev/null
@@ -1,35 +0,0 @@
-getContextValue('node');
- return !empty($node->publish_on->value);
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForUnpublishing.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForUnpublishing.php
deleted file mode 100644
index 6c2d390..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForUnpublishing.php
+++ /dev/null
@@ -1,35 +0,0 @@
-getContextValue('node');
- return !empty($node->unpublish_on->value);
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/PublishingIsEnabled.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/PublishingIsEnabled.php
deleted file mode 100644
index 4c9b11a..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/PublishingIsEnabled.php
+++ /dev/null
@@ -1,37 +0,0 @@
-getContextValue('node');
- $config = \Drupal::config('scheduler.settings');
- return ($node->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable')));
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/UnpublishingIsEnabled.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/UnpublishingIsEnabled.php
deleted file mode 100644
index e4e3856..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/UnpublishingIsEnabled.php
+++ /dev/null
@@ -1,37 +0,0 @@
-getContextValue('node');
- $config = \Drupal::config('scheduler.settings');
- return ($node->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable')));
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/PublishNow.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/PublishNow.php
deleted file mode 100644
index 3727a96..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/PublishNow.php
+++ /dev/null
@@ -1,36 +0,0 @@
-getContextValue('node');
- $node->setPublished(TRUE);
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemovePublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemovePublishingDate.php
deleted file mode 100644
index 7969a8e..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemovePublishingDate.php
+++ /dev/null
@@ -1,46 +0,0 @@
-getContextValue('node');
- $config = \Drupal::config('scheduler.settings');
- if ($node->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'))) {
- $node->set('publish_on', NULL);
- scheduler_node_presave($node);
- scheduler_node_update($node);
- }
- else {
- $type_name = node_get_type_label($node);
- $arguments = [
- '%type' => $type_name,
- 'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
- ];
- \Drupal::logger('scheduler')->warning('Scheduler rules action "Remove publishing date" - Scheduled publishing is not enabled for %type content. To prevent this message add the condition "Scheduled publishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
- }
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemoveUnpublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemoveUnpublishingDate.php
deleted file mode 100644
index 2d48c8c..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemoveUnpublishingDate.php
+++ /dev/null
@@ -1,46 +0,0 @@
-getContextValue('node');
- $config = \Drupal::config('scheduler.settings');
- if ($node->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'))) {
- $node->set('unpublish_on', NULL);
- scheduler_node_presave($node);
- scheduler_node_update($node);
- }
- else {
- $type_name = node_get_type_label($node);
- $arguments = [
- '%type' => $type_name,
- 'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
- ];
- \Drupal::logger('scheduler')->warning('Scheduler rules action "Remove unpublishing date" - Scheduled unpublishing is not enabled for %type content. To prevent this message add the condition "Scheduled unpublishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
- }
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetPublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetPublishingDate.php
deleted file mode 100644
index 6d3d676..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetPublishingDate.php
+++ /dev/null
@@ -1,55 +0,0 @@
-getContextValue('node');
- $date = $this->getContextValue('date');
- $config = \Drupal::config('scheduler.settings');
- if ($node->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'))) {
- $node->set('publish_on', $date);
- // When this action is invoked and it operates on the node being editted
- // then hook_node_presave() and hook_node_update() will be executed
- // automatically. But if this action is being used to schedule a different
- // node then we need to call the functions directly here.
- scheduler_node_presave($node);
- scheduler_node_update($node);
- }
- else {
- $type_name = node_get_type_label($node);
- $arguments = [
- '%type' => $type_name,
- 'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
- ];
- \Drupal::logger('scheduler')->warning('Scheduler rules action "Set publishing date" - Scheduled publishing is not enabled for %type content. To prevent this message add the condition "Scheduled publishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
- }
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetUnpublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetUnpublishingDate.php
deleted file mode 100644
index 5bfc93f..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetUnpublishingDate.php
+++ /dev/null
@@ -1,55 +0,0 @@
-getContextValue('node');
- $date = $this->getContextValue('date');
- $config = \Drupal::config('scheduler.settings');
- if ($node->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'))) {
- $node->set('unpublish_on', $date);
- // When this action is invoked and it operates on the node being editted
- // then hook_node_presave() and hook_node_update() will be executed
- // automatically. But if this action is being used to schedule a different
- // node then we need to call the functions directly here.
- scheduler_node_presave($node);
- scheduler_node_update($node);
- }
- else {
- $type_name = node_get_type_label($node);
- $arguments = [
- '%type' => $type_name,
- 'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
- ];
- \Drupal::logger('scheduler')->warning('Scheduler rules action "Set unpublishing date" - Scheduled unpublishing is not enabled for %type content. To prevent this message add the condition "Scheduled unpublishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
- }
- }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/UnpublishNow.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/UnpublishNow.php
deleted file mode 100644
index 2be4278..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/UnpublishNow.php
+++ /dev/null
@@ -1,36 +0,0 @@
-getContextValue('node');
- $node->setPublished(FALSE);
- }
-
-}
diff --git a/modules/scheduler/src/Access/ScheduledListAccess.php b/modules/scheduler/src/Access/ScheduledListAccess.php
deleted file mode 100644
index f5cac5e..0000000
--- a/modules/scheduler/src/Access/ScheduledListAccess.php
+++ /dev/null
@@ -1,60 +0,0 @@
-routeMatch = $route_match;
- }
-
- /**
- * {@inheritdoc}
- */
- public function applies(Route $route) {
- return $route->hasRequirement('_access_scheduler_content');
- }
-
- /**
- * Determine if the $account has access to the scheduled content list.
- *
- * The result will vary depending on whether the page being viewed is the user
- * profile page or the scheduled content admin overview.
- */
- public function access(AccountInterface $account) {
- // When viewing a user profile page routeMatch->getRawParameter('user')
- // returns the user's id. If not on a user page it returns NULL silently.
- $viewing_own_tab = $this->routeMatch->getRawParameter('user') == $account->id();
-
- // Users with 'schedule publishing of nodes' can see their own scheduled
- // content via a tab on their user page. Users with 'view scheduled content'
- // will be able to access the 'scheduled' tab for any user, and also access
- // the scheduled content overview page.
- $allowed = $account->hasPermission('view scheduled content')
- || ($viewing_own_tab && $account->hasPermission('schedule publishing of nodes'));
- return $allowed ? AccessResult::allowed() : AccessResult::forbidden();
- }
-
-}
diff --git a/modules/scheduler/src/Controller/LightweightCronController.php b/modules/scheduler/src/Controller/LightweightCronController.php
deleted file mode 100644
index 44d5c0b..0000000
--- a/modules/scheduler/src/Controller/LightweightCronController.php
+++ /dev/null
@@ -1,47 +0,0 @@
-runLightweightCron();
-
- return new Response('', 204);
- }
-
- /**
- * Checks access.
- *
- * @param string $cron_key
- * The cron key.
- *
- * @return \Drupal\Core\Access\AccessResultInterface
- * The access result.
- */
- public function access($cron_key) {
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::config with dependency injection?
- $valid_cron_key = \Drupal::config('scheduler.settings')
- ->get('lightweight_cron_access_key');
- return AccessResult::allowedIf($valid_cron_key == $cron_key);
- }
-
-}
diff --git a/modules/scheduler/src/Exception/SchedulerMissingDateException.php b/modules/scheduler/src/Exception/SchedulerMissingDateException.php
deleted file mode 100644
index eda12bc..0000000
--- a/modules/scheduler/src/Exception/SchedulerMissingDateException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-dateFormatter = $date_formatter;
- $this->configFactory = $config_factory;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('date.formatter'),
- $container->get('config.factory')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'scheduler_admin_form';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditableConfigNames() {
- return ['scheduler.settings'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $form['date_format_placeholder'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Date format'),
- // Show this placeholder for info. Could remove after 8.x-1.0 release.
- // @see https://www.drupal.org/node/2799869
- '#description' => $this->t('The Scheduler date format is no longer used and is not configurable. For more details see Scheduler issue 2799869 ', [':url' => 'https://www.drupal.org/node/2799869']),
- '#collapsible' => FALSE,
- ];
-
- // Options for setting date-only with default time.
- $form['date_only_fieldset'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Date only'),
- '#collapsible' => FALSE,
- ];
- $form['date_only_fieldset']['allow_date_only'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Allow users to enter only a date and provide a default time.'),
- '#default_value' => $this->setting('allow_date_only'),
- '#description' => $this->t('When only a date is entered the time will default to a specified value, but the user can change this if required.'),
- ];
- $form['date_only_fieldset']['default_time'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Default time'),
- '#default_value' => $this->setting('default_time'),
- '#size' => 20,
- '#maxlength' => 20,
- '#description' => $this->t('This is the time that will be used if the user does not enter a value. Format: HH:MM:SS.'),
- '#states' => [
- 'visible' => [
- ':input[name="scheduler_allow_date_only"]' => ['checked' => TRUE],
- ],
- ],
- ];
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- // If date-only is enabled then check if a valid default time was entered.
- // Leading zeros and seconds can be omitted, eg. 6:30 is considered valid.
- if ($form_state->getValue(['allow_date_only'])) {
- $default_time = date_parse($form_state->getValue(['default_time']));
- if ($default_time['error_count']) {
- $form_state->setErrorByName('default_time', $this->t('The default time should be in the format HH:MM:SS'));
- }
- else {
- // Insert any possibly omitted leading zeroes.
- $unix_time = mktime($default_time['hour'], $default_time['minute'], $default_time['second']);
- $form_state->setValue(['default_time'], $this->dateFormatter->format($unix_time, 'custom', 'H:i:s'));
- }
- }
-
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->config('scheduler.settings')
- ->set('allow_date_only', $form_state->getValue(['allow_date_only']))
- ->set('default_time', $form_state->getValue('default_time'))
- ->save();
-
- parent::submitForm($form, $form_state);
- }
-
- /**
- * Helper method to access the settings of this module.
- *
- * @param string $key
- * The key of the configuration.
- *
- * @return \Drupal\Core\Config\ImmutableConfig
- * The value of the config setting equested.
- */
- protected function setting($key) {
- return $this->configFactory->get('scheduler.settings')->get($key);
- }
-
-}
diff --git a/modules/scheduler/src/Form/SchedulerCronForm.php b/modules/scheduler/src/Form/SchedulerCronForm.php
deleted file mode 100644
index f9abb55..0000000
--- a/modules/scheduler/src/Form/SchedulerCronForm.php
+++ /dev/null
@@ -1,166 +0,0 @@
-moduleHandler = $module_handler;
- $this->schedulerManager = $scheduler_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static($container->get('module_handler'), $container->get('scheduler.manager'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'scheduler_cron_form';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditableConfigNames() {
- return ['scheduler.settings'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $config = $this->config('scheduler.settings');
-
- $form['cron_settings'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Lightweight cron settings'),
- ];
- $form['cron_settings']['lightweight_log'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Log every activation and completion message.'),
- '#default_value' => $config->get('log'),
- '#description' => $this->t('When this option is checked, Scheduler will write an entry to the log every time the lightweight cron process is started and completed. This is useful during set up and testing, but can result in a large number of log entries. Any actions performed during the lightweight cron run will always be logged regardless of this setting.'),
- ];
- $form['cron_settings']['lightweight_access_key'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Lightweight cron access key'),
- '#default_value' => $config->get('lightweight_cron_access_key'),
- '#required' => TRUE,
- '#size' => 25,
- '#description' => $this->t("Similar to Drupal's cron key this acts as a security token to prevent unauthorised calls to scheduler/cron. The key should be passed as scheduler/cron/{access key}"),
- ];
- // Add a submit handler function for the key generation.
- $form['cron_settings']['create_key'][] = [
- '#type' => 'submit',
- '#value' => $this->t('Generate new random key'),
- '#submit' => ['::generateRandomKey'],
- // No validation at all is required in the equivocate case, so
- // we include this here to make it skip the form-level validator.
- '#validate' => [],
- ];
- // Add a submit handler function for the form.
- $form['buttons']['submit_cron'][] = [
- '#type' => 'submit',
- '#prefix' => $this->t("You can test Scheduler's lightweight cron process interactively"),
- '#value' => $this->t("Run Scheduler's lightweight cron now"),
- '#submit' => ['::runLightweightCron'],
- // No validation at all is required in the equivocate case, so
- // we include this here to make it skip the form-level validator.
- '#validate' => [],
- ];
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $config = $this->config('scheduler.settings');
- $config->set('log', $form_state->getValue('lightweight_log'));
- $config->set('lightweight_cron_access_key', $form_state->getValue('lightweight_access_key'));
- $config->save();
- parent::submitForm($form, $form_state);
- }
-
- /**
- * Form submission handler for the random key generation.
- *
- * This only fires when the 'Generate new random key' button is clicked.
- *
- * @param array $form
- * An associative array containing the structure of the form.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The current state of the form.
- */
- public function generateRandomKey(array &$form, FormStateInterface $form_state) {
- $config = $this->config('scheduler.settings');
- $config->set('lightweight_cron_access_key', substr(md5(rand()), 0, 20));
- $config->save();
- parent::submitForm($form, $form_state);
- }
-
- /**
- * Form submission handler to run the lightweight cron.
- *
- * This only fires when "Run Scheduler's lightweight cron now" is clicked.
- *
- * @param array $form
- * An associative array containing the structure of the form.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The current state of the form.
- */
- public function runLightweightCron(array &$form, FormStateInterface $form_state) {
- $this->schedulerManager->runLightweightCron();
-
- if ($this->moduleHandler->moduleExists('dblog')) {
- $url = Url::fromRoute('dblog.overview')->toString();
- $message = $this->t('Lightweight cron run completed. See the log for details.', ['@url' => $url]);
- }
- else {
- // If the Database Logging module is not enabled the route to the log
- // overview does not exist. Show a simple status message.
- $message = $this->t('Lightweight cron run completed.');
- }
- // @todo Replace drupal_set_message() with an injectable service in 8.1.x.
- // @see https://www.drupal.org/node/2278383
- drupal_set_message($message);
- }
-
-}
diff --git a/modules/scheduler/src/Plugin/Field/FieldWidget/TimestampDatetimeNoDefaultWidget.php b/modules/scheduler/src/Plugin/Field/FieldWidget/TimestampDatetimeNoDefaultWidget.php
deleted file mode 100644
index 5127ede..0000000
--- a/modules/scheduler/src/Plugin/Field/FieldWidget/TimestampDatetimeNoDefaultWidget.php
+++ /dev/null
@@ -1,87 +0,0 @@
-getPattern();
- $time_format = DateFormat::load('html_time')->getPattern();
- $element['value']['#description'] = $this->t('Format: %format. Leave blank for no date.', ['%format' => Datetime::formatExample($date_format . ' ' . $time_format)]);
-
- // Set the callback function to allow interception of the submitted user
- // input and add the default time if needed. It is too late to try this in
- // function massageFormValues as the validation has already been done.
- $element['value']['#value_callback'] = [$this, 'valueCallback'];
- return $element;
- }
-
- /**
- * Callback function to add default time to the input date if needed.
- *
- * This will intercept the user input before form validation is processed.
- */
- public static function valueCallback(&$element, $input, FormStateInterface $form_state) {
- if ($input !== FALSE) {
- $date_input = $element['#date_date_element'] != 'none' && !empty($input['date']) ? $input['date'] : '';
- $time_input = $element['#date_time_element'] != 'none' && !empty($input['time']) ? $input['time'] : '';
- // If there is an input date but no time and the date-only option is on
- // then set the input time to the default specified by scheduler options.
- $config = \Drupal::config('scheduler.settings');
- if (!empty($date_input) && empty($time_input) && $config->get('allow_date_only')) {
- $input['time'] = $config->get('default_time');
- }
- }
- // Chain on to the standard valueCallback for Datetime as we do not want to
- // duplicate that core code here.
- return Datetime::valueCallback($element, $input, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
- foreach ($values as &$item) {
- // @todo The structure is different whether access is denied or not, to
- // be fixed in https://www.drupal.org/node/2326533.
- $date = NULL;
- if (isset($item['value']) && $item['value'] instanceof DrupalDateTime) {
- $date = $item['value'];
- }
- elseif (isset($item['value']['object']) && $item['value']['object'] instanceof DrupalDateTime) {
- $date = $item['value']['object'];
- }
-
- $item['value'] = $date ? $date->getTimestamp() : NULL;
- }
- return $values;
- }
-
-}
diff --git a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraint.php b/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraint.php
deleted file mode 100644
index a7eafe7..0000000
--- a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraint.php
+++ /dev/null
@@ -1,32 +0,0 @@
-value;
- $default_publish_past_date = \Drupal::config('scheduler.settings')->get('default_publish_past_date');
- $scheduler_publish_past_date = $entity->getEntity()->type->entity->getThirdPartySetting('scheduler', 'publish_past_date', $default_publish_past_date);
-
- if ($publish_on && $scheduler_publish_past_date == 'error' && $publish_on < REQUEST_TIME) {
- $this->context->buildViolation($constraint->messagePublishOnDateNotInFuture)
- ->atPath('publish_on')
- ->addViolation();
- }
- }
-
-}
diff --git a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraint.php b/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraint.php
deleted file mode 100644
index 8523034..0000000
--- a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraint.php
+++ /dev/null
@@ -1,53 +0,0 @@
-get('default_unpublish_required');
- $scheduler_unpublish_required = $entity->getEntity()->type->entity->getThirdPartySetting('scheduler', 'unpublish_required', $default_unpublish_required);
- $publish_on = $entity->getEntity()->publish_on->value;
- $unpublish_on = $entity->value;
- $status = $entity->getEntity()->status->value;
-
- // When the 'required unpublishing' option is enabled the #required form
- // attribute cannot set in every case. However a value must be entered if
- // also setting a publish-on date.
- if ($scheduler_unpublish_required && !empty($publish_on) && empty($unpublish_on)) {
- $this->context->buildViolation($constraint->messageUnpublishOnRequiredIfPublishOnEntered)
- ->atPath('unpublish_on')
- ->addViolation();
- }
-
- // Similar to the above scenario, the unpublish-on date must be entered if
- // the content is being published directly.
- if ($scheduler_unpublish_required && $status && empty($unpublish_on)) {
- $this->context->buildViolation($constraint->messageUnpublishOnRequiredIfPublishing)
- ->atPath('unpublish_on')
- ->addViolation();
- }
-
- // Check that the unpublish-on date is in the future. Unlike the publish-on
- // field, there is no option to use a past date, as this is not relevant for
- // unpublshing. The date must ALWAYS be in the future if it is entered.
- if ($unpublish_on && $unpublish_on < REQUEST_TIME) {
- $this->context->buildViolation($constraint->messageUnpublishOnDateNotInFuture)
- ->atPath('unpublish_on')
- ->addViolation();
- }
-
- // If both dates are entered then the unpublish-on date must be later than
- // the publish-on date.
- if (!empty($publish_on) && !empty($unpublish_on) && $unpublish_on < $publish_on) {
- $this->context->buildViolation($constraint->messageUnpublishOnTooEarly)
- ->atPath('unpublish_on')
- ->addViolation();
- }
- }
-
-}
diff --git a/modules/scheduler/src/Plugin/views/access/Scheduler.php b/modules/scheduler/src/Plugin/views/access/Scheduler.php
deleted file mode 100644
index 4255a7f..0000000
--- a/modules/scheduler/src/Plugin/views/access/Scheduler.php
+++ /dev/null
@@ -1,59 +0,0 @@
-access($account);
- }
-
- /**
- * {@inheritdoc}
- */
- public function alterRouteDefinition(Route $route) {
- $route->setRequirement('_access_scheduler_content', 'TRUE');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCacheContexts() {
- return ['user'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCacheTags() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCacheMaxAge() {
- return Cache::PERMANENT;
- }
-
-}
diff --git a/modules/scheduler/src/SchedulerEvent.php b/modules/scheduler/src/SchedulerEvent.php
deleted file mode 100644
index ca857e4..0000000
--- a/modules/scheduler/src/SchedulerEvent.php
+++ /dev/null
@@ -1,50 +0,0 @@
-node = $node;
- }
-
- /**
- * Gets node object.
- *
- * @return \Drupal\Core\Entity\EntityInterface
- * The node object that caused the event to fire.
- */
- public function getNode() {
- return $this->node;
- }
-
- /**
- * Sets the node object.
- *
- * @param \Drupal\Core\Entity\EntityInterface $node
- * The node object that caused the event to fire.
- */
- public function setNode(EntityInterface $node) {
- $this->node = $node;
- }
-
-}
diff --git a/modules/scheduler/src/SchedulerEvents.php b/modules/scheduler/src/SchedulerEvents.php
deleted file mode 100644
index 404d535..0000000
--- a/modules/scheduler/src/SchedulerEvents.php
+++ /dev/null
@@ -1,98 +0,0 @@
-dateFormatter = $dateFormatter;
- $this->logger = $logger;
- $this->moduleHandler = $moduleHandler;
- $this->entityManager = $entityManager;
- $this->configFactory = $configFactory;
- }
-
- /**
- * Publish scheduled nodes.
- *
- * @return bool
- * TRUE if any node has been published, FALSE otherwise.
- *
- * @throws \Drupal\scheduler\Exception\SchedulerMissingDateException
- * @throws \Drupal\scheduler\Exception\SchedulerNodeTypeNotEnabledException
- */
- public function publish() {
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::service with dependency injection?
- /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher */
- $dispatcher = \Drupal::service('event_dispatcher');
-
- $result = FALSE;
- $action = 'publish';
-
- // Select all nodes of the types that are enabled for scheduled publishing
- // and where publish_on is less than or equal to the current time.
- $nids = [];
- $scheduler_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types($action));
- if (!empty($scheduler_enabled_types)) {
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::entityQuery with dependency injection?
- $query = \Drupal::entityQuery('node')
- ->exists('publish_on')
- ->condition('publish_on', REQUEST_TIME, '<=')
- ->condition('type', $scheduler_enabled_types, 'IN')
- ->sort('publish_on')
- ->sort('nid');
- // Disable access checks for this query.
- // @see https://www.drupal.org/node/2700209
- $query->accessCheck(FALSE);
- $nids = $query->execute();
- }
-
- // Allow other modules to add to the list of nodes to be published.
- $nids = array_unique(array_merge($nids, $this->nidList($action)));
-
- // Allow other modules to alter the list of nodes to be published.
- $this->moduleHandler->alter('scheduler_nid_list', $nids, $action);
-
- // In 8.x the entity translations are all associated with one node id
- // unlike 7.x where each translation was a separate node. This means that
- // the list of node ids returned above may have some translations that need
- // processing now and others that do not.
- $nodes = Node::loadMultiple($nids);
- // @TODO: Node::loadMultiple calls should be avoided in classes.
- // Replace with dependency injection?
- foreach ($nodes as $node_multilingual) {
-
- // The API calls could return nodes of types which are not enabled for
- // scheduled publishing, so do not process these. This check can be done
- // once, here, as the setting will be the same for all translations.
- if (!$node_multilingual->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $this->setting('default_publish_enable'))) {
- throw new SchedulerNodeTypeNotEnabledException(sprintf("Node %d '%s' will not be published because node type '%s' is not enabled for scheduled publishing", $node_multilingual->id(), $node_multilingual->getTitle(), node_get_type_label($node_multilingual)));
- }
-
- $languages = $node_multilingual->getTranslationLanguages();
- foreach ($languages as $language) {
- // The object returned by getTranslation() behaves the same as a $node.
- $node = $node_multilingual->getTranslation($language->getId());
-
- // If the current translation does not have a publish on value, or it is
- // later than the date we are processing then move on to the next.
- $publish_on = $node->publish_on->value;
- if (empty($publish_on) || $publish_on > REQUEST_TIME) {
- continue;
- }
-
- // Check that other modules allow the action on this node.
- if (!$this->isAllowed($node, $action)) {
- continue;
- }
-
- // $node->set('changed', $publish_on) will fail badly if an API call has
- // removed the date. Trap this as an exception here and give a
- // meaningful message.
- // @TODO This will now never be thrown due to the empty(publish_on)
- // check above to cater for translations. Remove this exception?
- if (empty($node->publish_on->value)) {
- $field_definitions = $this->entityManager->getFieldDefinitions('node', $node->getType());
- $field = (string) $field_definitions['publish_on']->getLabel();
- throw new SchedulerMissingDateException(sprintf("Node %d '%s' will not be published because field '%s' has no value", $node->id(), $node->getTitle(), $field));
- }
-
- // Trigger the PRE_PUBLISH event so that modules can react before the
- // node is published.
- $event = new SchedulerEvent($node);
- $dispatcher->dispatch(SchedulerEvents::PRE_PUBLISH, $event);
- $node = $event->getNode();
-
- // Update timestamps.
- $node->set('changed', $publish_on);
- $old_creation_date = $node->getCreatedTime();
- if ($node->type->entity->getThirdPartySetting('scheduler', 'publish_touch', $this->setting('default_publish_touch'))) {
- $node->setCreatedTime($publish_on);
- }
-
- $create_publishing_revision = $node->type->entity->getThirdPartySetting('scheduler', 'publish_revision', $this->setting('default_publish_revision'));
- if ($create_publishing_revision) {
- $node->setNewRevision();
- // Use a core date format to guarantee a time is included.
- // @TODO: 't' calls should be avoided in classes.
- // Replace with dependency injection?
- $node->revision_log = t('Node published by Scheduler on @now. Previous creation date was @date.', [
- '@now' => $this->dateFormatter->format(REQUEST_TIME, 'short'),
- '@date' => $this->dateFormatter->format($old_creation_date, 'short'),
- ]);
- }
- // Unset publish_on so the node will not get rescheduled by subsequent
- // calls to $node->save().
- $node->publish_on->value = NULL;
-
- // Log the fact that a scheduled publication is about to take place.
- $view_link = $node->link(t('View node'));
- $nodetype_url = Url::fromRoute('entity.node_type.edit_form', ['node_type' => $node->getType()]);
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::l with dependency injection?
- $nodetype_link = \Drupal::l(node_get_type_label($node) . ' ' . t('settings'), $nodetype_url);
- $logger_variables = [
- '@type' => node_get_type_label($node),
- '%title' => $node->getTitle(),
- 'link' => $nodetype_link . ' ' . $view_link,
- ];
- $this->logger->notice('@type: scheduled publishing of %title.', $logger_variables);
-
- // Use the actions system to publish the node.
- $this->entityManager->getStorage('action')->load('node_publish_action')->getPlugin()->execute($node);
-
- // Invoke the event to tell Rules that Scheduler has published the node.
- if ($this->moduleHandler->moduleExists('scheduler_rules_integration')) {
- _scheduler_rules_integration_dispatch_cron_event($node, 'publish');
- }
-
- // Trigger the PUBLISH event so that modules can react after the node is
- // published.
- $event = new SchedulerEvent($node);
- $dispatcher->dispatch(SchedulerEvents::PUBLISH, $event);
- $event->getNode()->save();
-
- $result = TRUE;
- }
- }
-
- return $result;
- }
-
- /**
- * Unpublish scheduled nodes.
- *
- * @return bool
- * TRUE if any node has been unpublished, FALSE otherwise.
- *
- * @throws \Drupal\scheduler\Exception\SchedulerMissingDateException
- * @throws \Drupal\scheduler\Exception\SchedulerNodeTypeNotEnabledException
- */
- public function unpublish() {
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::service with dependency injection?
- /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher */
- $dispatcher = \Drupal::service('event_dispatcher');
-
- $result = FALSE;
- $action = 'unpublish';
-
- // Select all nodes of the types that are enabled for scheduled unpublishing
- // and where unpublish_on is less than or equal to the current time.
- $nids = [];
- $scheduler_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types($action));
- if (!empty($scheduler_enabled_types)) {
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::entityQuery with dependency injection?
- $query = \Drupal::entityQuery('node')
- ->exists('unpublish_on')
- ->condition('unpublish_on', REQUEST_TIME, '<=')
- ->condition('type', $scheduler_enabled_types, 'IN')
- ->sort('unpublish_on')
- ->sort('nid');
- // Disable access checks for this query.
- // @see https://www.drupal.org/node/2700209
- $query->accessCheck(FALSE);
- $nids = $query->execute();
- }
-
- // Allow other modules to add to the list of nodes to be unpublished.
- $nids = array_unique(array_merge($nids, $this->nidList($action)));
-
- // Allow other modules to alter the list of nodes to be unpublished.
- $this->moduleHandler->alter('scheduler_nid_list', $nids, $action);
-
- // @TODO: Node::loadMultiple calls should be avoided in classes.
- // Replace with dependency injection?
- $nodes = Node::loadMultiple($nids);
- foreach ($nodes as $node_multilingual) {
- // The API calls could return nodes of types which are not enabled for
- // scheduled unpublishing. Do not process these.
- if (!$node_multilingual->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $this->setting('default_unpublish_enable'))) {
- throw new SchedulerNodeTypeNotEnabledException(sprintf("Node %d '%s' will not be unpublished because node type '%s' is not enabled for scheduled unpublishing", $node_multilingual->id(), $node_multilingual->getTitle(), node_get_type_label($node_multilingual)));
- }
-
- $languages = $node_multilingual->getTranslationLanguages();
- foreach ($languages as $language) {
- // The object returned by getTranslation() behaves the same as a $node.
- $node = $node_multilingual->getTranslation($language->getId());
-
- // If the current translation does not have an unpublish on value, or it
- // is later than the date we are processing then move on to the next.
- $unpublish_on = $node->unpublish_on->value;
- if (empty($unpublish_on) || $unpublish_on > REQUEST_TIME) {
- continue;
- }
-
- // Do not process the node if it still has a publish_on time which is in
- // the past, as this implies that scheduled publishing has been blocked
- // by one of the hook functions we provide, and is still being blocked
- // now that the unpublishing time has been reached.
- $publish_on = $node->publish_on->value;
- if (!empty($publish_on) && $publish_on <= REQUEST_TIME) {
- continue;
- }
-
- // Check that other modules allow the action on this node.
- if (!$this->isAllowed($node, $action)) {
- continue;
- }
-
- // $node->set('changed', $unpublish_on) will fail badly if an API call
- // has removed the date. Trap this as an exception here and give a
- // meaningful message.
- // @TODO This will now never be thrown due to the empty(unpublish_on)
- // check above to cater for translations. Remove this exception?
- if (empty($unpublish_on)) {
- $field_definitions = $this->entityManager->getFieldDefinitions('node', $node->getType());
- $field = (string) $field_definitions['unpublish_on']->getLabel();
- throw new SchedulerMissingDateException(sprintf("Node %d '%s' will not be unpublished because field '%s' has no value", $node->id(), $node->getTitle(), $field));
- }
-
- // Trigger the PRE_UNPUBLISH event so that modules can react before the
- // node is unpublished.
- $event = new SchedulerEvent($node);
- $dispatcher->dispatch(SchedulerEvents::PRE_UNPUBLISH, $event);
- $node = $event->getNode();
-
- // Update timestamps.
- $old_change_date = $node->getChangedTime();
- $node->set('changed', $unpublish_on);
-
- $create_unpublishing_revision = $node->type->entity->getThirdPartySetting('scheduler', 'unpublish_revision', $this->setting('default_unpublish_revision'));
- if ($create_unpublishing_revision) {
- $node->setNewRevision();
- // Use a core date format to guarantee a time is included.
- // @TODO: 't' calls should be avoided in classes.
- // Replace with dependency injection?
- $node->revision_log = t('Node unpublished by Scheduler on @now. Previous change date was @date.', [
- '@now' => $this->dateFormatter->format(REQUEST_TIME, 'short'),
- '@date' => $this->dateFormatter->format($old_change_date, 'short'),
- ]);
- }
- // Unset unpublish_on so the node will not get rescheduled by subsequent
- // calls to $node->save(). Save the value for use when calling Rules.
- $node->unpublish_on->value = NULL;
-
- // Log the fact that a scheduled unpublication is about to take place.
- $view_link = $node->link(t('View node'));
- $nodetype_url = Url::fromRoute('entity.node_type.edit_form', ['node_type' => $node->getType()]);
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::l with dependency injection?
- $nodetype_link = \Drupal::l(node_get_type_label($node) . ' ' . t('settings'), $nodetype_url);
- $logger_variables = [
- '@type' => node_get_type_label($node),
- '%title' => $node->getTitle(),
- 'link' => $nodetype_link . ' ' . $view_link,
- ];
- $this->logger->notice('@type: scheduled unpublishing of %title.', $logger_variables);
-
- // Use the actions system to publish the node.
- $this->entityManager->getStorage('action')->load('node_unpublish_action')->getPlugin()->execute($node);
-
- // Invoke event to tell Rules that Scheduler has unpublished this node.
- if ($this->moduleHandler->moduleExists('scheduler_rules_integration')) {
- _scheduler_rules_integration_dispatch_cron_event($node, 'unpublish');
- }
-
- // Trigger the UNPUBLISH event so that modules can react before the node
- // is unpublished.
- $event = new SchedulerEvent($node);
- $dispatcher->dispatch(SchedulerEvents::UNPUBLISH, $event);
- $event->getNode()->save();
-
- $result = TRUE;
- }
- }
-
- return $result;
- }
-
- /**
- * Checks whether a scheduled action on a node is allowed.
- *
- * This provides a way for other modules to prevent scheduled publishing or
- * unpublishing, by implementing hook_scheduler_allow_publishing() or
- * hook_scheduler_allow_unpublishing().
- *
- * @param \Drupal\node\NodeInterface $node
- * The node on which the action is to be performed.
- * @param string $action
- * The action that needs to be checked. Can be 'publish' or 'unpublish'.
- *
- * @return bool
- * TRUE if the action is allowed, FALSE if not.
- *
- * @see hook_scheduler_allow_publishing()
- * @see hook_scheduler_allow_unpublishing()
- */
- public function isAllowed(NodeInterface $node, $action) {
- // Default to TRUE.
- $result = TRUE;
- // Check that other modules allow the action.
- $hook = 'scheduler_allow_' . $action . 'ing';
- foreach ($this->moduleHandler->getImplementations($hook) as $module) {
- $function = $module . '_' . $hook;
- $result &= $function($node);
- }
-
- return $result;
- }
-
- /**
- * Gather node IDs for all nodes that need to be $action'ed.
- *
- * Modules can implement hook_scheduler_nid_list($action) and return an array
- * of node ids which will be added to the existing list.
- *
- * @param string $action
- * The action being performed, either "publish" or "unpublish".
- *
- * @return array
- * An array of node ids.
- */
- public function nidList($action) {
- $nids = [];
-
- foreach ($this->moduleHandler->getImplementations('scheduler_nid_list') as $module) {
- $function = $module . '_scheduler_nid_list';
- $nids = array_merge($nids, $function($action));
- }
-
- return $nids;
- }
-
- /**
- * Run the lightweight cron.
- *
- * The Scheduler part of the processing performed here is the same as in the
- * normal Drupal cron run. The difference is that only scheduler_cron() is
- * executed, no other modules hook_cron() functions are called.
- *
- * This function is called from the external crontab job via url
- * /scheduler/cron/{access key} or it can be run interactively from the
- * Scheduler configuration page at /admin/config/content/scheduler/cron.
- */
- public function runLightweightCron() {
- $log = $this->setting('log');
- if ($log) {
- $this->logger->notice('Lightweight cron run activated.');
- }
- scheduler_cron();
- if (ob_get_level() > 0) {
- $handlers = ob_list_handlers();
- if (isset($handlers[0]) && $handlers[0] == 'default output handler') {
- ob_clean();
- }
- }
- if ($log) {
- // @TODO: \Drupal calls should be avoided in classes.
- // Replace \Drupal::l with dependency injection?
- $this->logger->notice('Lightweight cron run completed.', ['link' => \Drupal::l(t('settings'), Url::fromRoute('scheduler.cron_form'))]);
- }
- }
-
- /**
- * Helper method to access the settings of this module.
- *
- * @param string $key
- * The key of the configuration.
- *
- * @return \Drupal\Core\Config\ImmutableConfig
- * The value of the configuration item requested.
- */
- protected function setting($key) {
- return $this->configFactory->get('scheduler.settings')->get($key);
- }
-
-}
diff --git a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.info.yml b/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.info.yml
deleted file mode 100644
index e23f609..0000000
--- a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Scheduler Node Access Test'
-type: module
-description: 'Support module for Scheduler restricted node access testing.'
-package: Testing
-# core: 8.x
-dependencies:
- - scheduler:scheduler
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.install b/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.install
deleted file mode 100644
index 70c7472..0000000
--- a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.install
+++ /dev/null
@@ -1,26 +0,0 @@
- 'scheduler',
- 'gid' => 1,
- 'grant_view' => 0,
- 'grant_update' => 0,
- 'grant_delete' => 0,
- ],
- ];
- return $grants;
-}
-
-/**
- * Implements hook_node_grants().
- */
-function scheduler_access_test_node_grants(AccountInterface $account, $op) {
- // This hook needs to exist, but we do not return any grants.
- return [];
-}
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_form_display.node.scheduler_api_test.default.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_form_display.node.scheduler_api_test.default.yml
deleted file mode 100644
index e943f58..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_form_display.node.scheduler_api_test.default.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - field.field.node.scheduler_api_test.field_approved_publishing
- - field.field.node.scheduler_api_test.field_approved_unpublishing
- - node.type.scheduler_api_test
- module:
- - path
- - scheduler
-id: node.scheduler_api_test.default
-targetEntityType: node
-bundle: scheduler_api_test
-mode: default
-content:
- title:
- type: string_textfield
- weight: 0
- settings:
- size: 60
- placeholder: ''
- third_party_settings: { }
- langcode:
- type: language_select
- weight: 1
- settings: { }
- third_party_settings: { }
- uid:
- type: entity_reference_autocomplete
- weight: 2
- settings:
- match_operator: CONTAINS
- size: 60
- placeholder: ''
- third_party_settings: { }
- created:
- type: datetime_timestamp
- weight: 3
- settings: { }
- third_party_settings: { }
- promote:
- type: boolean_checkbox
- settings:
- display_label: true
- weight: 4
- third_party_settings: { }
- sticky:
- type: boolean_checkbox
- settings:
- display_label: true
- weight: 5
- third_party_settings: { }
- path:
- type: path
- weight: 6
- settings: { }
- third_party_settings: { }
- field_approved_publishing:
- type: boolean_checkbox
- weight: 7
- settings:
- display_label: true
- third_party_settings: { }
- field_approved_unpublishing:
- type: boolean_checkbox
- weight: 8
- settings:
- display_label: true
- third_party_settings: { }
- publish_on:
- type: datetime_timestamp_no_default
- weight: 9
- settings: { }
- third_party_settings: { }
- unpublish_on:
- type: datetime_timestamp_no_default
- weight: 10
- settings: { }
- third_party_settings: { }
-hidden: { }
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_view_display.node.scheduler_api_test.default.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_view_display.node.scheduler_api_test.default.yml
deleted file mode 100644
index 34011b1..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_view_display.node.scheduler_api_test.default.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - field.field.node.scheduler_api_test.field_approved_publishing
- - field.field.node.scheduler_api_test.field_approved_unpublishing
- - node.type.scheduler_api_test
- module:
- - user
-id: node.scheduler_api_test.default
-targetEntityType: node
-bundle: scheduler_api_test
-mode: default
-content:
- field_approved_publishing:
- type: boolean
- weight: 1
- label: inline
- settings:
- format: default
- format_custom_false: ''
- format_custom_true: ''
- third_party_settings: { }
- field_approved_unpublishing:
- type: boolean
- weight: 1
- label: inline
- settings:
- format: default
- format_custom_false: ''
- format_custom_true: ''
- third_party_settings: { }
- links:
- weight: 0
- settings: { }
- third_party_settings: { }
-hidden:
- langcode: true
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_publishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_publishing.yml
deleted file mode 100644
index 9d1a167..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_publishing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.node.field_approved_publishing
- - node.type.scheduler_api_test
- enforced:
- module:
- - scheduler_api_test
-id: node.scheduler_api_test.field_approved_publishing
-field_name: field_approved_publishing
-entity_type: node
-bundle: scheduler_api_test
-label: 'Approved for Publishing'
-description: ''
-required: false
-translatable: false
-default_value:
- -
- value: 0
-default_value_callback: ''
-settings:
- on_label: 'Yes'
- off_label: 'No'
-field_type: boolean
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_unpublishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_unpublishing.yml
deleted file mode 100644
index 1902663..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_unpublishing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.node.field_approved_unpublishing
- - node.type.scheduler_api_test
- enforced:
- module:
- - scheduler_api_test
-id: node.scheduler_api_test.field_approved_unpublishing
-field_name: field_approved_unpublishing
-entity_type: node
-bundle: scheduler_api_test
-label: 'Approved for Unpublishing'
-description: ''
-required: false
-translatable: false
-default_value:
- -
- value: 0
-default_value_callback: ''
-settings:
- on_label: 'Yes'
- off_label: 'No'
-field_type: boolean
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_publishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_publishing.yml
deleted file mode 100644
index 76bfedb..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_publishing.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - node
- enforced:
- module:
- - scheduler_api_test
-id: node.field_approved_publishing
-field_name: field_approved_publishing
-entity_type: node
-type: boolean
-settings: { }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: { }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_unpublishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_unpublishing.yml
deleted file mode 100644
index 083b926..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_unpublishing.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - node
- enforced:
- module:
- - scheduler_api_test
-id: node.field_approved_unpublishing
-field_name: field_approved_unpublishing
-entity_type: node
-type: boolean
-settings: { }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: { }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/node.type.scheduler_api_test.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/node.type.scheduler_api_test.yml
deleted file mode 100644
index 4e75ce1..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/node.type.scheduler_api_test.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - menu_ui
- - scheduler
- enforced:
- module:
- - scheduler_api_test
-third_party_settings:
- menu_ui:
- available_menus:
- - main
- parent: 'main:'
- scheduler:
- expand_fieldset: when_required
- fields_display_mode: fieldset
- publish_enable: true
- publish_past_date: schedule
- publish_required: false
- publish_revision: false
- publish_touch: false
- unpublish_enable: true
- unpublish_required: false
- unpublish_revision: false
-name: 'Scheduler API test type'
-type: scheduler_api_test
-description: 'Used for Scheduler API testing'
-help: ''
-new_revision: false
-preview_mode: 1
-display_submitted: true
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.info.yml b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.info.yml
deleted file mode 100644
index 1427f62..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Scheduler API Test'
-type: module
-description: 'Support module for Scheduler API-related testing.'
-package: Testing
-# core: 8.x
-dependencies:
- - scheduler:scheduler
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.install b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.install
deleted file mode 100644
index d1509db..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.install
+++ /dev/null
@@ -1,34 +0,0 @@
-select('node', 'n')
- ->fields('n', ['nid'])
- ->condition('n.type', ['scheduler_api_test'], 'IN')
- ->execute();
- if ($nids = $nids_query->fetchCol()) {
- entity_delete_multiple('node', $nids);
- drupal_set_message(t('@number %type node(s) have been deleted.', [
- '@number' => count($nids),
- '%type' => 'scheduler_api_test',
- ]));
- }
-
- // The content type, custom fields and storage are deleted automatically by
- // having 'enforced: module: - scheduler_api_test' in the
- // config/install/*.yml files.
-}
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.module b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.module
deleted file mode 100644
index 70f0286..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.module
+++ /dev/null
@@ -1,121 +0,0 @@
-execute());
-
- foreach ($nodes as $nid => $node) {
- // If publishing and this is the publish test node, set a date and add
- // the node id to the list.
- if ($action == 'publish' && $node->title->value == 'API TEST nid_list publish me') {
- $node->set('publish_on', REQUEST_TIME)->save();
- $nids[] = $nid;
- }
- // If unpublishing and this is the unpublish test node, set a date and add
- // the node id to the list.
- if ($action == 'unpublish' && $node->title->value == 'API TEST nid_list unpublish me') {
- $node->set('unpublish_on', REQUEST_TIME)->save();
- $nids[] = $nid;
- }
- }
- return $nids;
-}
-
-/**
- * Implements hook_scheduler_nid_list_alter().
- */
-function scheduler_api_test_scheduler_nid_list_alter(&$nids, $action) {
- $query = \Drupal::entityQuery('node');
- $nodes = Node::loadMultiple($query->execute());
-
- foreach ($nodes as $nid => $node) {
- if ($action == 'publish' && $node->title->value == 'API TEST nid_list_alter do not publish me') {
- // Remove the node id.
- $nids = array_diff($nids, [$nid]);
- }
- if ($action == 'publish' && $node->title->value == 'API TEST nid_list_alter publish me') {
- // Set a publish_on date and add the node id.
- $node->set('publish_on', REQUEST_TIME)->save();
- $nids[] = $nid;
- }
- if ($action == 'unpublish' && $node->title->value == 'API TEST nid_list_alter do not unpublish me') {
- // Remove the node id.
- $nids = array_diff($nids, [$nid]);
- }
- if ($action == 'unpublish' && $node->title->value == 'API TEST nid_list_alter unpublish me') {
- // Set an unpublish_on date and add the node id.
- $node->set('unpublish_on', REQUEST_TIME)->save();
- $nids[] = $nid;
- }
- }
- return $nids;
-}
-
-/**
- * Implements hook_scheduler_allow_publishing().
- */
-function scheduler_api_test_scheduler_allow_publishing($node) {
- // If there is no 'Approved for Publishing' field then allow publishing.
- if (!isset($node->field_approved_publishing)) {
- $allowed = TRUE;
- }
- else {
- // Only publish nodes that have 'Approved for Publishing' set.
- $allowed = $node->field_approved_publishing->value;
- // If publication is denied then inform the user why.
- if (!$allowed) {
- drupal_set_message(t('%title is scheduled for publishing, but will not be published until approved.', ['%title' => $node->title->value]), 'status', FALSE);
- // If the time is in the past it means that the action has been prevented.
- // Write a dblog message to show this. Give a link to view the node but
- // cater for no nid as the node may be new and not yet saved.
- if ($node->publish_on->value <= REQUEST_TIME) {
- \Drupal::logger('scheduler_api_test')->warning('Publishing of "%title" is prevented until approved.', [
- '%title' => $node->title->value,
- 'link' => $node->id() ? $node->link(t('View node')) : '',
- ]);
- }
- }
- }
- return $allowed;
-}
-
-/**
- * Implements hook_scheduler_allow_unpublishing().
- */
-function scheduler_api_test_scheduler_allow_unpublishing($node) {
- // If there is no 'Approved for Unpublishing' field then allow unpublishing.
- if (!isset($node->field_approved_unpublishing)) {
- $allowed = TRUE;
- }
- else {
- // Only unpublish nodes that have 'Approved for Unpublishing' set.
- $allowed = $node->field_approved_unpublishing->value;
- // If unpublication is denied then inform the user why.
- if (!$allowed) {
- drupal_set_message(t('%title is scheduled for unpublishing, but will not be unpublished until approved.', ['%title' => $node->title->value]), 'status', FALSE);
- // If the time is in the past it means that the action has been prevented.
- // Write a dblog message to show this. Give a link to view the node but
- // cater for no nid as the node may be new and not yet saved.
- if ($node->unpublish_on->value <= REQUEST_TIME) {
- \Drupal::logger('scheduler_api_test')->warning('Unpublishing of "%title" is prevented until approved.', [
- '%title' => $node->title->value,
- 'link' => $node->id() ? $node->link(t('View node')) : '',
- ]);
- }
- }
- }
- return $allowed;
-}
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.services.yml b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.services.yml
deleted file mode 100644
index 582bcd5..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.services.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
- scheduler_api_test.event_subscriber:
- class: Drupal\scheduler_api_test\EventSubscriber
- tags:
- - { name: event_subscriber }
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/src/EventSubscriber.php b/modules/scheduler/tests/modules/scheduler_api_test/src/EventSubscriber.php
deleted file mode 100644
index 4efdc6c..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/src/EventSubscriber.php
+++ /dev/null
@@ -1,141 +0,0 @@
-isPublished() to
- * make the tests stronger so they fail if the calls are in the wrong place.
- *
- * To allow this API test module to be enabled interactively (for development
- * and testing) we must avoid unwanted side-effects on other non-test nodes.
- * This is done simply by checking that the node title starts with 'API TEST'.
- *
- * @group scheduler_api_test
- */
-class EventSubscriber implements EventSubscriberInterface {
-
- /**
- * {@inheritdoc}
- */
- public static function getSubscribedEvents() {
- // The values in the arrays give the function names below.
- $events[SchedulerEvents::PRE_PUBLISH][] = ['apiTestPrePublish'];
- $events[SchedulerEvents::PUBLISH][] = ['apiTestPublish'];
- $events[SchedulerEvents::PRE_UNPUBLISH][] = ['apiTestPreUnpublish'];
- $events[SchedulerEvents::UNPUBLISH][] = ['apiTestUnpublish'];
- $events[SchedulerEvents::PRE_PUBLISH_IMMEDIATELY][] = ['apiTestPrePublishImmediately'];
- $events[SchedulerEvents::PUBLISH_IMMEDIATELY][] = ['apiTestPublishImmediately'];
- return $events;
- }
-
- /**
- * Operations to perform before Scheduler publishes a node.
- *
- * @param \Drupal\scheduler\SchedulerEvent $event
- * The scheduler event.
- */
- public function apiTestPrePublish(SchedulerEvent $event) {
- /** @var \Drupal\node\Entity\Node $node */
- $node = $event->getNode();
- // Before publishing a node make it sticky.
- if (!$node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
- $node->setSticky(TRUE);
- $event->setNode($node);
- }
- }
-
- /**
- * Operations to perform before Scheduler unpublishes a node.
- *
- * @param \Drupal\scheduler\SchedulerEvent $event
- * The scheduler event.
- */
- public function apiTestPreUnpublish(SchedulerEvent $event) {
- /** @var \Drupal\node\Entity\Node $node */
- $node = $event->getNode();
- if ($node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
- // Before unpublishing a node make it unsticky.
- $node->setSticky(FALSE);
- $event->setNode($node);
- }
- }
-
- /**
- * Operations before Scheduler publishes a node immediately not via cron.
- *
- * @param \Drupal\scheduler\SchedulerEvent $event
- * The scheduler event.
- */
- public function apiTestPrePublishImmediately(SchedulerEvent $event) {
- /** @var \Drupal\node\Entity\Node $node */
- $node = $event->getNode();
- // Before publishing immediately set the node to sticky.
- if (!$node->isPromoted() && strpos($node->title->value, 'API TEST') === 0) {
- $node->setSticky(TRUE);
- $event->setNode($node);
- }
- }
-
- /**
- * Operations to perform after Scheduler publishes a node.
- *
- * @param \Drupal\scheduler\SchedulerEvent $event
- * The scheduler event.
- */
- public function apiTestPublish(SchedulerEvent $event) {
- /** @var \Drupal\node\Entity\Node $node */
- $node = $event->getNode();
- // After publishing a node promote it to the front page.
- if ($node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
- $node->setPromoted(TRUE);
- $event->setNode($node);
- }
- }
-
- /**
- * Operations to perform after Scheduler unpublishes a node.
- *
- * @param \Drupal\scheduler\SchedulerEvent $event
- * The scheduler event.
- */
- public function apiTestUnpublish(SchedulerEvent $event) {
- /** @var \Drupal\node\Entity\Node $node */
- $node = $event->getNode();
- // After unpublishing a node remove it from the front page.
- if (!$node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
- $node->setPromoted(FALSE);
- $event->setNode($node);
- }
- }
-
- /**
- * Operations after Scheduler publishes a node immediately not via cron.
- *
- * @param \Drupal\scheduler\SchedulerEvent $event
- * The scheduler event.
- */
- public function apiTestPublishImmediately(SchedulerEvent $event) {
- /** @var \Drupal\node\Entity\Node $node */
- $node = $event->getNode();
- // After publishing immediately set the node to promoted and change the
- // title.
- if (!$node->isPromoted() && strpos($node->title->value, 'API TEST') === 0) {
- $node->setTitle('Published immediately')
- ->setPromoted(TRUE);
- $event->setNode($node);
- }
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerAdminSettingsTest.php b/modules/scheduler/tests/src/Functional/SchedulerAdminSettingsTest.php
deleted file mode 100644
index 7c8a999..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerAdminSettingsTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-drupalLogin($this->adminUser);
-
- // Check that the correct default time is added to the scheduled date.
- // For testing we use an offset of 6 hours 30 minutes (23400 seconds).
- $this->seconds = 23400;
- // If the test happens to be run at a time when '+1 day' puts the calculated
- // publishing date into a different daylight-saving period then formatted
- // time can be an hour different. To avoid these failures we use a fixed
- // string when asserting the message and looking for field values.
- // @see https://www.drupal.org/node/2809627
- $this->seconds_formatted = '06:30:00';
- // In $edit use '6:30' not '06:30:00' to test flexibility.
- $settings = [
- 'allow_date_only' => TRUE,
- 'default_time' => '6:30',
- ];
- $this->drupalPostForm('admin/config/content/scheduler', $settings, t('Save configuration'));
-
- // Verify that the values have been saved correctly.
- $this->assertTrue($this->config('scheduler.settings')->get('allow_date_only'), 'The config setting for allow_date_only is stored correctly.');
- $this->assertEqual($this->config('scheduler.settings')->get('default_time'), $this->seconds_formatted, 'The config setting for default_time is stored correctly.');
-
- // Try to save an invalid time value.
- $settings = [
- 'allow_date_only' => TRUE,
- 'default_time' => '123',
- ];
- $this->drupalPostForm('admin/config/content/scheduler', $settings, t('Save configuration'));
- // Verify that an error is displayed and the value has not been saved.
- $this->assertEqual($this->config('scheduler.settings')->get('default_time'), $this->seconds_formatted, 'The config setting for default_time has not changed.');
- $this->assertText('The default time should be in the format HH:MM:SS', 'When an invalid default time is entered the correct error message is displayed.');
-
- // Show the status report, which includes the Scheduler timecheck.
- $this->drupalGet('admin/reports/status');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerApiTest.php b/modules/scheduler/tests/src/Functional/SchedulerApiTest.php
deleted file mode 100644
index 278beaa..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerApiTest.php
+++ /dev/null
@@ -1,380 +0,0 @@
-customName = 'scheduler_api_test';
- $this->customNodetype = NodeType::load($this->customName);
-
- // Check that the custom node type has loaded OK.
- $this->assertNotNull($this->customNodetype, 'Custom node type "' . $this->customName . '" was created during install');
-
- // Create a web user for this content type.
- $this->webUser = $this->drupalCreateUser([
- 'create ' . $this->customName . ' content',
- 'edit any ' . $this->customName . ' content',
- 'schedule publishing of nodes',
- ]);
-
- }
-
- /**
- * Covers hook_scheduler_allow_publishing()
- *
- * This hook can allow or deny the publishing of individual nodes. This test
- * uses the customised content type which has checkboxes 'Approved for
- * publication' and 'Approved for unpublication'.
- *
- * @todo Create and update the nodes through the interface so we can check if
- * the correct messages are displayed.
- */
- public function testAllowedPublishing() {
- $this->drupalLogin($this->webUser);
- // Check the 'approved for publishing' field is shown on the node form.
- $this->drupalGet('node/add/' . $this->customName);
- $this->assertFieldById('edit-field-approved-publishing-value', NULL, 'The "Approved for publishing" field is shown on the node form');
-
- // Check that the message is shown when scheduling a node for publishing
- // which is not yet allowed to be published.
- $edit = [
- 'title[0][value]' => 'Set publish-on date without approval',
- 'publish_on[0][value][date]' => date('Y-m-d', time() + 3),
- 'publish_on[0][value][time]' => date('H:i:s', time() + 3),
- ];
- $this->drupalPostForm('node/add/' . $this->customName, $edit, t('Save'));
- $this->assertText('is scheduled for publishing, but will not be published until approved.', 'The message is shown when scheduling a node which is not yet allowed to be published.');
-
- // Create a node that is scheduled but not approved for publication. Then
- // simulate a cron run, and check that the node is still not published.
- $node = $this->createUnapprovedNode('publish_on');
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertFalse($node->isPublished(), 'An unapproved node is not published during cron processing.');
-
- // Create a node and approve it for publication, simulate a cron run and
- // check that the node is published. This is a stronger test than simply
- // approving the previously used node above, as we do not know what publish
- // state that may be in after the cron run above.
- $node = $this->createUnapprovedNode('publish_on');
- $this->approveNode($node->id(), 'field_approved_publishing');
- $this->assertFalse($node->isPublished(), 'A new approved node is initially not published.');
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isPublished(), 'An approved node is published during cron processing.');
-
- // Turn on immediate publication of nodes with publication dates in the past
- // and repeat the tests. It is not needed to simulate cron runs here.
- $this->customNodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'publish')->save();
- $node = $this->createUnapprovedNode('publish_on');
- $this->assertFalse($node->isPublished(), 'An unapproved node with a date in the past is not published immediately after saving.');
-
- // Check that the node can be approved and published programatically.
- $this->approveNode($node->id(), 'field_approved_publishing');
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isPublished(), 'An approved node with a date in the past is published immediately via $node->set()->save().');
-
- // Check that a node can be approved and published via edit form.
- $node = $this->createUnapprovedNode('publish_on');
- $this->drupalPostForm('node/' . $node->id() . '/edit', ['field_approved_publishing[value]' => '1'], t('Save'));
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isPublished(), 'An approved node with a date in the past is published immediately after saving via edit form.');
-
- // Show the dblog messages.
- $this->drupalLogin($this->adminUser);
- $this->drupalGet('admin/reports/dblog');
- }
-
- /**
- * Covers hook_scheduler_allow_unpublishing()
- *
- * This hook can allow or deny the unpublishing of individual nodes. This test
- * is simpler than the test sequence for allowed publishing, because the past
- * date 'publish' option is not applicable.
- */
- public function testAllowedUnpublishing() {
- $this->drupalLogin($this->webUser);
- // Check the 'approved for unpublishing' field is shown on the node form.
- $this->drupalGet('node/add/' . $this->customName);
- $this->assertFieldById('edit-field-approved-unpublishing-value', NULL, 'The "Approved for unpublishing" field is shown on the node form');
-
- // Check that the message is shown when scheduling a node for unpublishing
- // which is not yet allowed to be unpublished.
- $edit = [
- 'title[0][value]' => 'Set unpublish-on date without approval',
- 'unpublish_on[0][value][date]' => date('Y-m-d', time() + 3),
- 'unpublish_on[0][value][time]' => date('H:i:s', time() + 3),
- ];
- $this->drupalPostForm('node/add/' . $this->customName, $edit, t('Save'));
- $this->assertText('is scheduled for unpublishing, but will not be unpublished until approved.', 'The message is shown when scheduling a node which is not yet allowed to be unpublished.');
-
- // Create a node that is scheduled but not approved for unpublication. Then
- // simulate a cron run, and check that the node is still published.
- $node = $this->createUnapprovedNode('unpublish_on');
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isPublished(), 'An unapproved node is not unpublished during cron processing.');
-
- // Create a node, then approve it for unpublishing, simulate a cron run and
- // check that the node is now unpublished.
- $node = $this->createUnapprovedNode('unpublish_on');
- $this->approveNode($node->id(), 'field_approved_unpublishing');
- $this->assertTrue($node->isPublished(), 'A new approved node is initially published.');
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertFalse($node->isPublished(), 'An approved node is unpublished during cron processing.');
-
- // Show the dblog messages.
- $this->drupalLogin($this->adminUser);
- $this->drupalGet('admin/reports/dblog');
- }
-
- /**
- * Creates a new node that is not approved.
- *
- * The node has a publish/unpublish date in the past to make sure it will be
- * included in the next cron run.
- *
- * @param string $date_field
- * The Scheduler date field to set, either 'publish_on' or 'unpublish_on'.
- *
- * @return \Drupal\node\NodeInterface
- * A node object.
- */
- protected function createUnapprovedNode($date_field) {
- $settings = [
- 'status' => ($date_field == 'unpublish_on'),
- $date_field => strtotime('-1 day'),
- 'field_approved_publishing' => 0,
- 'field_approved_unpublishing' => 0,
- 'type' => $this->customName,
- ];
- return $this->drupalCreateNode($settings);
- }
-
- /**
- * Approves a node for publication or unpublication.
- *
- * @param int $nid
- * The id of the node to approve.
- * @param string $field_name
- * The name of the field to set, either 'field_approved_publishing' or
- * 'field_approved_unpublishing'.
- */
- protected function approveNode($nid, $field_name) {
- $this->nodeStorage->resetCache([$nid]);
- $node = $this->nodeStorage->load($nid);
- $node->set($field_name, TRUE)->save();
- }
-
- /**
- * Covers six events.
- *
- * The events allow other modules to react to the Scheduler process being run.
- * The API test implementations of the event listeners alter the nodes
- * 'promote' and 'sticky' settings and changes the title.
- */
- public function testApiNodeAction() {
- $this->drupalLogin($this->schedulerUser);
-
- // Create a test node. Having the 'approved' fields here would complicate
- // the tests, so use the ordinary page type.
- $settings = [
- 'publish_on' => strtotime('-1 day'),
- 'type' => $this->type,
- 'promote' => FALSE,
- 'sticky' => FALSE,
- 'title' => 'API TEST node action',
- ];
- $node = $this->drupalCreateNode($settings);
-
- // Check that the 'sticky' and 'promote' fields are off for the new node.
- $this->assertFalse($node->isSticky(), 'The unpublished node is not sticky.');
- $this->assertFalse($node->isPromoted(), 'The unpublished node is not promoted.');
-
- // Run cron and check that hook_scheduler_api() has executed correctly, by
- // verifying that the node has become promoted and is sticky.
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isSticky(), 'API action "PRE_PUBLISH" has changed the node to sticky.');
- $this->assertTrue($node->isPromoted(), 'API action "PUBLISH" has changed the node to promoted.');
-
- // Now set a date for unpublishing the node. Ensure 'sticky' and 'promote'
- // are set, so that the assertions are not affected by any failures above.
- $node->set('unpublish_on', strtotime('-1 day'))
- ->set('sticky', TRUE)->set('promote', TRUE)->save();
-
- // Run cron and check that hook_scheduler_api() has executed correctly, by
- // verifying that the node is not promoted and no longer sticky.
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertFalse($node->isSticky(), 'API action "PRE_UNPUBLISH" has changed the node to not sticky.');
- $this->assertFalse($node->isPromoted(), 'API action "UNPUBLISH" has changed the node to not promoted.');
-
- // Turn on immediate publication when a publish date is in the past.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'publish')->save();
-
- // Ensure 'sticky' and 'promote' are not set, so that the assertions are not
- // affected by any failures above.
- $node->set('sticky', FALSE)->set('promote', FALSE)->save();
-
- // Edit the node and set a publish-on date in the past.
- $edit = [
- 'publish_on[0][value][date]' => date('Y-m-d', strtotime('-2 day', REQUEST_TIME)),
- 'publish_on[0][value][time]' => date('H:i:s', strtotime('-2 day', REQUEST_TIME)),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- // Verify that the values have been altered as expected.
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isSticky(), 'API action "PRE_PUBLISH_IMMEDIATELY" has changed the node to sticky.');
- $this->assertTrue($node->isPromoted(), 'API action "PUBLISH_IMMEDIATELY" has changed the node to promoted.');
- $this->assertEqual($node->title->value, 'Published immediately', 'API action "PUBLISH_IMMEDIATELY" has changed the node title correctly.');
- }
-
- /**
- * Covers hook_scheduler_nid_list($action)
- *
- * Hook_scheduler_nid_list() allows other modules to add more node ids into
- * the list to be processed. In real scenarios, the third-party module would
- * likely have more complex data structures and/or tables from which to
- * identify nodes to add. In this test, to keep it simple, we identify nodes
- * by the text of the title.
- */
- public function testNidList() {
- $this->drupalLogin($this->schedulerUser);
-
- // Create test nodes. Use the ordinary page type for this test, as having
- // the 'approved' fields here would unnecessarily complicate the processing.
- // Node 1 is not published and has no publishing date set. The test API
- // module will add node 1 into the list to be published.
- $node1 = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- 'title' => 'API TEST nid_list publish me',
- ]);
- // Node 2 is published and has no unpublishing date set. The test API module
- // will add node 2 into the list to be unpublished.
- $node2 = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => TRUE,
- 'title' => 'API TEST nid_list unpublish me',
- ]);
-
- // Before cron, check node 1 is unpublished and node 2 is published.
- $this->assertFalse($node1->isPublished(), 'Before cron, node 1 "' . $node1->title->value . '" is unpublished.');
- $this->assertTrue($node2->isPublished(), 'Before cron, node 2 "' . $node2->title->value . '" is published.');
-
- // Run cron and refresh the nodes.
- scheduler_cron();
- $this->nodeStorage->resetCache();
- $node1 = $this->nodeStorage->load($node1->id());
- $node2 = $this->nodeStorage->load($node2->id());
-
- // Check node 1 is published and node 2 is unpublished.
- $this->assertTrue($node1->isPublished(), 'After cron, node 1 "' . $node1->title->value . '" is published.');
- $this->assertFalse($node2->isPublished(), 'After cron, node 2 "' . $node2->title->value . '" is unpublished.');
- }
-
- /**
- * Covers hook_scheduler_nid_list_alter($action)
- *
- * This hook allows other modules to add or remove node ids from the list to
- * be processed. As in testNidList() we make it simple by using the title text
- * to identify which nodes to act on.
- */
- public function testNidListAlter() {
- $this->drupalLogin($this->schedulerUser);
-
- // Create test nodes. Use the ordinary page type for this test, as having
- // the 'approved' fields here would unnecessarily complicate the processing.
- // Node 1 is set for scheduled publishing, but will be removed by the test
- // API hook_nid_list_alter().
- $node1 = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- 'title' => 'API TEST nid_list_alter do not publish me',
- 'publish_on' => strtotime('-1 day'),
- ]);
-
- // Node 2 is not published and has no publishing date set. The test API
- // module will add node 2 into the list to be published.
- $node2 = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- 'title' => 'API TEST nid_list_alter publish me',
- ]);
-
- // Node 3 is set for scheduled unpublishing, but will be removed by the test
- // API hook_nid_list_alter().
- $node3 = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => TRUE,
- 'title' => 'API TEST nid_list_alter do not unpublish me',
- 'unpublish_on' => strtotime('-1 day'),
- ]);
-
- // Node 4 is published and has no unpublishing date set. The test API module
- // will add node 4 into the list to be unpublished.
- $node4 = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => TRUE,
- 'title' => 'API TEST nid_list_alter unpublish me',
- ]);
-
- // Check node 1 and 2 are unpublished and node 3 and 4 are published.
- $this->assertFalse($node1->isPublished(), 'Before cron, node 1 "' . $node1->title->value . '" is unpublished.');
- $this->assertFalse($node2->isPublished(), 'Before cron, node 2 "' . $node2->title->value . '" is unpublished.');
- $this->assertTrue($node3->isPublished(), 'Before cron, node 3 "' . $node3->title->value . '" is published.');
- $this->assertTrue($node4->isPublished(), 'Before cron, node 4 "' . $node4->title->value . '" is published.');
-
- // Run cron and refresh the nodes.
- scheduler_cron();
- $this->nodeStorage->resetCache();
- $node1 = $this->nodeStorage->load($node1->id());
- $node2 = $this->nodeStorage->load($node2->id());
- $node3 = $this->nodeStorage->load($node3->id());
- $node4 = $this->nodeStorage->load($node4->id());
-
- // Check node 2 and 3 are published and node 1 and 4 are unpublished.
- $this->assertFalse($node1->isPublished(), 'After cron, node 1 "' . $node1->title->value . '" is still unpublished.');
- $this->assertTrue($node2->isPublished(), 'After cron, node 2 "' . $node2->title->value . '" is published.');
- $this->assertTrue($node3->isPublished(), 'After cron, node 3 "' . $node3->title->value . '" is still published.');
- $this->assertFalse($node4->isPublished(), 'After cron, node 4 "' . $node4->title->value . '" is unpublished.');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerBasicTest.php b/modules/scheduler/tests/src/Functional/SchedulerBasicTest.php
deleted file mode 100644
index 3e7920f..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerBasicTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-drupalLogin($this->schedulerUser);
-
- // Create node values. Set time to one hour in the future.
- $edit = [
- 'title[0][value]' => 'Publish This Node',
- 'publish_on[0][value][date]' => \Drupal::service('date.formatter')->format(time() + 3600, 'custom', 'Y-m-d'),
- 'publish_on[0][value][time]' => \Drupal::service('date.formatter')->format(time() + 3600, 'custom', 'H:i:s'),
- ];
- $this->helpTestScheduler($edit);
-
- // Remove publish_on and set unpublish_on, then run basic tests again.
- $edit['unpublish_on[0][value][date]'] = $edit['publish_on[0][value][date]'];
- $edit['unpublish_on[0][value][time]'] = $edit['publish_on[0][value][time]'];
- unset($edit['publish_on[0][value][date]']);
- unset($edit['publish_on[0][value][time]']);
- // Need a new title for the new node, as we identify the node by title.
- $edit['title[0][value]'] = 'Unpublish This Node';
- $this->helpTestScheduler($edit);
- }
-
- /**
- * Helper function for testPublishingAndUnpublishing().
- *
- * Schedules content, runs cron and asserts status.
- */
- protected function helpTestScheduler($edit) {
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- // Verify that the node was created.
- $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
- $this->assertTrue($node, sprintf('"%s" was created sucessfully.', $edit['title[0][value]']));
- if (empty($node)) {
- $this->assert(FALSE, 'Test halted because node was not created.');
- return;
- }
-
- // Assert that the node is correctly published or unpublished.
- if (isset($edit['publish_on[0][value][date]'])) {
- $key = 'publish_on';
- $this->assertFalse($node->isPublished(), 'Node is unpublished before Cron');
- }
- else {
- $key = 'unpublish_on';
- $this->assertTrue($node->isPublished(), 'Node is published before Cron');
- }
-
- // Modify the scheduler field data to a time in the past, then run cron.
- $node->$key = REQUEST_TIME - 1;
- $node->save();
- $this->cronRun();
-
- // Refresh the node cache and check the node status.
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- if ($key == 'publish_on') {
- $this->assertTrue($node->isPublished(), 'Node is published after Cron');
- }
- else {
- $this->assertFalse($node->isPublished(), 'Node is unpublished after Cron');
- }
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerBrowserTestBase.php b/modules/scheduler/tests/src/Functional/SchedulerBrowserTestBase.php
deleted file mode 100644
index 828554a..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerBrowserTestBase.php
+++ /dev/null
@@ -1,156 +0,0 @@
-type and $this->typeName and not use
- // $this->nodetype->get('type') or $this->nodetype->get('name'), nor have
- // the hard-coded strings 'page' and 'Basic page'.
- $this->type = 'page';
- $this->typeName = 'Basic page';
- /** @var NodeTypeInterface $nodetype */
- $this->nodetype = $this->drupalCreateContentType([
- 'type' => $this->type,
- 'name' => $this->typeName,
- ]);
-
- // Add scheduler functionality to the node type.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_enable', TRUE)
- ->setThirdPartySetting('scheduler', 'unpublish_enable', TRUE)
- ->save();
-
- // Define nodeStorage for use in many tests.
- /** @var EntityStorageInterface $nodeStorage */
- $this->nodeStorage = $this->container->get('entity.manager')->getStorage('node');
-
- // Create an administrator user having the main admin permissions, full
- // rights on the 'page' content type and all of the Scheduler permissions.
- // 'access site reports' is required for admin/reports/dblog.
- // 'administer site configuration' is required for admin/reports/status.
- $this->adminUser = $this->drupalCreateUser([
- 'administer nodes',
- 'access content',
- 'access content overview',
- 'access site reports',
- 'administer site configuration',
- 'create ' . $this->type . ' content',
- 'edit own ' . $this->type . ' content',
- 'delete own ' . $this->type . ' content',
- 'view own unpublished content',
- 'administer scheduler',
- 'schedule publishing of nodes',
- 'view scheduled content',
- ]);
-
- // Create an ordinary Scheduler user, with permission to create and schedule
- // content but not with administrator permissions.
- $this->schedulerUser = $this->drupalCreateUser([
- 'create ' . $this->type . ' content',
- 'edit own ' . $this->type . ' content',
- 'delete own ' . $this->type . ' content',
- 'view own unpublished content',
- 'schedule publishing of nodes',
- 'view scheduled content',
- ]);
-
- // Store the database connection for re-use in the actual tests.
- $this->database = $this->container->get('database');
-
- }
-
- /**
- * Run standard Drupal cron.
- *
- * This replicates the standard cronRun function to allow the Scheduler tests
- * that use this to be converted from WebTestBase to BrowserTestBase.
- *
- * @TODO Delete this function after it has been added to BrowserTestBase.
- *
- * Update Jan 2017: cronRun() has been committed to core 8.4 and 8.3 but will
- * not be added to 8.2. Therefore we still need it here whilst we are using
- * 8.2 for testing.
- * @see https://www.drupal.org/node/2795037
- */
- public function cronRun() {
- $this->drupalGet('cron/' . \Drupal::state()->get('system.cron_key'));
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerDefaultTimeTest.php b/modules/scheduler/tests/src/Functional/SchedulerDefaultTimeTest.php
deleted file mode 100644
index a0d0a22..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerDefaultTimeTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-drupalLogin($this->schedulerUser);
- $config = $this->config('scheduler.settings');
- $date_formatter = \Drupal::service('date.formatter');
-
- // For this test we use an offset of 6 hours 30 minutes (23400 seconds).
- $seconds = 23400;
-
- // If the test happens to be run at a time when '+1 day' puts the calculated
- // publishing date into a different daylight-saving period then formatted
- // time can be an hour different. To avoid these failures we use a fixed
- // string when asserting the message and looking for field values.
- // @see https://www.drupal.org/node/2809627
- $seconds_formatted = '06:30:00';
- $config->set('default_time', $seconds_formatted)->save();
-
- // We cannot easily test the exact validation messages as they contain the
- // REQUEST_TIME, which can be one or more seconds in the past. Best we can
- // do is check the fixed part of the message as it is when passed to t() in
- // Datetime::validateDatetime. This will only work in English.
- $publish_validation_message = 'The Publish on date is invalid.';
- $unpublish_validation_message = 'The Unpublish on date is invalid.';
-
- // First test with the "date only" functionality disabled.
- $config->set('allow_date_only', FALSE)->save();
-
- // Test that entering a time is required.
- $edit = [
- 'title[0][value]' => 'No time ' . $this->randomString(15),
- 'publish_on[0][value][date]' => $date_formatter->format(strtotime('+1 day', REQUEST_TIME), 'custom', 'Y-m-d'),
- 'unpublish_on[0][value][date]' => $date_formatter->format(strtotime('+2 day', REQUEST_TIME), 'custom', 'Y-m-d'),
- ];
- // Create a node and check that the expected error messages are shown.
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $this->assertSession()->pageTextContains($publish_validation_message, 'By default it is required to enter a time when scheduling content for publication.');
- $this->assertSession()->pageTextContains($unpublish_validation_message, 'By default it is required to enter a time when scheduling content for unpublication.');
-
- // Allow the user to enter only a date with no time.
- $config->set('allow_date_only', TRUE)->save();
-
- // Create a node and check that the expected error messages are not shown.
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $this->assertSession()->pageTextNotContains($publish_validation_message, 'If the default time option is enabled the user can skip the time when scheduling content for publication.');
- $this->assertSession()->pageTextNotContains($unpublish_validation_message, 'If the default time option is enabled the user can skip the time when scheduling content for unpublication.');
-
- // Check that the scheduled information is shown after saving.
- $publish_time = strtotime('+1 day midnight', REQUEST_TIME) + $seconds;
- $unpublish_time = strtotime('+2 day midnight', REQUEST_TIME) + $seconds;
- $args = ['@publish_time' => $date_formatter->format($publish_time, 'long')];
- $this->assertRaw(t('This post is unpublished and will be published @publish_time.', $args), 'The user is informed that the content will be published on the requested date, on the default time.');
-
- // Protect in case the node was not created.
- if ($node = $this->drupalGetNodeByTitle($edit['title[0][value]'])) {
- // Check that the correct scheduled dates are stored in the node.
- $this->assertEqual($node->publish_on->value, $publish_time, 'The node publish_on value is stored correctly.');
- $this->assertEqual($node->unpublish_on->value, $unpublish_time, 'The node unpublish_on value is stored correctly.');
-
- // Check that the default time has been added to the form on edit.
- $this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertFieldByName('publish_on[0][value][time]', $seconds_formatted, 'The default time offset has been added to the date field when scheduling content for publication.');
- $this->assertFieldByName('unpublish_on[0][value][time]', $seconds_formatted, 'The default time offset has been added to the date field when scheduling content for unpublication.');
-
- }
- else {
- $this->fail('The expected node was not found.');
- }
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerDeleteNodeTest.php b/modules/scheduler/tests/src/Functional/SchedulerDeleteNodeTest.php
deleted file mode 100644
index 1ca309a..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerDeleteNodeTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-drupalLogin($this->adminUser);
-
- // Create a published and an unpublished node, both without scheduled dates.
- $published_node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => 1,
- ]);
- $unpublished_node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => 0,
- ]);
-
- // Make scheduled publishing and unpublishing required.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', TRUE)
- ->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)
- ->save();
-
- // Check that deleting the nodes does not throw form validation errors.
- // In 7.x the 'Delete' functionality was a button but in 8.x it is a link.
- // Hence, we get the form then use clickLink('Delete') which is a stronger
- // test than simply getting the 'node//delete' link directly.
- $this->drupalGet('node/' . $published_node->id() . '/edit');
- $this->clickLink('Delete');
-
- // The text 'error message' is used in a header h2 html tag which is
- // normally made hidden from browsers but will be in the page source.
- // It is also good when testing for the absense of something to also test
- // for the presence of text, hence the second assertion for each check.
- $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete a published node with no scheduling information.');
- $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete a published node with no scheduling information.');
-
- // Do the same test for the unpublished node.
- $this->drupalGet('node/' . $unpublished_node->id() . '/edit');
- $this->clickLink('Delete');
- $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete an unpublished node with no scheduling information.');
- $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete an unpublished node with no scheduling information.');
- }
-
- /**
- * Tests the deletion of a scheduled node.
- *
- * Check that nodes can be deleted with no validation errors if the dates are
- * in the past.
- *
- * @see http://drupal.org/node/2627370
- */
- public function testDeleteNodeWithPastDates() {
- // Log in.
- $this->drupalLogin($this->adminUser);
-
- // Create nodes with publish_on and unpublish_on dates in the past.
- $published_node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => TRUE,
- 'unpublish_on' => strtotime('- 2 day'),
- ]);
- $unpublished_node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- 'publish_on' => strtotime('- 2 day'),
- ]);
-
- // Attempt to delete the published node and check for no validation error.
- $this->drupalGet('node/' . $published_node->id() . '/edit');
- $this->clickLink('Delete');
- $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete a node with an unpublish date in the past.');
- $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete a node with an unpublish date in the past.');
-
- // Attempt to delete the unpublished node and check for no validation error.
- $this->drupalGet('node/' . $unpublished_node->id() . '/edit');
- $this->clickLink('Delete');
- $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete a node with a publish date in the past.');
- $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete a node with a publish date in the past.');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerDevelGenerateTest.php b/modules/scheduler/tests/src/Functional/SchedulerDevelGenerateTest.php
deleted file mode 100644
index f1f5fc1..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerDevelGenerateTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-develUser = $this->drupalCreateUser([
- 'administer devel_generate',
- 'view scheduled content',
- 'access content',
- 'access content overview',
- ]);
-
- // The majority of the tests use the standard Sceduler-enabled content type
- // but we also verify that dates are not added for non-enabled types.
- $this->non_scheduler_type = 'not_for_scheduler';
- $this->drupalCreateContentType(['type' => $this->non_scheduler_type, 'name' => 'Not enabled for Scheduler']);
- }
-
- /**
- * Helper function to count scheduled nodes and assert the expected number.
- *
- * @param string $type
- * The machine-name for the content type to be checked.
- * @param string $field
- * The field name to count, either 'publish_on' or 'unpublish_on'.
- * @param int $num_nodes
- * The total number of nodes that should exist.
- * @param int $num_scheduled
- * The number of those nodes which should be scheduled with a $field.
- * @param int $time_range
- * Optional time range from the devel form. The generated scheduler dates
- * should be in a range of +/- this value from the current time.
- */
- protected function countScheduledNodes($type, $field, $num_nodes, $num_scheduled, $time_range = NULL) {
- // Check that the expected number of nodes have been created.
- $count = \Drupal::entityQuery('node')
- ->condition('type', $type)
- ->count()
- ->execute();
- $this->assertEqual($count, $num_nodes, sprintf('The expected number of %s is %s, found %s', $type, $num_nodes, $count));
-
- // Check that the expected number of nodes have been scheduled.
- $count = \Drupal::entityQuery('node')
- ->condition('type', $type)
- ->exists($field)
- ->count()
- ->execute();
- $this->assertEqual($count, $num_scheduled, sprintf('The expected number of scheduled %s is %s, found %s', $field, $num_scheduled, $count));
-
- if (isset($time_range)) {
- // Define the minimum and maximum times that we expect the scheduled dates
- // to be within. REQUEST_TIME remains static for the duration of this test
- // but even though devel_generate also uses uses REQUEST_TIME this will
- // slowly creep forward during sucessive calls. Tests can fail incorrectly
- // for this reason, hence the best approximation is to use time() when
- // calculating the upper end of the range.
- $min = REQUEST_TIME - $time_range;
- $max = time() + $time_range;
-
- $query = \Drupal::entityQueryAggregate('node');
- $result = $query
- ->condition('type', $type)
- ->aggregate($field, 'min')
- ->aggregate($field, 'max')
- ->execute();
- $min_found = $result[0]["{$field}_min"];
- $max_found = $result[0]["{$field}_max"];
-
- // Assert that the found values are within the expcted range.
- $this->assertGreaterThanOrEqual($min, $min_found, sprintf('The minimum value for %s is %s, smaller than the expected %s', $field, format_date($min_found, 'custom', 'j M, H:i:s'), format_date($min, 'custom', 'j M, H:i:s')));
- $this->assertLessThanOrEqual($max, $max_found, sprintf('The maximum value for %s is %s which is larger than expected %s', $field, format_date($max_found, 'custom', 'j M, H:i:s'), format_date($max, 'custom', 'j M, H:i:s')));
- }
- }
-
- /**
- * Test the functionality that Scheduler adds during content generation.
- */
- public function testDevelGenerate() {
- $this->drupalLogin($this->develUser);
-
- // Use the minimum required settings to see what happens when everything
- // else is left as default.
- $generate_settings = [
- "node_types[$this->type]" => TRUE,
- ];
- $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
- // Display the full content list and the scheduled list. Calls to these
- // pages are for information and debug only. They could be removed.
- $this->drupalGet('admin/content');
- $this->drupalGet('admin/content/scheduled');
-
- // Delete all content for this type and generate new content with only
- // publish-on dates. Use 100% as this is how we can count the expected
- // number of scheduled nodes. The time range of 3600 is one hour.
- $generate_settings = [
- "node_types[$this->type]" => TRUE,
- 'num' => 40,
- 'kill' => TRUE,
- 'time_range' => 3600,
- 'scheduler_publishing' => 100,
- 'scheduler_unpublishing' => 0,
- ];
- $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
- $this->drupalGet('admin/content');
- $this->drupalGet('admin/content/scheduled');
-
- // Check we have the expected number of nodes scheduled for publishing only
- // and verify that that the dates are within the time range specified.
- $this->countScheduledNodes($this->type, 'publish_on', 40, 40, $generate_settings['time_range']);
- $this->countScheduledNodes($this->type, 'unpublish_on', 40, 0);
-
- // Do similar for unpublish_on date. Delete all then generate new content
- // with only unpublish-on dates. Time range 86400 is one day.
- $generate_settings = [
- "node_types[$this->type]" => TRUE,
- 'num' => 30,
- 'kill' => TRUE,
- 'time_range' => 86400,
- 'scheduler_publishing' => 0,
- 'scheduler_unpublishing' => 100,
- ];
- $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
- $this->drupalGet('admin/content');
- $this->drupalGet('admin/content/scheduled');
-
- // Check we have the expected number of nodes scheduled for unpublishing
- // only, and verify that that the dates are within the time range specified.
- $this->countScheduledNodes($this->type, 'publish_on', 30, 0);
- $this->countScheduledNodes($this->type, 'unpublish_on', 30, 30, $generate_settings['time_range']);
-
- // Generate new content using the type which is not enabled for Scheduler.
- // The nodes should be created but no dates should be added even though the
- // scheduler values are set to 100.
- $generate_settings = [
- "node_types[$this->non_scheduler_type]" => TRUE,
- 'num' => 20,
- 'kill' => TRUE,
- 'scheduler_publishing' => 100,
- 'scheduler_unpublishing' => 100,
- ];
- $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
- $this->drupalGet('admin/content');
- $this->drupalGet('admin/content/scheduled');
-
- // Check we have the expected number of nodes but that none are scheduled.
- $this->countScheduledNodes($this->non_scheduler_type, 'publish_on', 20, 0);
- $this->countScheduledNodes($this->non_scheduler_type, 'unpublish_on', 20, 0);
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerFieldsDisplayTest.php b/modules/scheduler/tests/src/Functional/SchedulerFieldsDisplayTest.php
deleted file mode 100644
index ceba016..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerFieldsDisplayTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-drupalLogin($this->adminUser);
-
- // Check that the dates are shown in a vertical tab by default.
- $this->drupalGet('node/add/page');
- $this->assertTrue($this->xpath('//div[contains(@class, "form-type-vertical-tabs")]//details[@id = "edit-scheduler-settings"]'), 'By default the scheduler dates are shown in a vertical tab.');
-
- // Check that the dates are shown as a fieldset when configured to do so.
- $this->nodetype->setThirdPartySetting('scheduler', 'fields_display_mode', 'fieldset')->save();
- $this->drupalGet('node/add/page');
- $this->assertFalse($this->xpath('//div[contains(@class, "form-type-vertical-tabs")]//details[@id = "edit-scheduler-settings"]'), 'The scheduler dates are not shown in a vertical tab when they are configured to show as a fieldset.');
- $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings"]'), 'The scheduler dates are shown in a fieldset when they are configured to show as a fieldset.');
- $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and not(@open = "open")]'), 'The scheduler dates fieldset is collapsed by default.');
-
- // Check that the fieldset is expanded if either of the scheduling dates
- // are required.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', TRUE)->save();
- $this->drupalGet('node/add/page');
- $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when the publish-on date is required.');
-
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
- ->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)->save();
- $this->drupalGet('node/add/page');
- $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when the unpublish-on date is required.');
-
- // Check that the fieldset is expanded if the 'always' option is set.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
- ->setThirdPartySetting('scheduler', 'unpublish_required', FALSE)
- ->setThirdPartySetting('scheduler', 'expand_fieldset', 'always')->save();
- $this->drupalGet('node/add/page');
- $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when the option to always expand is turned on.');
-
- // Check that the fieldset is expanded if the node already has a publish-on
- // date. This requires editing an existing scheduled node.
- $this->nodetype->setThirdPartySetting('scheduler', 'expand_fieldset', 'when_required')->save();
- $options = [
- 'title' => 'Contains Publish-on date ' . $this->randomMachineName(10),
- 'type' => $this->type,
- 'publish_on' => strtotime('+1 day'),
- ];
- $node = $this->drupalCreateNode($options);
- $this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when a publish-on date already exists.');
-
- // Check that the fieldset is expanded if the node has an unpublish-on date.
- $options = [
- 'title' => 'Contains Unpublish-on date ' . $this->randomMachineName(10),
- 'type' => $this->type,
- 'unpublish_on' => strtotime('+1 day'),
- ];
- $node = $this->drupalCreateNode($options);
- $this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when an unpublish-on date already exists.');
- }
-
- /**
- * Tests the settings entry in the content type form display.
- *
- * This test covers scheduler_entity_extra_field_info().
- */
- public function testManageFormDisplay() {
-
- // Create a custom administrator user with permissions to use the field_ui
- // module 'node form display' tab.
- $this->adminUser = $this->drupalCreateUser([
- 'administer content types',
- 'administer node form display',
- ]);
- $this->drupalLogin($this->adminUser);
-
- // Check that the weight input field is displayed when the content type is
- // enabled for scheduling. This field still exists even with tabledrag on.
- $this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display');
- $this->assertFieldById('edit-fields-scheduler-settings-weight', NULL, 'The scheduler settings row is shown when the content type is enabled for scheduling.');
-
- // Check that the weight input field is not displayed when the content type
- // is not enabled for scheduling.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_enable', FALSE)
- ->setThirdPartySetting('scheduler', 'unpublish_enable', FALSE)->save();
- $this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display');
- $this->assertNoFieldById('edit-fields-scheduler-settings-weight', NULL, 'The scheduler settings row is not shown when the content type is not enabled for scheduling.');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerLightweightCronTest.php b/modules/scheduler/tests/src/Functional/SchedulerLightweightCronTest.php
deleted file mode 100644
index 1bad0e0..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerLightweightCronTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-routeCronForm = Url::fromRoute('scheduler.cron_form');
- }
-
- /**
- * Test scheduler lightweight cron runs.
- */
- public function testLightweightCronRun() {
- // Run scheduler lightweight cron anonymously without any cron key.
- $this->drupalGet('scheduler/cron');
- $this->assertResponse(404, 'scheduler/cron with no cron key returns "404 Not Found"');
-
- // Run scheduler lightweight cron anonymously with a random cron key.
- $key = substr(md5(rand()), 0, 20);
- $this->drupalGet('scheduler/cron/' . $key);
- $this->assertResponse(403, 'scheduler/cron with the wrong cron key returns "403 Not Authorized"');
-
- // Run scheduler lightweight cron anonymously with the valid cron key which
- // is defined during install.
- $config = $this->config('scheduler.settings');
- $key = $config->get('lightweight_cron_access_key');
- $this->drupalGet('scheduler/cron/' . $key);
- $this->assertResponse(204, 'scheduler/cron with the correct cron key runs OK and returns "204 No Content"');
- }
-
- /**
- * Test the lightweight cron settings form.
- */
- public function testLightweightCronSettingsForm() {
- // Log in.
- $this->drupalLogin($this->adminUser);
-
- // Check that the cron key has an initial value, created during install.
- $this->drupalGet($this->routeCronForm);
- $key_xpath = $this->xpath('//input[@id="edit-lightweight-access-key"]/@value');
- $key = $key_xpath[0]->getText();
- $this->assertTrue(!empty($key), 'Default lightweight cron key field is not empty');
- $this->assertTrue(strlen($key) == 20, 'Default lightweight cron key string length is 20');
-
- // Check that a new random key can be generated.
- $this->drupalPostForm($this->routeCronForm, [], t('Generate new random key'));
- $new_key_xpath = $this->xpath('//input[@id="edit-lightweight-access-key"]/@value');
- $new_key = $new_key_xpath[0]->getText();
- $this->assertTrue(!empty($new_key), 'Lightweight cron key field is not empty after generating new key');
- $this->assertTrue(strlen($new_key) == 20, 'New lightweight cron key string length is 20');
- $this->assertNotEqual($key, $new_key, 'Lightweight cron key has changed.');
-
- // Check that the 'run lightweight cron' button works.
- $this->drupalPostForm($this->routeCronForm, [], t("Run Scheduler's lightweight cron now"));
- $this->assertText('Lightweight cron run completed.', 'Lightweight cron runs OK manually');
-
- // Check that the form cannot be saved if the cron key is blank.
- $this->drupalPostForm($this->routeCronForm, ['lightweight_access_key' => ''], t('Save configuration'));
- $this->assertText('Lightweight cron access key field is required.', 'Saving configuration with a blank cron key throws the expected validation message');
- $this->assertNoText('The configuration options have been saved.', 'Saving configuration with a blank cron key is not possible');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerMetaInformationTest.php b/modules/scheduler/tests/src/Functional/SchedulerMetaInformationTest.php
deleted file mode 100644
index 859f0c5..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerMetaInformationTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-drupalLogin($this->schedulerUser);
-
- // Create a published node without scheduling.
- $published_node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => TRUE,
- ]);
- $this->drupalGet('node/' . $published_node->id());
-
- // Since we did not set an unpublish date, there should be no X-Robots-Tag
- // header on the response.
- $this->assertFalse($this->drupalGetHeader('X-Robots-Tag'), 'X-Robots-Tag is not present when no unpublish date is set.');
-
- // Set a scheduler unpublish date on the node.
- $unpublish_date = strtotime('+1 day');
- $edit = [
- 'unpublish_on[0][value][date]' => \Drupal::service('date.formatter')->format($unpublish_date, 'custom', 'Y-m-d'),
- 'unpublish_on[0][value][time]' => \Drupal::service('date.formatter')->format($unpublish_date, 'custom', 'H:i:s'),
- ];
- $this->drupalPostForm('node/' . $published_node->id() . '/edit', $edit, t('Save'));
-
- // The node page should now have an X-Robots-Tag header with an
- // unavailable_after-directive and RFC850 date- and time-value.
- $this->drupalGet('node/' . $published_node->id());
- $this->assertSession()->responseHeaderEquals('X-Robots-Tag', 'unavailable_after: ' . date(DATE_RFC850, $unpublish_date), 'X-Robots-Tag is present with correct timestamp derived from unpublish_on date.');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerMultilingualTest.php b/modules/scheduler/tests/src/Functional/SchedulerMultilingualTest.php
deleted file mode 100644
index 7823bc7..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerMultilingualTest.php
+++ /dev/null
@@ -1,230 +0,0 @@
-translatorUser = $this->drupalCreateUser([
- 'administer languages',
- 'administer content translation',
- 'create content translations',
- 'translate any entity',
- ]);
-
- // Get the additional role already assigned to the scheduler admin user
- // created in SchedulerBrowserTestBase and add this role to the translator
- // user, to avoid switching between users throughout this test.
- $admin_roles = $this->adminUser->getRoles();
- // Key 0 is 'authenticated' role. Key 1 is the first real role.
- $this->translatorUser->addRole($admin_roles[1]);
- $this->translatorUser->save();
- $this->drupalLogin($this->translatorUser);
-
- // Allow scheduler dates in the past to be published on next cron run.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
-
- // Enable the content type for translation.
- $this->ctm = $this->container->get('content_translation.manager');
- $this->ctm->setEnabled('node', $this->type, TRUE);
-
- // Make three additional languages available.
- // Do not add 'en' here.
- $this->langcodes = ['am', 'bg', 'ca'];
- ConfigurableLanguage::createFromLangcode($this->langcodes[0])->save();
- ConfigurableLanguage::createFromLangcode($this->langcodes[1])->save();
- ConfigurableLanguage::createFromLangcode($this->langcodes[2])->save();
-
- // Get the language names and store for later use.
- $languages = \Drupal::languageManager()->getLanguages();
- $this->languages = [
- 0 => ['code' => $this->langcodes[0], 'name' => $languages[$this->langcodes[0]]->getName()],
- 1 => ['code' => $this->langcodes[1], 'name' => $languages[$this->langcodes[1]]->getName()],
- 2 => ['code' => $this->langcodes[2], 'name' => $languages[$this->langcodes[2]]->getName()],
- 3 => ['code' => 'en', 'name' => $languages['en']->getName()],
- ];
- }
-
- /**
- * Helper function to assert the published status of translations.
- *
- * @param int $nid
- * The node id of the node to check.
- * @param string $description
- * Text explaining what part of the test is being checked.
- * @param array $st
- * Array of expected status values for the translations. The original
- * content status is first, followed by any number of translations.
- */
- private function checkStatus($nid, $description, array $st) {
-
- // Reset the cache and reload the node.
- $this->nodeStorage->resetCache([$nid]);
- $node = $this->nodeStorage->load($nid);
-
- foreach ($st as $key => $status) {
- if ($key == 0) {
- // Key 0 is the original, so we just check $node.
- $this->assertEqual($node->isPublished(), $status,
- sprintf('%s: The original content (%s) is %s', $description, $this->languages[$key]['name'], ($status ? 'published' : 'unpublished')));
- }
- else {
- // Key > 0 are the translations, which we get using the Content
- // Translation Manager getTranslationMetadata() function.
- $trans = $this->ctm->getTranslationMetadata($node->getTranslation($this->languages[$key]['code']));
- $trans = $node->getTranslation($this->languages[$key]['code']);
- $this->assertEqual($trans->isPublished(), $status,
- sprintf('%s: Translation %d (%s) is %s', $description, $key, $this->languages[$key]['name'], ($status ? 'published' : 'unpublished')));
- }
- }
- }
-
- /**
- * Test creating translations with independent scheduling.
- *
- * @dataProvider dataPublishingTranslations()
- */
- public function testPublishingTranslations($publish_on_translatable, $unpublish_on_translatable, array $expected_status_values_before, array $expected_status_values_after) {
-
- // Set the scheduler fields to be translatable yes/no depending on the
- // parameters passed in.
- $this->drupalGet('admin/config/regional/content-language');
- $settings = [
- 'edit-settings-node-page-settings-language-language-alterable' => TRUE,
- 'edit-settings-node-page-fields-publish-on' => $publish_on_translatable,
- 'edit-settings-node-page-fields-unpublish-on' => $unpublish_on_translatable,
- ];
- // The submit shows the updated values, so no need for second get.
- $this->submitForm($settings, 'Save configuration');
-
- // Create a node. This will known as the 'original' before any translations.
- // It is unpublished with no scheduled date.
- $create = [
- 'type' => $this->type,
- 'title' => $this->languages[0]['name'] . '(0) - Unpublished and not scheduled',
- 'langcode' => $this->languages[0]['code'],
- 'status' => FALSE,
- ];
- $node = $this->drupalCreateNode($create);
-
- // Create the first translation, published now with no scheduled date.
- $this->drupalGet('node/' . $node->id() . '/translations/add/' . $this->languages[0]['code'] . '/' . $this->languages[1]['code']);
- $edit = [
- 'title[0][value]' => $this->languages[1]['name'] . '(1) - Published now',
- 'publish_on[0][value][date]' => '',
- 'publish_on[0][value][time]' => '',
- ];
- // At core 8.4 an enhancement will be committed to change the 'save and ...'
- // button into a 'save' with a corresponding status checkbox. This test has
- // to pass at 8.3 but the core change will not be backported. Hence derive
- // the button text and whether we need a 'status'field.
- // @see https://www.drupal.org/node/2873108
- $checkbox = $this->xpath('//input[@type="checkbox" and @id="edit-status-value"]');
- if ($checkbox) {
- $edit['status[value]'] = TRUE;
- $save_button_text = 'Save';
- }
- else {
- $save_button_text = 'Save and publish';
- }
- $this->submitForm($edit, $save_button_text);
-
- // Create the second translation, to be published in the future.
- $this->drupalGet('node/' . $node->id() . '/translations/add/' . $this->languages[0]['code'] . '/' . $this->languages[2]['code']);
- $edit = [
- 'title[0][value]' => $this->languages[2]['name'] . '(2) - Publish in the future',
- 'publish_on[0][value][date]' => date('Y-m-d', strtotime('+2 day', REQUEST_TIME)),
- 'publish_on[0][value][time]' => date('H:i:s', strtotime('+2 day', REQUEST_TIME)),
- ];
- $this->submitForm($edit, $save_button_text);
-
- // Create the third translation, to be published in the past.
- $this->drupalGet('node/' . $node->id() . '/translations/add/' . $this->languages[0]['code'] . '/' . $this->languages[3]['code']);
- $edit = [
- 'title[0][value]' => $this->languages[3]['name'] . '(3) - Publish in the past',
- 'publish_on[0][value][date]' => date('Y-m-d', strtotime('-2 day', REQUEST_TIME)),
- 'publish_on[0][value][time]' => date('H:i:s', strtotime('-2 day', REQUEST_TIME)),
- ];
- $this->submitForm($edit, $save_button_text);
-
- // For info only.
- $this->drupalGet($this->languages[0]['code'] . '/node/' . $node->id() . '/translations');
- $this->drupalGet('admin/content/scheduled');
-
- // Check the status of all four pieces of content before running cron.
- $this->checkStatus($node->id(), 'Before cron', $expected_status_values_before);
- $this->cronRun();
-
- // For info only.
- $this->drupalGet('admin/content/scheduled');
- $this->drupalGet('admin/content');
- $this->drupalGet('admin/reports/dblog');
- $this->drupalGet($this->languages[0]['code'] . '/node/' . $node->id() . '/translations');
-
- // Check all the status values after running cron.
- $this->checkStatus($node->id(), 'After cron', $expected_status_values_after);
-
- }
-
- /**
- * Provides data for testPublishingTranslations().
- *
- * Case 1 when the date is translatable and can differ between translations.
- * Case 2 when the date is not translatable and the behavior should be
- * consistent over all translations.
- *
- * @return array
- * The test data.
- */
- public function dataPublishingTranslations() {
- return [
- 'publish_on translatable' => [
- TRUE,
- FALSE,
- [FALSE, TRUE, FALSE, FALSE],
- [FALSE, TRUE, FALSE, TRUE],
- ],
- ];
- /*
- @TODO Fix module code before committing the 'publish_on not translatable'
- test
- // should be
- 'publish_on not translatable' => [FALSE, FALSE,
- array(FALSE, FALSE, FALSE, FALSE), array(TRUE, TRUE, TRUE, TRUE)],
- // actual before and after
- 'publish_on not translatable' => [FALSE, FALSE,
- array(FALSE, TRUE, FALSE, FALSE), array(TRUE, TRUE, FALSE, FALSE)],
- // actual before, but expected values after
- 'publish_on not translatable' => [FALSE, FALSE,
- array(FALSE, TRUE, FALSE, FALSE), array(TRUE, TRUE, TRUE, TRUE)],
- */
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerNodeAccessTest.php b/modules/scheduler/tests/src/Functional/SchedulerNodeAccessTest.php
deleted file mode 100644
index 7f5f25f..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerNodeAccessTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
- [
- 'status' => FALSE,
- 'before' => 'unpublished',
- 'after' => 'published',
- ],
- 'unpublish_on' => [
- 'status' => TRUE,
- 'before' => 'published',
- 'after' => 'unpublished',
- ],
- ];
-
- foreach ($test_data as $field => $data) {
- // Create a node with the required scheduler date.
- $settings = [
- 'type' => $this->type,
- 'status' => $data['status'],
- 'title' => 'Test node to be ' . $data['after'],
- $field => REQUEST_TIME + 1,
- ];
- $node = $this->drupalCreateNode($settings);
- $this->drupalGet('node/' . $node->id());
- $this->assertResponse(403, 'Before cron, viewing the ' . $data['before'] . ' node returns "403 Not Authorized"');
-
- // Delay so that the date entered is now in the past, then run cron.
- sleep(2);
- $this->cronRun();
-
- // Reload the node.
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- // Check that the node has been published or unpublished as required.
- $this->assertTrue($node->isPublished() === !$data['status'], 'Scheduler has ' . $data['after'] . ' the node via cron.');
-
- // Check the node is still not viewable.
- $this->drupalGet('node/' . $node->id());
- $this->assertResponse(403, 'After cron, viewing the ' . $data['after'] . ' node returns "403 Not Authorized"');
- }
-
- // Log in and show the dblog for info only.
- $this->drupalLogin($this->adminUser);
- $this->drupalGet('admin/reports/dblog');
- $this->assertText('scheduled publishing', '"Scheduled publishing" message is shown in the dblog');
- $this->assertText('scheduled unpublishing', '"Scheduled unpublishing" message is shown in the dblog');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerNonEnabledTypeTest.php b/modules/scheduler/tests/src/Functional/SchedulerNonEnabledTypeTest.php
deleted file mode 100644
index 79b162a..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerNonEnabledTypeTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-contentName = 'not_for_scheduler';
- $this->contentType = $this->drupalCreateContentType(['type' => $this->contentName, 'name' => 'Not for Scheduler']);
-
- // Create an administrator user.
- $this->adminUser = $this->drupalCreateUser([
- 'access content',
- 'administer scheduler',
- 'create ' . $this->contentName . ' content',
- 'edit own ' . $this->contentName . ' content',
- 'delete own ' . $this->contentName . ' content',
- 'view own unpublished content',
- 'administer nodes',
- 'schedule publishing of nodes',
- 'access site reports',
- ]);
- }
-
- /**
- * Helper function for testNonEnabledNodeType().
- *
- * This function is called four times.
- * Check that the date fields are correctly shown or not shown in /node/add.
- * Check that a node is not processed if it is not enabled for the action.
- */
- protected function checkNonEnabledTypes($publishing_enabled, $unpublishing_enabled, $run_number) {
-
- // Create title to show what combinations are being tested. Store base info
- // then add secondary details.
- $details = [
- 1 => 'by default',
- 2 => 'after disabling both settings',
- 3 => 'after enabling publishing only',
- 4 => 'after enabling unpublishing only',
- ];
- $info = $run_number >= 2 ?
- 'Publishing ' . ($publishing_enabled ? 'enabled' : 'not enabled')
- . ', Unpublishing ' . ($unpublishing_enabled ? 'enabled' : 'not enabled') . ', ' . $details[$run_number]
- : $details[$run_number];
-
- // Check that the field(s) are displayed only for the correct settings.
- $title = $info . ' (' . $run_number . 'a)';
- $this->drupalGet('node/add/' . $this->contentName);
- if ($publishing_enabled) {
- $this->assertFieldByName('publish_on[0][value][date]', NULL, 'The Publish-on field is shown - ' . $title);
- }
- else {
- $this->assertNoFieldByName('publish_on[0][value][date]', NULL, 'The Publish-on field is not shown - ' . $title);
- }
-
- if ($unpublishing_enabled) {
- $this->assertFieldByName('unpublish_on[0][value][date]', NULL, 'The Unpublish-on field is shown - ' . $title);
- }
- else {
- $this->assertNoFieldByName('unpublish_on[0][value][date]', NULL, 'The Unpublish-on field is not shown - ' . $title);
- }
-
- // Create an unpublished node with a publishing date, which mimics what
- // could be done by a third-party module, or a by-product of the node type
- // being enabled for publishing then being disabled before it got published.
- $title = $info . ' (' . $run_number . 'b)';
- $edit = [
- 'title' => $title,
- 'status' => 0,
- 'type' => $this->contentName,
- 'publish_on' => REQUEST_TIME - 2,
- ];
- $node = $this->drupalCreateNode($edit);
-
- // Run cron and display the dblog.
- $this->cronRun();
- $this->drupalGet('admin/reports/dblog');
-
- // Reload the node.
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- // Check if the node has been published or remains unpublished.
- if ($publishing_enabled) {
- $this->assertTrue($node->isPublished(), 'The unpublished node has been published - ' . $title);
- }
- else {
- $this->assertFalse($node->isPublished(), 'The unpublished node remains unpublished - ' . $title);
- }
- // Delete the node to avoid affecting subsequent tests.
- $node->delete();
-
- // Do the same for unpublishing.
- $title = $info . ' (' . $run_number . 'c)';
- $edit = [
- 'title' => $title,
- 'status' => 1,
- 'type' => $this->contentName,
- 'unpublish_on' => REQUEST_TIME - 1,
- ];
- $node = $this->drupalCreateNode($edit);
-
- // Run cron and display the dblog.
- $this->cronRun();
- $this->drupalGet('admin/reports/dblog');
-
- // Reload the node.
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- // Check if the node has been unpublished or remains published.
- if ($unpublishing_enabled) {
- $this->assertFalse($node->isPublished(), 'The published node has been unpublished - ' . $title);
- }
- else {
- $this->assertTrue($node->isPublished(), 'The published node remains published - ' . $title);
- }
- // Delete the node to avoid affecting subsequent tests.
- $node->delete();
- }
-
- /**
- * Tests that a non-enabled node type cannot be scheduled.
- *
- * The case when both options are enabled is covered in the main tests. Here
- * we need to check each of the other combinations, to ensure that the
- * settings work independently.
- */
- public function testNonEnabledNodeType() {
- // Log in.
- $this->drupalLogin($this->adminUser);
-
- // 1. By default check that the scheduler date fields are not displayed.
- $this->checkNonEnabledTypes(FALSE, FALSE, 1);
-
- // 2. Explicitly disable this content type for both settings and test again.
- $this->contentType->setThirdPartySetting('scheduler', 'publish_enable', FALSE)
- ->setThirdPartySetting('scheduler', 'unpublish_enable', FALSE)
- ->save();
- $this->checkNonEnabledTypes(FALSE, FALSE, 2);
-
- // 3. Turn on scheduled publishing only and test again.
- $this->contentType->setThirdPartySetting('scheduler', 'publish_enable', TRUE)
- ->save();
- $this->checkNonEnabledTypes(TRUE, FALSE, 3);
-
- // 4. Turn on scheduled unpublishing only and test again.
- $this->contentType->setThirdPartySetting('scheduler', 'publish_enable', FALSE)
- ->setThirdPartySetting('scheduler', 'unpublish_enable', TRUE)
- ->save();
- $this->checkNonEnabledTypes(FALSE, TRUE, 4);
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerPastDatesTest.php b/modules/scheduler/tests/src/Functional/SchedulerPastDatesTest.php
deleted file mode 100644
index e4c8305..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerPastDatesTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-drupalLogin($this->schedulerUser);
-
- // Ensure that neither of the scheduling dates are set to be required.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
- ->setThirdPartySetting('scheduler', 'unpublish_required', FALSE)->save();
-
- // Create an unpublished page node.
- $node = $this->drupalCreateNode(['type' => $this->type, 'status' => FALSE]);
-
- // Test the default behavior: an error message should be shown when the user
- // enters a publication date that is in the past.
- $edit = [
- 'title[0][value]' => 'Past ' . $this->randomString(10),
- 'publish_on[0][value][date]' => \Drupal::service('date.formatter')->format(strtotime('-1 day', REQUEST_TIME), 'custom', 'Y-m-d'),
- 'publish_on[0][value][time]' => \Drupal::service('date.formatter')->format(strtotime('-1 day', REQUEST_TIME), 'custom', 'H:i:s'),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertRaw(t("The 'publish on' date must be in the future"), 'An error message is shown by default when the publication date is in the past.');
-
- // Test the 'error' behavior explicitly.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'error')->save();
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertRaw(t("The 'publish on' date must be in the future"), 'An error message is shown when the publication date is in the past and the "error" behavior is chosen.');
-
- // Test the 'publish' behavior: the node should be published immediately.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'publish')->save();
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertNoText(t("The 'publish on' date must be in the future"), 'No error message is shown when the publication date is in the past and the "publish" behavior is chosen.');
- $this->assertText(sprintf('%s %s has been updated.', $this->typeName, SafeMarkup::checkPlain($edit['title[0][value]'])), 'The node is saved successfully when the publication date is in the past and the "publish" behavior is chosen.');
-
- // Reload the changed node and check that it is published.
- $this->nodeStorage->resetCache([$node->id()]);
-
- /** @var NodeInterface $node */
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isPublished(), 'The node has been published immediately when the publication date is in the past and the "publish" behavior is chosen.');
- $this->assertNull($node->publish_on->value, 'The node publish_on date has been removed after publishing when the "publish" behavior is chosen.');
-
- // Test the 'schedule' behavior: the node should be unpublished and become
- // published on the next cron run.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertNoText(t("The 'publish on' date must be in the future"), 'No error message is shown when the publication date is in the past and the "schedule" behavior is chosen.');
- $this->assertText(sprintf('%s %s has been updated.', $this->typeName, SafeMarkup::checkPlain($edit['title[0][value]'])), 'The node is saved successfully when the publication date is in the past and the "schedule" behavior is chosen.');
- $this->assertText('will be published', 'The node is scheduled to be published when the publication date is in the past and the "schedule" behavior is chosen.');
-
- // Reload the node and check that it is unpublished but scheduled correctly.
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertFalse($node->isPublished(), 'The node has been unpublished when the publication date is in the past and the "schedule" behavior is chosen.');
- $this->assertEqual($node->publish_on->value, strtotime('-1 day', REQUEST_TIME), 'The node has the correct publish_on date stored.');
-
- // Simulate a cron run and check that the node is published.
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $this->assertTrue($node->isPublished(), 'The node with publication date in the past and the "schedule" behavior has now been published by cron.');
-
- // Check that an Unpublish date in the past fails validation.
- $edit = [
- 'title[0][value]' => 'Unpublish in the past ' . $this->randomString(10),
- 'unpublish_on[0][value][date]' => \Drupal::service('date.formatter')->format(REQUEST_TIME - 3600, 'custom', 'Y-m-d'),
- 'unpublish_on[0][value][time]' => \Drupal::service('date.formatter')->format(REQUEST_TIME - 3600, 'custom', 'H:i:s'),
- ];
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $this->assertRaw(t("The 'unpublish on' date must be in the future"), 'An error message is shown when the unpublish date is in the past.');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerPermissionsTest.php b/modules/scheduler/tests/src/Functional/SchedulerPermissionsTest.php
deleted file mode 100644
index c063258..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerPermissionsTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-webUser = $this->drupalCreateUser([
- 'access content',
- 'administer nodes',
- 'create ' . $this->type . ' content',
- 'edit own ' . $this->type . ' content',
- 'delete own ' . $this->type . ' content',
- 'view own unpublished content',
- ]);
- $this->drupalLogin($this->webUser);
-
- // Check that neither of the fields are displayed when creating a node.
- $this->drupalGet('node/add/' . $this->type);
- $this->assertNoFieldByName('publish_on[0][value][date]', NULL, 'The Publish-on field is not shown for users who do not have permission to schedule content');
- $this->assertNoFieldByName('unpublish_on[0][value][date]', NULL, 'The Unpublish-on field is not shown for users who do not have permission to schedule content');
-
- // At core 8.4 an enhancement will be committed to change the 'save and ...'
- // button into a 'save' with a corresponding status checkbox. This test has
- // to pass at 8.3 but the core change will not be backported. Hence derive
- // the button text and whether we need a 'status'field.
- // @see https://www.drupal.org/node/2873108
- $checkbox = $this->xpath('//input[@type="checkbox" and @id="edit-status-value"]');
-
- // Initially run tests when publishing and unpublishing are not required.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
- ->setThirdPartySetting('scheduler', 'unpublish_required', FALSE)
- ->save();
-
- // Check that a new node can be saved and published.
- $title = $this->randomString(15);
- $edit = ['title[0][value]' => $title];
- if ($checkbox) {
- $edit['status[value]'] = TRUE;
- }
- $this->drupalPostForm('node/add/' . $this->type, $edit, $checkbox ? 'Save' : 'Save and publish');
- $this->assertText(sprintf('%s %s has been created.', $this->typeName, SafeMarkup::checkPlain($title)), 'A node can be created and published when the user does not have scheduler permissions.');
- $this->assertTrue($this->drupalGetNodeByTitle($title)->isPublished(), 'The new node is published');
-
- // Check that a new node can be saved as unpublished.
- $title = $this->randomString(15);
- $edit = ['title[0][value]' => $title];
- if ($checkbox) {
- $edit['status[value]'] = FALSE;
- }
- $this->drupalPostForm('node/add/' . $this->type, $edit, $checkbox ? 'Save' : 'Save as unpublished');
- $this->assertText(sprintf('%s %s has been created.', $this->typeName, SafeMarkup::checkPlain($title)), 'A node can be created and saved as unpublished when the user does not have scheduler permissions.');
- $this->assertFalse($this->drupalGetNodeByTitle($title)->isPublished(), 'The new node is unpublished');
-
- // Set publishing and unpublishing to required, to make it a stronger test.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', TRUE)
- ->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)
- ->save();
-
- // @TODO Add tests when scheduled publishing and unpublishing are required.
- // Cannot be done until we make a decision on what 'required' means.
- // @see https://www.drupal.org/node/2707411
- // "Conflict between 'required publishing' and not having scheduler
- // permission"
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRequiredTest.php b/modules/scheduler/tests/src/Functional/SchedulerRequiredTest.php
deleted file mode 100644
index 00ec4c4..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRequiredTest.php
+++ /dev/null
@@ -1,227 +0,0 @@
-drupalLogin($this->schedulerUser);
-
- // Define test scenarios with expected results.
- // @TODO Re-write this with a dataProvider function.
- $test_cases = [
- // The 1-10 numbering used below matches the test cases described in
- // http://drupal.org/node/1198788#comment-7816119
- //
- [
- 'id' => 0,
- 'required' => '',
- 'operation' => 'add',
- 'status' => 1,
- 'expected' => 'not required',
- 'message' => 'By default when a new node is created, the publish on and unpublish on dates are not required.',
- ],
- // A. Test scenarios that require scheduled publishing.
- // When creating a new unpublished node it is required to enter a
- // publication date.
- [
- 'id' => 1,
- 'required' => 'publish',
- 'operation' => 'add',
- 'status' => 0,
- 'expected' => 'required',
- 'message' => 'When scheduled publishing is required and a new unpublished node is created, entering a date in the publish on field is required.',
- ],
-
- // When creating a new published node it is required to enter a
- // publication date. The node will be unpublished on form submit.
- [
- 'id' => 2,
- 'required' => 'publish',
- 'operation' => 'add',
- 'status' => 1,
- 'expected' => 'required',
- 'message' => 'When scheduled publishing is required and a new published node is created, entering a date in the publish on field is required.',
- ],
-
- // When editing a published node it is not needed to enter a publication
- // date since the node is already published.
- [
- 'id' => 3,
- 'required' => 'publish',
- 'operation' => 'edit',
- 'scheduled' => 0,
- 'status' => 1,
- 'expected' => 'not required',
- 'message' => 'When scheduled publishing is required and an existing published, unscheduled node is edited, entering a date in the publish on field is not required.',
- ],
-
- // When editing an unpublished node that is scheduled for publication it
- // is required to enter a publication date.
- [
- 'id' => 4,
- 'required' => 'publish',
- 'operation' => 'edit',
- 'scheduled' => 1,
- 'status' => 0,
- 'expected' => 'required',
- 'message' => 'When scheduled publishing is required and an existing unpublished, scheduled node is edited, entering a date in the publish on field is required.',
- ],
-
- // When editing an unpublished node that is not scheduled for publication
- // it is not required to enter a publication date since this means that
- // the node has already gone through a publication > unpublication cycle.
- [
- 'id' => 5,
- 'required' => 'publish',
- 'operation' => 'edit',
- 'scheduled' => 0,
- 'status' => 0,
- 'expected' => 'not required',
- 'message' => 'When scheduled publishing is required and an existing unpublished, unscheduled node is edited, entering a date in the publish on field is not required.',
- ],
-
- // B. Test scenarios that require scheduled unpublishing.
- // When creating a new unpublished node it is required to enter an
- // unpublication date since it is to be expected that the node will be
- // published at some point and should subsequently be unpublished.
- [
- 'id' => 6,
- 'required' => 'unpublish',
- 'operation' => 'add',
- 'status' => 0,
- 'expected' => 'required',
- 'message' => 'When scheduled unpublishing is required and a new unpublished node is created, entering a date in the unpublish on field is required.',
- ],
-
- // When creating a new published node it is required to enter an
- // unpublication date.
- [
- 'id' => 7,
- 'required' => 'unpublish',
- 'operation' => 'add',
- 'status' => 1,
- 'expected' => 'required',
- 'message' => 'When scheduled unpublishing is required and a new published node is created, entering a date in the unpublish on field is required.',
- ],
-
- // When editing a published node it is required to enter an unpublication
- // date.
- [
- 'id' => 8,
- 'required' => 'unpublish',
- 'operation' => 'edit',
- 'scheduled' => 0,
- 'status' => 1,
- 'expected' => 'required',
- 'message' => 'When scheduled unpublishing is required and an existing published, unscheduled node is edited, entering a date in the unpublish on field is required.',
- ],
-
- // When editing an unpublished node that is scheduled for publication it
- // it is required to enter an unpublication date.
- [
- 'id' => 9,
- 'required' => 'unpublish',
- 'operation' => 'edit',
- 'scheduled' => 1,
- 'status' => 0,
- 'expected' => 'required',
- 'message' => 'When scheduled unpublishing is required and an existing unpublished, scheduled node is edited, entering a date in the unpublish on field is required.',
- ],
-
- // When editing an unpublished node that is not scheduled for publication
- // it is not required to enter an unpublication date since this means that
- // the node has already gone through a publication - unpublication cycle.
- [
- 'id' => 10,
- 'required' => 'unpublish',
- 'operation' => 'edit',
- 'scheduled' => 0,
- 'status' => 0,
- 'expected' => 'not required',
- 'message' => 'When scheduled unpublishing is required and an existing unpublished, unscheduled node is edited, entering a date in the unpublish on field is not required.',
- ],
- ];
-
- $fields = \Drupal::entityManager()->getFieldDefinitions('node', $this->type);
-
- foreach ($test_cases as $test_case) {
- // Set required (un)publishing as stipulated by the test case.
- if (!empty($test_case['required'])) {
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', $test_case['required'] == 'publish')
- ->setThirdPartySetting('scheduler', 'unpublish_required', $test_case['required'] == 'unpublish')
- ->save();
- }
-
- // To assist viewing and analysing the generated test result pages create
- // a text string showing all the test case parameters.
- $title_data = [];
- foreach ($test_case as $key => $value) {
- if ($key != 'message') {
- $title_data[] = $key . ' = ' . $value;
- }
- }
- $title = implode(', ', $title_data);
-
- // If the test case requires editing a node, we need to create one first.
- if ($test_case['operation'] == 'edit') {
- // Note: The key names in the $options parameter for drupalCreateNode()
- // are the plain field names i.e. 'title' not title[0][value].
- $options = [
- 'title' => $title,
- 'type' => $this->type,
- 'status' => $test_case['status'],
- 'publish_on' => !empty($test_case['scheduled']) ? strtotime('+1 day') : NULL,
- ];
- $node = $this->drupalCreateNode($options);
- // Define the path and button to use for editing the node.
- $path = 'node/' . $node->id() . '/edit';
- }
- else {
- // Set the default status, used when testing creation of the new node.
- $fields['status']->getConfig($this->type)
- ->setDefaultValue($test_case['status'])
- ->save();
- // Define the path and button to use for creating the node.
- $path = 'node/add/' . $this->type;
- }
-
- // Make sure that both date fields are empty so we can check if they throw
- // validation errors when the fields are required.
- $values = [
- 'title[0][value]' => $title,
- 'publish_on[0][value][date]' => '',
- 'publish_on[0][value][time]' => '',
- 'unpublish_on[0][value][date]' => '',
- 'unpublish_on[0][value][time]' => '',
- ];
- // Add or edit the node.
- $this->drupalPostForm($path, $values, t('Save'));
-
- // Check for the expected result.
- switch ($test_case['expected']) {
- case 'required':
- $string = sprintf('The %s date is required.', ucfirst($test_case['required']) . ' on');
- $this->assertText($string, $test_case['id'] . '. ' . $test_case['message']);
- break;
-
- case 'not required':
- $string = sprintf('%s %s has been %s.', $this->typeName, SafeMarkup::checkPlain($title), ($test_case['operation'] == 'add' ? 'created' : 'updated'));
- $this->assertText($string, $test_case['id'] . '. ' . $test_case['message']);
- break;
- }
- }
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRevisioningTest.php b/modules/scheduler/tests/src/Functional/SchedulerRevisioningTest.php
deleted file mode 100644
index 8810e8d..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRevisioningTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-{$action . '_on'} = strtotime('-1 day', REQUEST_TIME);
- $node->save();
- scheduler_cron();
- $this->nodeStorage->resetCache([$node->id()]);
- return $this->nodeStorage->load($node->id());
- }
-
- /**
- * Check if the latest revision log message of a node matches a given string.
- *
- * @param int $nid
- * The node id of the node to check.
- * @param string $value
- * The value with which the log message will be compared.
- * @param string $message
- * The message to display along with the assertion.
- * @param string $group
- * The type of assertion - examples are "Browser", "PHP".
- *
- * @return bool
- * TRUE if the assertion succeeded, FALSE otherwise.
- */
- protected function assertRevisionLogMessage($nid, $value, $message = '', $group = 'Other') {
- // Retrieve the latest revision log message for this node.
- $log_message = $this->database->select('node_revision', 'r')
- ->fields('r', ['revision_log'])
- ->condition('nid', $nid)
- ->orderBy('vid', 'DESC')
- ->range(0, 1)
- ->execute()
- ->fetchColumn();
-
- return $this->assertEqual($log_message, $value, $message, $group);
- }
-
- /**
- * Check if the number of revisions for a node matches a given value.
- *
- * @param int $nid
- * The node id of the node to check.
- * @param string $value
- * The value with which the number of revisions will be compared.
- * @param string $message
- * The message to display along with the assertion.
- * @param string $group
- * The type of assertion - examples are "Browser", "PHP".
- *
- * @return bool
- * TRUE if the assertion succeeded, FALSE otherwise.
- */
- protected function assertRevisionCount($nid, $value, $message = '', $group = 'Other') {
- $count = \Drupal::database()->select('node_revision', 'r')
- ->condition('nid', $nid)
- ->countQuery()
- ->execute()
- ->fetchColumn();
-
- return $this->assertEqual($count, $value, $message, $group);
- }
-
- /**
- * Tests the creation of new revisions on scheduling.
- */
- public function testRevisioning() {
- // Create a scheduled node that is not automatically revisioned.
- $created = strtotime('-2 day', REQUEST_TIME);
- $settings = [
- 'type' => $this->type,
- 'revision' => 0,
- 'created' => $created,
- ];
- $node = $this->drupalCreateNode($settings);
-
- // Ensure nodes with past dates will be scheduled not published immediately.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
-
- // First test scheduled publication with revisioning disabled by default.
- $node = $this->schedule($node);
- $this->assertRevisionCount($node->id(), 1, 'No new revision is created by default when a node is published.');
-
- // Test scheduled unpublication.
- $node = $this->schedule($node, 'unpublish');
- $this->assertRevisionCount($node->id(), 1, 'No new revision is created by default when a node is unpublished.');
-
- // Enable revisioning.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_revision', TRUE)
- ->setThirdPartySetting('scheduler', 'unpublish_revision', TRUE)
- ->save();
-
- // Test scheduled publication with revisioning enabled.
- $node = $this->schedule($node);
- $this->assertRevisionCount($node->id(), 2, 'A new revision was created when revisioning is enabled.');
- $expected_message = sprintf('Node published by Scheduler on %s. Previous creation date was %s.',
- \Drupal::service('date.formatter')->format(REQUEST_TIME, 'short'),
- \Drupal::service('date.formatter')->format($created, 'short'));
- $this->assertRevisionLogMessage($node->id(), $expected_message, 'The correct message was found in the node revision log after scheduled publishing.');
-
- // Test scheduled unpublication with revisioning enabled.
- $node = $this->schedule($node, 'unpublish');
- $this->assertRevisionCount($node->id(), 3, 'A new revision was created when a node was unpublished with revisioning enabled.');
- $expected_message = sprintf('Node unpublished by Scheduler on %s. Previous change date was %s.',
- \Drupal::service('date.formatter')->format(REQUEST_TIME, 'short'),
- \Drupal::service('date.formatter')->format(REQUEST_TIME, 'short'));
- $this->assertRevisionLogMessage($node->id(), $expected_message, 'The correct message was found in the node revision log after scheduled unpublishing.');
- }
-
- /**
- * Tests the 'touch' option to alter the node created date during publishing.
- */
- public function testAlterCreationDate() {
- // Ensure nodes with past dates will be scheduled not published immediately.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
-
- // Create a node with a 'created' date two days in the past.
- $created = strtotime('-2 day', REQUEST_TIME);
- $settings = [
- 'type' => $this->type,
- 'created' => $created,
- 'status' => FALSE,
- ];
- $node = $this->drupalCreateNode($settings);
- // Show that the node is not published.
- $this->assertFalse($node->isPublished(), 'The node is not published.');
-
- // Schedule the node for publishing and run cron.
- $node = $this->schedule($node, 'publish');
- // Get the created date from the node and check that it has not changed.
- $created_after_cron = $node->created->value;
- $this->assertTrue($node->isPublished(), 'The node has been published.');
- $this->assertEqual($created, $created_after_cron, 'The node creation date is not changed by default.');
-
- // Set option to change the created date to match the publish_on date.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_touch', TRUE)->save();
-
- // Schedule the node again and run cron.
- $node = $this->schedule($node, 'publish');
- // Check that the created date has changed to match the publish_on date.
- $created_after_cron = $node->created->value;
- $this->assertEqual(strtotime('-1 day', REQUEST_TIME), $created_after_cron, "With 'touch' option set, the node creation date is changed to match the publishing date.");
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRulesActionsTest.php b/modules/scheduler/tests/src/Functional/SchedulerRulesActionsTest.php
deleted file mode 100644
index 9bd335f..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRulesActionsTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
- $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
-
- // Create a published node.
- $this->node = $this->drupalCreateNode([
- 'title' => 'Initial Test Node',
- 'type' => $this->type,
- 'uid' => $this->schedulerUser->id(),
- 'status' => TRUE,
- ]);
- }
-
- /**
- * Tests the actions which set and remove the 'Publish On' date.
- */
- public function testPublishOnActions() {
-
- // Create rule 1 to set the publishing date.
- $rule1 = $this->expressionManager->createRule();
- $rule1->addCondition('scheduler_condition_publishing_is_enabled',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addCondition('rules_data_comparison',
- ContextConfig::create()
- ->map('data', 'node.title.value')
- ->setValue('operation', '==')
- ->setValue('value', 'Trigger Action Rule 1')
- );
- $message1 = 'RULES message 1. Action to set Publish-on date.';
- $rule1->addAction('scheduler_set_publishing_date_action',
- ContextConfig::create()
- ->map('node', 'node')
- ->setValue('date', REQUEST_TIME + 1800)
- )
- ->addAction('rules_system_message',
- ContextConfig::create()
- ->setValue('message', $message1)
- ->setValue('type', 'status')
- );
- // The event needs to be rules_entity_presave:node 'before saving' because
- // rules_entity_update:node 'after save' is too late to set the date.
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule1',
- 'events' => [['event_name' => 'rules_entity_presave:node']],
- 'expression' => $rule1->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create rule 2 to remove the publishing date and publish the node now.
- $rule2 = $this->expressionManager->createRule();
- $rule2->addCondition('scheduler_condition_publishing_is_enabled',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addCondition('rules_data_comparison',
- ContextConfig::create()
- ->map('data', 'node.title.value')
- ->setValue('operation', '==')
- ->setValue('value', 'Trigger Action Rule 2')
- );
- $message2 = 'RULES message 2. Action to remove Publish-on date and publish the node immediately.';
- $rule2->addAction('scheduler_remove_publishing_date_action',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addAction('scheduler_publish_now_action',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addAction('rules_system_message',
- ContextConfig::create()
- ->setValue('message', $message2)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule2',
- 'events' => [['event_name' => 'rules_entity_presave:node']],
- 'expression' => $rule2->getConfiguration(),
- ]);
- $config_entity->save();
-
- $this->drupalLogin($this->schedulerUser);
- $node = $this->node;
-
- // Edit node without changing title.
- $edit = [
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- // Check that neither of the rules are triggered, no publish and unpublish
- // dates are set and the status is still published.
- $this->assertNoText($message1, '"' . $message1 . '" is not shown');
- $this->assertNoText($message2, '"' . $message2 . '" is not shown');
- $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
- $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
- $this->assertTrue($node->isPublished(), 'Node remains published for title: "' . $node->title->value . '".');
-
- // Edit the node, triggering rule 1.
- $edit = [
- 'title[0][value]' => 'Trigger Action Rule 1',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
- $this->nodeStorage->resetCache([$this->node->id()]);
- $node = $this->nodeStorage->load($this->node->id());
- // Check that rule 1 is triggered and rule 2 is not. Check that a publishing
- // date has been set and status is now unpublished.
- $this->assertText($message1, '"' . $message1 . '" is shown');
- $this->assertNoText($message2, '"' . $message2 . '" is not shown');
- $this->assertTrue($node->publish_on->value, 'Node is scheduled for publishing.');
- $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
- $this->assertFalse($node->isPublished(), 'Node is now unpublished for title: "' . $node->title->value . '".');
-
- // Edit the node, triggering rule 2.
- $edit = [
- 'title[0][value]' => 'Trigger Action Rule 2',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
- $this->nodeStorage->resetCache([$this->node->id()]);
- $node = $this->nodeStorage->load($this->node->id());
- // Check that rule 2 is triggered and rule 1 is not. Check that the
- // publishing date has been removed and the status is published.
- $this->assertNoText($message1, '"' . $message1 . '" is not shown');
- $this->assertText($message2, '"' . $message2 . '" is shown');
- $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
- $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
- $this->assertTrue($node->isPublished(), 'Node is now published for title: "' . $node->title->value . '".');
-
- }
-
- /**
- * Tests the actions which set and remove the 'Unpublish On' date.
- */
- public function testUnpublishOnActions() {
-
- // Create rule 3 to set the unpublishing date.
- $rule3 = $this->expressionManager->createRule();
- $rule3->addCondition('scheduler_condition_unpublishing_is_enabled',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addCondition('rules_data_comparison',
- ContextConfig::create()
- ->map('data', 'node.title.value')
- ->setValue('operation', '==')
- ->setValue('value', 'Trigger Action Rule 3')
- );
- $message3 = 'RULES message 3. Action to set Unpublish-on date.';
- $rule3->addAction('scheduler_set_unpublishing_date_action',
- ContextConfig::create()
- ->map('node', 'node')
- ->setValue('date', REQUEST_TIME + 1800)
- )
- ->addAction('rules_system_message',
- ContextConfig::create()
- ->setValue('message', $message3)
- ->setValue('type', 'status')
- );
- // The event needs to be rules_entity_presave:node 'before saving' because
- // rules_entity_update:node 'after save' is too late to set the date.
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule3',
- 'events' => [['event_name' => 'rules_entity_presave:node']],
- 'expression' => $rule3->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create rule 4 to remove the unpublishing date and unpublish the node.
- $rule4 = $this->expressionManager->createRule();
- $rule4->addCondition('scheduler_condition_unpublishing_is_enabled',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addCondition('rules_data_comparison',
- ContextConfig::create()
- ->map('data', 'node.title.value')
- ->setValue('operation', '==')
- ->setValue('value', 'Trigger Action Rule 4')
- );
- $message4 = 'RULES message 4. Action to remove Unpublish-on date and unpublish the node immediately.';
- $rule4->addAction('scheduler_remove_unpublishing_date_action',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addAction('scheduler_unpublish_now_action',
- ContextConfig::create()
- ->map('node', 'node')
- )
- ->addAction('rules_system_message',
- ContextConfig::create()
- ->setValue('message', $message4)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule4',
- 'events' => [['event_name' => 'rules_entity_presave:node']],
- 'expression' => $rule4->getConfiguration(),
- ]);
- $config_entity->save();
-
- $this->drupalLogin($this->schedulerUser);
- $node = $this->node;
-
- // Edit node without changing title.
- $edit = [
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- // Check that neither of the rules are triggered, no publish and unpublish
- // dates are set and the status is still published.
- $this->assertNoText($message3, '"' . $message3 . '" is not shown');
- $this->assertNoText($message4, '"' . $message4 . '" is not shown');
- $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
- $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
- $this->assertTrue($node->isPublished(), 'Node remains published for title: "' . $node->title->value . '".');
-
- // Edit the node, triggering rule 3.
- $edit = [
- 'title[0][value]' => 'Trigger Action Rule 3',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
- $this->nodeStorage->resetCache([$this->node->id()]);
- $node = $this->nodeStorage->load($this->node->id());
- // Check that rule 3 is triggered and rule 4 is not. Check that an
- // unpublishing date has been set and status is still published.
- $this->assertText($message3, '"' . $message3 . '" is shown');
- $this->assertNoText($message4, '"' . $message4 . '" is not shown');
- $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
- $this->assertTrue($node->unpublish_on->value, 'Node is scheduled for unpublishing.');
- $this->assertTrue($node->isPublished(), 'Node is still published for title: "' . $node->title->value . '".');
-
- // Edit the node, triggering rule 4.
- $edit = [
- 'title[0][value]' => 'Trigger Action Rule 4',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
- $this->nodeStorage->resetCache([$this->node->id()]);
- $node = $this->nodeStorage->load($this->node->id());
- // Check that rule 4 is triggered and rule 3 is not. Check that the
- // unpublishing date has been removed and the status is unpublished.
- $this->assertNoText($message3, '"' . $message3 . '" is not shown');
- $this->assertText($message4, '"' . $message4 . '" is shown');
- $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
- $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
- $this->assertFalse($node->isPublished(), 'Node is now unpublished for title: "' . $node->title->value . '".');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRulesConditionsTest.php b/modules/scheduler/tests/src/Functional/SchedulerRulesConditionsTest.php
deleted file mode 100644
index 62a07ef..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRulesConditionsTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
- $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
-
- // Create a published node.
- $this->node = $this->drupalCreateNode([
- 'title' => 'Rules Test Node',
- 'type' => $this->type,
- 'uid' => $this->schedulerUser->id(),
- 'status' => TRUE,
- ]);
- }
-
- /**
- * Tests the conditions for whether a nodetype is enabled for Scheduler.
- */
- public function testNodeTypeEnabledConditions() {
- // Create a reaction rule to display a message when viewing a node of a type
- // that is enabled for scheduled publishing.
- // "viewing content" actually means "viewing PUBLISHED content".
- $rule1 = $this->expressionManager->createRule();
- $rule1->addCondition('scheduler_condition_publishing_is_enabled',
- ContextConfig::create()->map('node', 'node')
- );
- $message1 = 'RULES message 1. This node type is enabled for scheduled publishing.';
- $rule1->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message1)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule1',
- 'events' => [['event_name' => 'rules_entity_view:node']],
- 'expression' => $rule1->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create a reaction rule to display a message when viewing a node of a type
- // that is enabled for scheduled unpublishing.
- $rule2 = $this->expressionManager->createRule();
- $rule2->addCondition('scheduler_condition_unpublishing_is_enabled',
- ContextConfig::create()->map('node', 'node')
- );
- $message2 = 'RULES message 2. This node type is enabled for scheduled unpublishing.';
- $rule2->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message2)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule2',
- 'events' => [['event_name' => 'rules_entity_view:node']],
- 'expression' => $rule2->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create a reaction rule to display a message when viewing a node of a type
- // that is NOT enabled for scheduled publishing.
- $rule3 = $this->expressionManager->createRule();
- $rule3->addCondition('scheduler_condition_publishing_is_enabled',
- ContextConfig::create()->map('node', 'node')->negateResult()
- );
- $message3 = 'RULES message 3. This node type is not enabled for scheduled publishing.';
- $rule3->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message3)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule3',
- 'events' => [['event_name' => 'rules_entity_view:node']],
- 'expression' => $rule3->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create a reaction rule to display a message when viewing a node of a type
- // that is NOT enabled for scheduled unpublishing.
- $rule4 = $this->expressionManager->createRule();
- $rule4->addCondition('scheduler_condition_unpublishing_is_enabled',
- ContextConfig::create()->map('node', 'node')->negateResult()
- );
- $message4 = 'RULES message 4. This node type is not enabled for scheduled unpublishing.';
- $rule4->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message4)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule4',
- 'events' => [['event_name' => 'rules_entity_view:node']],
- 'expression' => $rule4->getConfiguration(),
- ]);
- $config_entity->save();
-
- // View the node and check the default position - that the node type is
- // enabled for both publishing and unpublishing.
- $this->drupalGet('node/' . $this->node->id());
- $this->assertText($message1, '"' . $message1 . '" is shown');
- $this->assertText($message2, '"' . $message2 . '" is shown');
- $this->assertNoText($message3, '"' . $message3 . '" is not shown');
- $this->assertNoText($message4, '"' . $message4 . '" is not shown');
-
- // Turn off scheduled publishing for the node type and check the rules.
- $this->nodetype->setThirdPartySetting('scheduler', 'publish_enable', FALSE)->save();
- // Flushing the caches was not required when using WebTestBase but is needed
- // after converting to BrowserTestBase.
- drupal_flush_all_caches();
- $this->drupalGet('node/' . $this->node->id());
- $this->assertNoText($message1, '"' . $message1 . '" is not shown');
- $this->assertText($message2, '"' . $message2 . '" is shown');
- $this->assertText($message3, '"' . $message3 . '" is shown');
- $this->assertNoText($message4, '"' . $message4 . '" is not shown');
-
- // Turn off scheduled unpublishing for the node type and the check again.
- $this->nodetype->setThirdPartySetting('scheduler', 'unpublish_enable', FALSE)->save();
- drupal_flush_all_caches();
- $this->drupalGet('node/' . $this->node->id());
- $this->assertNoText($message1, '"' . $message1 . '" is not shown');
- $this->assertNoText($message2, '"' . $message2 . '" is not shown');
- $this->assertText($message3, '"' . $message3 . '" is shown');
- $this->assertText($message4, '"' . $message4 . '" is shown');
-
- }
-
- /**
- * Tests the conditions for whether a node is scheduled.
- */
- public function testNodeIsScheduledConditions() {
- // Create a reaction rule to display a message when a node is updated and
- // is not scheduled for publishing.
- $rule5 = $this->expressionManager->createRule();
- $rule5->addCondition('scheduler_condition_node_scheduled_for_publishing',
- ContextConfig::create()->map('node', 'node')->negateResult()
- );
- $message5 = 'RULES message 5. This content is not scheduled for publishing.';
- $rule5->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message5)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule5',
- 'events' => [['event_name' => 'rules_entity_update:node']],
- 'expression' => $rule5->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create a reaction rule to display a message when a node is updated and
- // is not scheduled for unpublishing.
- $rule6 = $this->expressionManager->createRule();
- $rule6->addCondition('scheduler_condition_node_scheduled_for_unpublishing',
- ContextConfig::create()->map('node', 'node')->negateResult()
- );
- $message6 = 'RULES message 6. This content is not scheduled for unpublishing.';
- $rule6->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message6)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule6',
- 'events' => [['event_name' => 'rules_entity_update:node']],
- 'expression' => $rule6->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create a reaction rule to display a message when a node is updated and
- // is scheduled for publishing.
- $rule7 = $this->expressionManager->createRule();
- $rule7->addCondition('scheduler_condition_node_scheduled_for_publishing',
- ContextConfig::create()->map('node', 'node')
- );
- $message7 = 'RULES message 7. This content is scheduled for publishing.';
- $rule7->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message7)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule7',
- 'events' => [['event_name' => 'rules_entity_update:node']],
- 'expression' => $rule7->getConfiguration(),
- ]);
- $config_entity->save();
-
- // Create a reaction rule to display a message when a node is updated and
- // is scheduled for unpublishing.
- $rule8 = $this->expressionManager->createRule();
- $rule8->addCondition('scheduler_condition_node_scheduled_for_unpublishing',
- ContextConfig::create()->map('node', 'node')
- );
- $message8 = 'RULES message 8. This content is scheduled for unpublishing.';
- $rule8->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message8)
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule8',
- 'events' => [['event_name' => 'rules_entity_update:node']],
- 'expression' => $rule8->getConfiguration(),
- ]);
- $config_entity->save();
-
- $this->drupalLogin($this->schedulerUser);
-
- // Edit the node but do not enter any scheduling dates.
- $edit = [
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-
- $this->assertText($message5, '"' . $message5 . '" is shown');
- $this->assertText($message6, '"' . $message6 . '" is shown');
- $this->assertNoText($message7, '"' . $message7 . '" is not shown');
- $this->assertNoText($message8, '"' . $message8 . '" is not shown');
-
- // Edit the node and set a publish_on date.
- $edit = [
- 'publish_on[0][value][date]' => date('Y-m-d', strtotime('+1 day', REQUEST_TIME)),
- 'publish_on[0][value][time]' => date('H:i:s', strtotime('+1 day', REQUEST_TIME)),
- ];
- $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-
- $this->assertNoText($message5, '"' . $message5 . '" is not shown');
- $this->assertText($message6, '"' . $message6 . '" is shown');
- $this->assertText($message7, '"' . $message7 . '" is shown');
- $this->assertNoText($message8, '"' . $message8 . '" is not shown');
-
- // Edit the node and set an unpublish_on date.
- $edit = [
- 'unpublish_on[0][value][date]' => date('Y-m-d', strtotime('+2 day', REQUEST_TIME)),
- 'unpublish_on[0][value][time]' => date('H:i:s', strtotime('+2 day', REQUEST_TIME)),
- ];
- $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-
- $this->assertNoText($message5, '"' . $message5 . '" is not shown');
- $this->assertNoText($message6, '"' . $message6 . '" is not shown');
- $this->assertText($message7, '"' . $message7 . '" is shown');
- $this->assertText($message8, '"' . $message8 . '" is shown');
-
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRulesEventsTest.php b/modules/scheduler/tests/src/Functional/SchedulerRulesEventsTest.php
deleted file mode 100644
index f7276ad..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRulesEventsTest.php
+++ /dev/null
@@ -1,227 +0,0 @@
-rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
- $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
-
- }
-
- /**
- * Tests the six events provided by Scheduler.
- *
- * This class tests all six events provided by Scheduler, by creating six
- * rules which are all active throughout the test. They are all checked in
- * this one test class to make the tests stronger, as this will show not only
- * that the correct events are triggered in the right places, but also
- * that they are not triggered in the wrong places.
- */
- public function testRulesEvents() {
-
- // Create six reaction rules, one for each event that Scheduler triggers.
- $rule_data = [
- 1 => ['scheduler_new_node_is_scheduled_for_publishing_event', 'A new node is created and is scheduled for publishing.'],
- 2 => ['scheduler_existing_node_is_scheduled_for_publishing_event', 'An existing node is saved and is scheduled for publishing.'],
- 3 => ['scheduler_has_published_this_node_event', 'Scheduler has published this node during cron.'],
- 4 => ['scheduler_new_node_is_scheduled_for_unpublishing_event', 'A new node is created and is scheduled for unpublishing.'],
- 5 => ['scheduler_existing_node_is_scheduled_for_unpublishing_event', 'An existing node is saved and is scheduled for unpublishing.'],
- 6 => ['scheduler_has_unpublished_this_node_event', 'Scheduler has unpublished this node during cron.'],
- ];
- foreach ($rule_data as $i => list($event_name, $description)) {
- $rule[$i] = $this->expressionManager->createRule();
- $message[$i] = 'RULES message ' . $i . '. ' . $description;
- $rule[$i]->addAction('rules_system_message', ContextConfig::create()
- ->setValue('message', $message[$i])
- ->setValue('type', 'status')
- );
- $config_entity = $this->rulesStorage->create([
- 'id' => 'rule' . $i,
- 'events' => [['event_name' => $event_name]],
- 'expression' => $rule[$i]->getConfiguration(),
- ]);
- $config_entity->save();
- }
-
- $this->drupalLogin($this->schedulerUser);
-
- // Create a node without any scheduled dates, using node/add/ not
- // drupalCreateNode(), and check that no events are triggered.
- $edit = [
- 'title[0][value]' => 'Test for no events',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Edit the node and check that no events are triggered.
- $edit = [
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Create a new node with a publish-on date, and check that only event 1 is
- // triggered.
- $edit = [
- 'title[0][value]' => 'Create node with publish-on date',
- 'publish_on[0][value][date]' => date('Y-m-d', time() + 3),
- 'publish_on[0][value][time]' => date('H:i:s', time() + 3),
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
- $this->assertText($message[1], '"' . $message[1] . '" IS shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Edit this node and check that only event 2 is triggered.
- $edit = [
- 'title[0][value]' => 'Edit node with publish-on date',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertText($message[2], '"' . $message[2] . '" IS shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Delay to ensure that the date entered is now in the past so that the node
- // will be processed during cron, and assert that event 3 is triggered.
- sleep(5);
- $this->cronRun();
- $this->drupalGet('admin/reports/dblog');
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertText($message[3], '"' . $message[3] . '" IS shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Create a new node with an unpublish-on date, and check that only event 4
- // is triggered.
- $edit = [
- 'title[0][value]' => 'Create node with unpublish-on date',
- 'unpublish_on[0][value][date]' => date('Y-m-d', time() + 3),
- 'unpublish_on[0][value][time]' => date('H:i:s', time() + 3),
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertText($message[4], '"' . $message[4] . '" IS shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Edit this node and check that only event 5 is triggered.
- $edit = [
- 'title[0][value]' => 'Edit node with unpublish-on date',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertText($message[5], '"' . $message[5] . '" IS shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Delay to ensure that the date entered is now in the past so that the node
- // will be processed during cron, and assert that event 6 is triggered.
- sleep(5);
- $this->cronRun();
- $this->drupalGet('admin/reports/dblog');
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertText($message[6], '"' . $message[6] . '" IS shown');
-
- // Create a new node with both publish-on and unpublish-on dates, and check
- // that events 1 and event 4 are both triggered.
- $edit = [
- 'title[0][value]' => 'Create node with both dates',
- 'publish_on[0][value][date]' => date('Y-m-d', time() + 3),
- 'publish_on[0][value][time]' => date('H:i:s', time() + 3),
- 'unpublish_on[0][value][date]' => date('Y-m-d', time() + 4),
- 'unpublish_on[0][value][time]' => date('H:i:s', time() + 4),
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
- $this->assertText($message[1], '"' . $message[1] . '" IS shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertText($message[4], '"' . $message[4] . '" IS shown');
- $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Edit this node and check that events 2 and 5 are triggered.
- $edit = [
- 'title[0][value]' => 'Edit node with both dates',
- 'body[0][value]' => $this->randomString(30),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertText($message[2], '"' . $message[2] . '" IS shown');
- $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertText($message[5], '"' . $message[5] . '" IS shown');
- $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
- // Delay to ensure that the dates are now in the past so that the node will
- // be processed during cron, and assert that events 3, 5 & 6 are triggered.
- sleep(6);
- $this->cronRun();
- $this->drupalGet('admin/reports/dblog');
- $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
- $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
- $this->assertText($message[3], '"' . $message[3] . '" IS shown');
- $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
- $this->assertText($message[5], '"' . $message[5] . '" IS shown');
- $this->assertText($message[6], '"' . $message[6] . '" IS shown');
-
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerScheduledContentListAccessTest.php b/modules/scheduler/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
deleted file mode 100644
index bcac9f3..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
+++ /dev/null
@@ -1,142 +0,0 @@
-type . ' content',
- 'view own unpublished content',
- ];
-
- $this->editorUser = $this->drupalCreateUser(array_merge($base_permissions, ['access content overview']));
- $this->schedulerUser = $this->drupalCreateUser(array_merge($base_permissions, ['schedule publishing of nodes']));
- $this->schedulerManager = $this->drupalCreateUser(array_merge($base_permissions, ['view scheduled content']));
-
- // Create nodes scheduled for publishing and for unpublishing.
- $this->node1 = $this->drupalCreateNode([
- 'title' => 'Node created by Scheduler User for publishing',
- 'uid' => $this->schedulerUser->id(),
- 'status' => FALSE,
- 'type' => $this->type,
- 'publish_on' => strtotime('+1 week'),
- ]);
- $this->node2 = $this->drupalCreateNode([
- 'title' => 'Node created by Scheduler User for unpublishing',
- 'uid' => $this->schedulerUser->id(),
- 'status' => TRUE,
- 'type' => $this->type,
- 'unpublish_on' => strtotime('+1 week'),
- ]);
- $this->node3 = $this->drupalCreateNode([
- 'title' => 'Node created by Scheduler Manager for publishing',
- 'uid' => $this->schedulerManager->id(),
- 'status' => FALSE,
- 'type' => $this->type,
- 'publish_on' => strtotime('+1 week'),
- ]);
- $this->node4 = $this->drupalCreateNode([
- 'title' => 'Node created by Scheduler Manager for unpublishing',
- 'uid' => $this->schedulerManager->id(),
- 'status' => TRUE,
- 'type' => $this->type,
- 'unpublish_on' => strtotime('+1 week'),
- ]);
- }
-
- /**
- * Tests the scheduled content tab on the user page.
- */
- public function testViewScheduledContentUser() {
- // Access a scheduled content user tab as an anonymous visitor.
- $this->drupalGet("user/{$this->schedulerUser->id()}/scheduled");
- $this->assertResponse(403, 'An anonymous visitor cannot access a user\'s scheduled content tab.');
-
- // Access a users own scheduled content tab as "Editor" without any
- // scheduler permissions.
- $this->drupalLogin($this->editorUser);
- $this->drupalGet("user/{$this->editorUser->id()}/scheduled");
- $this->assertResponse(403, '"Editor" cannot access a scheduled content user tab.');
-
- // Access a users own scheduled content tab as "Scheduler User" with only
- // 'schedule publishing of nodes' permission.
- $this->drupalLogin($this->schedulerUser);
- $this->drupalGet("user/{$this->schedulerUser->id()}/scheduled");
- $this->assertResponse(200, '"Scheduler User" can access their scheduled content user tab.');
- $this->assertText('Node created by Scheduler User for publishing');
- $this->assertText('Node created by Scheduler User for unpublishing');
- $this->assertNoText('Node created by Scheduler Manager for unpublishing');
-
- // Access another users scheduled content tab as "Scheduler User".
- $this->drupalGet("user/{$this->schedulerManager->id()}/scheduled");
- $this->assertResponse(403, '"Scheduler User" cannot access the scheduled content user tab for "Scheduler Manager"');
-
- // Access the users own scheduled content tab as "Scheduler Manager" with
- // only 'view scheduled content' permission.
- $this->drupalLogin($this->schedulerManager);
- $this->drupalGet("user/{$this->schedulerManager->id()}/scheduled");
- $this->assertResponse(200, 'Scheduler Manager can access their own scheduled content user tab.');
- $this->assertText('Node created by Scheduler Manager for publishing');
- $this->assertText('Node created by Scheduler Manager for unpublishing');
- $this->assertNoText('Node created by Scheduler User for unpublishing');
-
- // Access another users scheduled content tab as "Scheduler Manager".
- // The published and unpublished content should be listed.
- $this->drupalGet("user/{$this->schedulerUser->id()}/scheduled");
- $this->assertResponse(200, '"Scheduler Manager" can access the scheduled content user tab for "Scheduler User"');
- $this->assertText('Node created by Scheduler User for publishing');
- $this->assertText('Node created by Scheduler User for unpublishing');
- }
-
- /**
- * Tests the scheduled content overview.
- */
- public function testViewScheduledContentOverview() {
- // Access the scheduled content overview as anonymous visitor.
- $this->drupalGet('admin/content/scheduled');
- $this->assertResponse(403, 'An anonymous visitor cannot access the scheduled content overview.');
-
- // Access the scheduled content overview as "Editor" without any
- // scheduler permissions.
- $this->drupalLogin($this->editorUser);
- $this->drupalGet('admin/content/scheduled');
- $this->assertResponse(403, '"Editor" cannot access the scheduled content overview.');
-
- // Access the scheduled content overview as "Scheduler User" with only
- // 'schedule publishing of nodes' permission.
- $this->drupalLogin($this->schedulerUser);
- $this->drupalGet('admin/content/scheduled');
- $this->assertResponse(403, '"Scheduler User" cannot access the scheduled content overview.');
-
- // Access the scheduled content overview as "Scheduler Manager" with only
- // 'view scheduled content' permission. They should be able to see the
- // scheduled published and unpublished content by all users.
- $this->drupalLogin($this->schedulerManager);
- $this->drupalGet('admin/content/scheduled');
- $this->assertResponse(200, 'Scheduler Manager can access the scheduled content overview.');
- $this->assertText('Node created by Scheduler User for publishing');
- $this->assertText('Node created by Scheduler User for unpublishing');
- $this->assertText('Node created by Scheduler Manager for publishing');
- $this->assertText('Node created by Scheduler Manager for unpublishing');
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerStatusReportTest.php b/modules/scheduler/tests/src/Functional/SchedulerStatusReportTest.php
deleted file mode 100644
index b58c1f1..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerStatusReportTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-drupalLogin($this->adminUser);
- $this->drupalGet('admin/reports/status');
-
- $this->assertText('Scheduler Time Check');
- $this->assertText('In most cases the server time should match Coordinated Universal Time (UTC) / Greenwich Mean Time (GMT)');
-
- $admin_regional_settings = \Drupal::url('system.regional_settings');
- $this->assertLink('changed by admin users');
- $this->assertLinkByHref($admin_regional_settings);
-
- $account_edit = \Drupal::url('entity.user.edit_form', ['user' => $this->adminUser->id()]);
- $this->assertLink('user account');
- $this->assertLinkByHref($account_edit);
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerTokenReplaceTest.php b/modules/scheduler/tests/src/Functional/SchedulerTokenReplaceTest.php
deleted file mode 100644
index ceb4487..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerTokenReplaceTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-drupalLogin($this->schedulerUser);
- $date_formatter = \Drupal::service('date.formatter');
-
- // Define timestamps for consistent use when repeated throughout this test.
- $publish_on_timestamp = REQUEST_TIME + 3600;
- $unpublish_on_timestamp = REQUEST_TIME + 7200;
-
- // Create an unpublished page with scheduled dates.
- $node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- 'publish_on' => $publish_on_timestamp,
- 'unpublish_on' => $unpublish_on_timestamp,
- ]);
- // Show that the node is scheduled.
- $this->drupalGet('admin/content/scheduled');
-
- // Create array of test case data.
- // @TODO Convert this test to use @dataProvider instead of array and loop?
- $test_cases = [
- ['token_format' => '', 'date_format' => 'medium', 'custom' => ''],
- ['token_format' => ':long', 'date_format' => 'long', 'custom' => ''],
- ['token_format' => ':raw', 'date_format' => 'custom', 'custom' => 'U'],
- [
- 'token_format' => ':custom:jS F g:ia e O',
- 'date_format' => 'custom',
- 'custom' => 'jS F g:ia e O',
- ],
- ];
-
- foreach ($test_cases as $test_data) {
- // Edit the node and set the body tokens to use the format being tested.
- $edit = [
- 'body[0][value]' => 'Publish on: [node:scheduler-publish' . $test_data['token_format'] . ']. Unpublish on: [node:scheduler-unpublish' . $test_data['token_format'] . '].',
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->drupalGet('node/' . $node->id());
-
- // Refresh the node and get the body output value.
- $this->nodeStorage->resetCache([$node->id()]);
- $node = $this->nodeStorage->load($node->id());
- $body_output = \Drupal::token()->replace($node->body->value, ['node' => $node]);
-
- // Create the expected text for the body.
- $publish_on_date = $date_formatter->format($publish_on_timestamp, $test_data['date_format'], $test_data['custom']);
- $unpublish_on_date = $date_formatter->format($unpublish_on_timestamp, $test_data['date_format'], $test_data['custom']);
- $expected_output = 'Publish on: ' . $publish_on_date . '. Unpublish on: ' . $unpublish_on_date . '.';
- // Check that the actual text matches the expected value.
- $this->assertEqual($body_output, $expected_output, 'Scheduler tokens replaced correctly for ' . $test_data['token_format'] . ' format.');
- }
- }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerValidationTest.php b/modules/scheduler/tests/src/Functional/SchedulerValidationTest.php
deleted file mode 100644
index 346ac01..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerValidationTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-drupalLogin($this->adminUser);
-
- // Set unpublishing to be required.
- $this->nodetype->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)->save();
-
- // Create an unpublished page node, then edit the node and check that if a
- // publish-on date is entered then an unpublish-on date is also needed.
- $node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- ]);
- $edit = [
- 'publish_on[0][value][date]' => date('Y-m-d', strtotime('+1 day', REQUEST_TIME)),
- 'publish_on[0][value][time]' => date('H:i:s', strtotime('+1 day', REQUEST_TIME)),
- ];
- $this->drupalGet('node/' . $node->id() . '/edit');
-
- // At core 8.4 an enhancement will be committed to change the 'save and ...'
- // button into a 'save' with a corresponding status checkbox. This test has
- // to pass at 8.3 but the core change will not be backported. Hence derive
- // the button text and whether we need a 'status'field.
- // @see https://www.drupal.org/node/2873108
- $checkbox = $this->xpath('//input[@type="checkbox" and @id="edit-status-value"]');
-
- $this->submitForm($edit, $checkbox ? 'Save' : 'Save and keep unpublished');
- $this->assertRaw(t("If you set a 'publish on' date then you must also set an 'unpublish on' date."), 'Validation prevents entering a publish-on date with no unpublish-on date if unpublishing is required.');
- $this->assertNoRaw(t('@type %title has been updated.', ['@type' => $this->typeName, '%title' => SafeMarkup::checkPlain($node->title->value)]), 'The node has not been saved.');
-
- // Create an unpublished page node, then edit the node and check that if the
- // status is changed to published, then an unpublish-on date is also needed.
- $node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- ]);
- if ($checkbox) {
- $edit = ['status[value]' => TRUE];
- }
- else {
- $edit = [];
- }
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, $checkbox ? 'Save' : 'Save and publish');
- $this->assertRaw(t("Either you must set an 'unpublish on' date or save this node as unpublished."), 'Validation prevents publishing the node directly without an unpublish-on date if unpublishing is required.');
- $this->assertNoRaw(t('@type %title has been updated.', ['@type' => $this->typeName, '%title' => SafeMarkup::checkPlain($node->title->value)]), 'The node has not been saved.');
-
- // Create an unpublished node, edit the node and check that if both dates
- // are entered then the unpublish date is later than the publish date.
- $node = $this->drupalCreateNode([
- 'type' => $this->type,
- 'status' => FALSE,
- ]);
- $edit = [
- 'publish_on[0][value][date]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 8100, 'custom', 'Y-m-d'),
- 'publish_on[0][value][time]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 8100, 'custom', 'H:i:s'),
- 'unpublish_on[0][value][date]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 1800, 'custom', 'Y-m-d'),
- 'unpublish_on[0][value][time]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 1800, 'custom', 'H:i:s'),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, $checkbox ? 'Save' : 'Save and keep unpublished');
- $this->assertRaw(t("The 'unpublish on' date must be later than the 'publish on' date."), 'Validation prevents entering an unpublish-on date which is earlier than the publish-on date.');
- $this->assertNoRaw(t('@type %title has been updated.', ['@type' => $this->typeName, '%title' => SafeMarkup::checkPlain($node->title->value)]), 'The node has not been saved.');
- }
-
-}
diff --git a/modules/token/.travis.yml b/modules/token/.travis.yml
deleted file mode 100644
index fbf5036..0000000
--- a/modules/token/.travis.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-language: php
-cache:
- bundler: true
- directories:
- - $HOME/tmp/drush
- - $HOME/.bundle
- apt: true
-
-php:
- - 5.4
- - 5.5
-
-env:
- - PATH=$PATH:/home/travis/.composer/vendor/bin
-
-# This will create the database
-mysql:
- database: drupal
- username: root
- encoding: utf8
-
-# To be able to run a webbrowser
-# If we need anything more powerful
-# than e.g. phantomjs
-before_install:
- - "export DISPLAY=:99.0"
- - "sh -e /etc/init.d/xvfb start"
-
-install:
- # Grab Drush
- - composer global require drush/drush:dev-master --prefer-source
- - cd /home/travis/.composer/vendor/drush/drush && cd -
- # Make sure we don't fail when checking out projects
- - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
- # LAMP package installation (mysql is already started)
- - sudo apt-get update
- - sudo apt-get install apache2 libapache2-mod-fastcgi
- # enable php-fpm, travis does not support any other method with php and apache
- - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
- - sudo a2enmod rewrite actions fastcgi alias
- - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
- # Make sure the apache root is in our wanted directory
- - echo "$(curl -fsSL https://gist.githubusercontent.com/nickveenhof/11386315/raw/b8abaf9304fe12b5cc7752d39c29c1edae8ac2e6/gistfile1.txt)" | sed -e "s,PATH,$TRAVIS_BUILD_DIR/../drupal,g" | sudo tee /etc/apache2/sites-available/default > /dev/null
- # Set sendmail so drush doesn't throw an error during site install.
- - echo "sendmail_path='true'" >> `php --ini | grep "Loaded Configuration" | awk '{print $4}'`
- # Forward the errors to the syslog so we can print them
- - echo "error_log=syslog" >> `php --ini | grep "Loaded Configuration" | awk '{print $4}'`
- # Get latest drupal 8 core
- - cd $TRAVIS_BUILD_DIR/..
- - git clone --depth 1 --branch 8.0.x http://git.drupal.org/project/drupal.git
- # Restart apache and test it
- - sudo service apache2 restart
- - curl -v "http://localhost"
- # Re-enable when trying to get CodeSniffer doesn't return a 403 anymore.
- #- composer global require drupal/coder:\>7
-
-before_script:
- - cd $TRAVIS_BUILD_DIR/../drupal
- # Update drupal core
- - git pull origin 8.0.x
- # Install the site
- - drush -v site-install minimal --db-url=mysql://root:@localhost/drupal --yes
- - drush en --yes simpletest
- - drush cr
- - phpenv rehash
-
-script:
- # go to our Drupal module directory
- - mkdir $TRAVIS_BUILD_DIR/../drupal/modules/token
- - cp -R $TRAVIS_BUILD_DIR/* $TRAVIS_BUILD_DIR/../drupal/modules/token/
- # go to our Drupal main directory
- - cd $TRAVIS_BUILD_DIR/../drupal
- - ls -la $TRAVIS_BUILD_DIR/../drupal/sites/default
- # Run the tests
- - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --php `which php` --url http://localhost "token" | tee /tmp/test.txt; TEST_EXIT=${PIPESTATUS[0]}
- - echo $TEST_EXIT
- # Check if we had fails in the run-tests.sh script
- # Exit with the inverted value, because if there are no fails found, it will exit with 1 and for us that\
- # is a good thing so invert it to 0. Travis has some issues with the exclamation mark in front so we have to fiddle a
- # bit.
- # Also make the grep case insensitive and fail on run-tests.sh regular fails as well on fatal errors.
- - TEST_OUTPUT=$(! egrep -i "([0-9]+ fails)|(PHP Fatal error)|([0-9]+ exceptions)" /tmp/test.txt > /dev/null)$?
- - echo $TEST_OUTPUT
- - cd $TRAVIS_BUILD_DIR/../drupal/core
- - ./vendor/bin/phpunit --verbose --debug ../modules/token/; TEST_PHPUNIT=$?
- - echo $TEST_PHPUNIT
- # if the TEST_EXIT status is 0 AND the TEST_OUTPUT status is also 0 it means we succeeded, in all other cases we
- # failed.
- # Re-enable when trying to get CodeSniffer doesn't return a 403 anymore.
- #- /home/travis/.composer/vendor/bin/phpcs --standard=/home/travis/.composer/vendor/drupal/coder/coder_sniffer/Drupal --extensions=php,inc,test,module,install --ignore=css/ $TRAVIS_BUILD_DIR/../drupal/modules/search_api
- - php -i | grep 'php.ini'
- - sudo cat /var/log/apache2/error.log
- - sudo cat /var/log/syslog | grep 'php' | cat # Suppress grep exit status 1
- # Exit the build
- - if [ $TEST_EXIT -eq 0 ] && [ $TEST_OUTPUT -eq 0 ] && [ $TEST_PHPUNIT -eq 0 ]; then exit 0; else exit 1; fi
diff --git a/modules/token/LICENSE.txt b/modules/token/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/token/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/token/README.md b/modules/token/README.md
deleted file mode 100644
index c37d335..0000000
--- a/modules/token/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-INTRODUCTION
-------------
-
- Provides common and resuable token UI elements and missing core tokens.
-
- * For a full description of the module, visit the project page:
- https://drupal.org/project/token
-
- * To submit bug reports and feature suggestions, or to track changes:
- https://drupal.org/project/issues/token
-
-
-INSTALLATION
-------------
-
-Install as usual, see
- https://www.drupal.org/docs/8/extending-drupal-8/installing-contributed-modules-find-import-enable-configure-drupal-8 for further
-information.
-
-
-TROUBLESHOOTING
----------------
-
-Token module doesn't provide any visible functions to the user on its own, it
-just provides token handling services for other modules.
-
-
-MAINTAINERS
------------
-
-Current maintainers:
-
- * Dave Reid (https://drupal.org/user/53892)
diff --git a/modules/token/css/jquery.treetable.css b/modules/token/css/jquery.treetable.css
deleted file mode 100644
index 4e95bfd..0000000
--- a/modules/token/css/jquery.treetable.css
+++ /dev/null
@@ -1,28 +0,0 @@
-table.treetable span.indenter {
- display: inline-block;
- margin: 0;
- padding: 0;
- text-align: right;
-
- /* Disable text selection of nodes (for better D&D UX) */
- user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -o-user-select: none;
- -webkit-user-select: none;
-
- /* Force content-box box model for indenter (Bootstrap compatibility) */
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-
- width: 19px;
-}
-
-table.treetable span.indenter a {
- background-position: left center;
- background-repeat: no-repeat;
- display: inline-block;
- text-decoration: none;
- width: 19px;
-}
diff --git a/modules/token/css/token.css b/modules/token/css/token.css
deleted file mode 100644
index ca201b8..0000000
--- a/modules/token/css/token.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.token-tree-dialog {
- border: 1px solid #6b6b6b;
- border-radius: 5px 5px 0 0;
- box-shadow: 0 0 10px #6b6b6b;
-}
-
-.token-tree {
- font-size: 0.85em;
- margin-left: 19px;
-}
-
-.ui-dialog-content .token-tree {
- margin-left: 0;
-}
-
-.token-tree td, .token-tree th {
- padding-top: 0;
- padding-bottom: 0;
-}
-
-.token-group {
- font-weight: bold;
-}
-
-.js .token-group {
- font-weight: normal;
-}
-
-/* Prevent the token columns from being wrapped. */
-.token-tree td.token-key {
- white-space: nowrap;
-}
diff --git a/modules/token/css/token.treetable.theme.css b/modules/token/css/token.treetable.theme.css
deleted file mode 100644
index a93c557..0000000
--- a/modules/token/css/token.treetable.theme.css
+++ /dev/null
@@ -1,50 +0,0 @@
-table.treetable {
-}
-
-table.treetable caption {
-}
-
-table.treetable thead {
-}
-
-table.treetable thead tr th {
-}
-
-table.treetable tbody tr td {
- cursor: default;
-}
-
-table.treetable span {
- background-position: center left;
- background-repeat: no-repeat;
- padding: .2em 0 .2em 1.5em;
-}
-
-table.treetable tr.collapsed span.indenter a {
- background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAHlJREFUeNrcU1sNgDAQ6wgmcAM2MICGGlg1gJnNzWQcvwQGy1j4oUl/7tH0mpwzM7SgQyO+EZAUWh2MkkzSWhJwuRAlHYsJwEwyvs1gABDuzqoJcTw5qxaIJN0bgQRgIjnlmn1heSO5PE6Y2YXe+5Cr5+h++gs12AcAS6FS+7YOsj4AAAAASUVORK5CYII=);
-}
-
-table.treetable tr.expanded span.indenter a {
- background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAHFJREFUeNpi/P//PwMlgImBQsA44C6gvhfa29v3MzAwOODRc6CystIRbxi0t7fjDJjKykpGYrwwi1hxnLHQ3t7+jIGBQRJJ6HllZaUUKYEYRYBPOB0gBShKwKGA////48VtbW3/8clTnBIH3gCKkzJgAGvBX0dDm0sCAAAAAElFTkSuQmCC);
-}
-
-table.treetable tr.branch {
- background-color: #f9f9f9;
-}
-
-table.treetable tr.selected {
- background-color: #3875d7;
- color: #fff;
-}
-
-table.treetable tr span.indenter {
- margin-left: -19px;
-}
-table.treetable tr span.indenter a {
- outline: none; /* Expander shows outline after upgrading to 3.0 (#141) */
-}
-
-table.treetable tr.accept {
- background-color: #a3bce4;
- color: #fff
-}
diff --git a/modules/token/js/jquery.treetable.js b/modules/token/js/jquery.treetable.js
deleted file mode 100644
index ac9d90a..0000000
--- a/modules/token/js/jquery.treetable.js
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
- * jQuery treetable Plugin 3.2.0
- * http://ludo.cubicphuse.nl/jquery-treetable
- *
- * Copyright 2013, Ludo van den Boom
- * Dual licensed under the MIT or GPL Version 2 licenses.
- */
-(function($) {
- var Node, Tree, methods;
-
- Node = (function() {
- function Node(row, tree, settings) {
- var parentId;
-
- this.row = row;
- this.tree = tree;
- this.settings = settings;
-
- // TODO Ensure id/parentId is always a string (not int)
- this.id = this.row.data(this.settings.nodeIdAttr);
-
- // TODO Move this to a setParentId function?
- parentId = this.row.data(this.settings.parentIdAttr);
- if (parentId != null && parentId !== "") {
- this.parentId = parentId;
- }
-
- this.treeCell = $(this.row.children(this.settings.columnElType)[this.settings.column]);
- this.expander = $(this.settings.expanderTemplate);
- this.indenter = $(this.settings.indenterTemplate);
- this.children = [];
- this.initialized = false;
- this.treeCell.prepend(this.indenter);
- }
-
- Node.prototype.addChild = function(child) {
- return this.children.push(child);
- };
-
- Node.prototype.ancestors = function() {
- var ancestors, node;
- node = this;
- ancestors = [];
- while (node = node.parentNode()) {
- ancestors.push(node);
- }
- return ancestors;
- };
-
- Node.prototype.collapse = function() {
- if (this.collapsed()) {
- return this;
- }
-
- this.row.removeClass("expanded").addClass("collapsed");
-
- this._hideChildren();
- this.expander.attr("title", this.settings.stringExpand);
-
- if (this.initialized && this.settings.onNodeCollapse != null) {
- this.settings.onNodeCollapse.apply(this);
- }
-
- return this;
- };
-
- Node.prototype.collapsed = function() {
- return this.row.hasClass("collapsed");
- };
-
- // TODO destroy: remove event handlers, expander, indenter, etc.
-
- Node.prototype.expand = function() {
- if (this.expanded()) {
- return this;
- }
-
- this.row.removeClass("collapsed").addClass("expanded");
-
- if (this.initialized && this.settings.onNodeExpand != null) {
- this.settings.onNodeExpand.apply(this);
- }
-
- if ($(this.row).is(":visible")) {
- this._showChildren();
- }
-
- this.expander.attr("title", this.settings.stringCollapse);
-
- return this;
- };
-
- Node.prototype.expanded = function() {
- return this.row.hasClass("expanded");
- };
-
- Node.prototype.hide = function() {
- this._hideChildren();
- this.row.hide();
- return this;
- };
-
- Node.prototype.isBranchNode = function() {
- if(this.children.length > 0 || this.row.data(this.settings.branchAttr) === true) {
- return true;
- } else {
- return false;
- }
- };
-
- Node.prototype.updateBranchLeafClass = function(){
- this.row.removeClass('branch');
- this.row.removeClass('leaf');
- this.row.addClass(this.isBranchNode() ? 'branch' : 'leaf');
- };
-
- Node.prototype.level = function() {
- return this.ancestors().length;
- };
-
- Node.prototype.parentNode = function() {
- if (this.parentId != null) {
- return this.tree[this.parentId];
- } else {
- return null;
- }
- };
-
- Node.prototype.removeChild = function(child) {
- var i = $.inArray(child, this.children);
- return this.children.splice(i, 1)
- };
-
- Node.prototype.render = function() {
- var handler,
- settings = this.settings,
- target;
-
- if (settings.expandable === true && this.isBranchNode()) {
- handler = function(e) {
- $(this).parents("table").treetable("node", $(this).parents("tr").data(settings.nodeIdAttr)).toggle();
- return e.preventDefault();
- };
-
- this.indenter.html(this.expander);
- target = settings.clickableNodeNames === true ? this.treeCell : this.expander;
-
- target.off("click.treetable").on("click.treetable", handler);
- target.off("keydown.treetable").on("keydown.treetable", function(e) {
- if (e.keyCode == 13) {
- handler.apply(this, [e]);
- }
- });
- }
-
- this.indenter[0].style.paddingLeft = "" + (this.level() * settings.indent) + "px";
-
- return this;
- };
-
- Node.prototype.reveal = function() {
- if (this.parentId != null) {
- this.parentNode().reveal();
- }
- return this.expand();
- };
-
- Node.prototype.setParent = function(node) {
- if (this.parentId != null) {
- this.tree[this.parentId].removeChild(this);
- }
- this.parentId = node.id;
- this.row.data(this.settings.parentIdAttr, node.id);
- return node.addChild(this);
- };
-
- Node.prototype.show = function() {
- if (!this.initialized) {
- this._initialize();
- }
- this.row.show();
- if (this.expanded()) {
- this._showChildren();
- }
- return this;
- };
-
- Node.prototype.toggle = function() {
- if (this.expanded()) {
- this.collapse();
- } else {
- this.expand();
- }
- return this;
- };
-
- Node.prototype._hideChildren = function() {
- var child, _i, _len, _ref, _results;
- _ref = this.children;
- _results = [];
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- child = _ref[_i];
- _results.push(child.hide());
- }
- return _results;
- };
-
- Node.prototype._initialize = function() {
- var settings = this.settings;
-
- this.render();
-
- if (settings.expandable === true && settings.initialState === "collapsed") {
- this.collapse();
- } else {
- this.expand();
- }
-
- if (settings.onNodeInitialized != null) {
- settings.onNodeInitialized.apply(this);
- }
-
- return this.initialized = true;
- };
-
- Node.prototype._showChildren = function() {
- var child, _i, _len, _ref, _results;
- _ref = this.children;
- _results = [];
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- child = _ref[_i];
- _results.push(child.show());
- }
- return _results;
- };
-
- return Node;
- })();
-
- Tree = (function() {
- function Tree(table, settings) {
- this.table = table;
- this.settings = settings;
- this.tree = {};
-
- // Cache the nodes and roots in simple arrays for quick access/iteration
- this.nodes = [];
- this.roots = [];
- }
-
- Tree.prototype.collapseAll = function() {
- var node, _i, _len, _ref, _results;
- _ref = this.nodes;
- _results = [];
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- node = _ref[_i];
- _results.push(node.collapse());
- }
- return _results;
- };
-
- Tree.prototype.expandAll = function() {
- var node, _i, _len, _ref, _results;
- _ref = this.nodes;
- _results = [];
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- node = _ref[_i];
- _results.push(node.expand());
- }
- return _results;
- };
-
- Tree.prototype.findLastNode = function (node) {
- if (node.children.length > 0) {
- return this.findLastNode(node.children[node.children.length - 1]);
- } else {
- return node;
- }
- };
-
- Tree.prototype.loadRows = function(rows) {
- var node, row, i;
-
- if (rows != null) {
- for (i = 0; i < rows.length; i++) {
- row = $(rows[i]);
-
- if (row.data(this.settings.nodeIdAttr) != null) {
- node = new Node(row, this.tree, this.settings);
- this.nodes.push(node);
- this.tree[node.id] = node;
-
- if (node.parentId != null && this.tree[node.parentId]) {
- this.tree[node.parentId].addChild(node);
- } else {
- this.roots.push(node);
- }
- }
- }
- }
-
- for (i = 0; i < this.nodes.length; i++) {
- node = this.nodes[i].updateBranchLeafClass();
- }
-
- return this;
- };
-
- Tree.prototype.move = function(node, destination) {
- // Conditions:
- // 1: +node+ should not be inserted as a child of +node+ itself.
- // 2: +destination+ should not be the same as +node+'s current parent (this
- // prevents +node+ from being moved to the same location where it already
- // is).
- // 3: +node+ should not be inserted in a location in a branch if this would
- // result in +node+ being an ancestor of itself.
- var nodeParent = node.parentNode();
- if (node !== destination && destination.id !== node.parentId && $.inArray(node, destination.ancestors()) === -1) {
- node.setParent(destination);
- this._moveRows(node, destination);
-
- // Re-render parentNode if this is its first child node, and therefore
- // doesn't have the expander yet.
- if (node.parentNode().children.length === 1) {
- node.parentNode().render();
- }
- }
-
- if(nodeParent){
- nodeParent.updateBranchLeafClass();
- }
- if(node.parentNode()){
- node.parentNode().updateBranchLeafClass();
- }
- node.updateBranchLeafClass();
- return this;
- };
-
- Tree.prototype.removeNode = function(node) {
- // Recursively remove all descendants of +node+
- this.unloadBranch(node);
-
- // Remove node from DOM ()
- node.row.remove();
-
- // Remove node from parent children list
- if (node.parentId != null) {
- node.parentNode().removeChild(node);
- }
-
- // Clean up Tree object (so Node objects are GC-ed)
- delete this.tree[node.id];
- this.nodes.splice($.inArray(node, this.nodes), 1);
-
- return this;
- }
-
- Tree.prototype.render = function() {
- var root, _i, _len, _ref;
- _ref = this.roots;
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- root = _ref[_i];
-
- // Naming is confusing (show/render). I do not call render on node from
- // here.
- root.show();
- }
- return this;
- };
-
- Tree.prototype.sortBranch = function(node, sortFun) {
- // First sort internal array of children
- node.children.sort(sortFun);
-
- // Next render rows in correct order on page
- this._sortChildRows(node);
-
- return this;
- };
-
- Tree.prototype.unloadBranch = function(node) {
- // Use a copy of the children array to not have other functions interfere
- // with this function if they manipulate the children array
- // (eg removeNode).
- var children = node.children.slice(0),
- i;
-
- for (i = 0; i < children.length; i++) {
- this.removeNode(children[i]);
- }
-
- // Reset node's collection of children
- node.children = [];
-
- node.updateBranchLeafClass();
-
- return this;
- };
-
- Tree.prototype._moveRows = function(node, destination) {
- var children = node.children, i;
-
- node.row.insertAfter(destination.row);
- node.render();
-
- // Loop backwards through children to have them end up on UI in correct
- // order (see #112)
- for (i = children.length - 1; i >= 0; i--) {
- this._moveRows(children[i], node);
- }
- };
-
- // Special _moveRows case, move children to itself to force sorting
- Tree.prototype._sortChildRows = function(parentNode) {
- return this._moveRows(parentNode, parentNode);
- };
-
- return Tree;
- })();
-
- // jQuery Plugin
- methods = {
- init: function(options, force) {
- var settings;
-
- settings = $.extend({
- branchAttr: "ttBranch",
- clickableNodeNames: false,
- column: 0,
- columnElType: "td", // i.e. 'td', 'th' or 'td,th'
- expandable: false,
- expanderTemplate: " ",
- indent: 19,
- indenterTemplate: "' + $(this).html() + ' ').click(function () {
- if (typeof drupalSettings.tokenFocusedField == 'undefined') {
- alert(Drupal.t('First click a text field to insert your tokens into.'));
- }
- else {
- var myField = drupalSettings.tokenFocusedField;
- var myValue = $(this).text();
-
- // IE support.
- if (document.selection) {
- myField.focus();
- var sel = document.selection.createRange();
- sel.text = myValue;
- }
-
- // MOZILLA/NETSCAPE support.
- else if (myField.selectionStart || myField.selectionStart === '0') {
- var startPos = myField.selectionStart;
- var endPos = myField.selectionEnd;
- myField.value = myField.value.substring(0, startPos)
- + myValue
- + myField.value.substring(endPos, myField.value.length);
- }
- else {
- myField.value += myValue;
- }
-
- $('html,body').animate({scrollTop: $(myField).offset().top}, 500);
- }
- return false;
- });
- $(this).html(newThis);
- });
- }
- };
-
-})(jQuery, drupalSettings);
diff --git a/modules/token/src/Controller/TokenAutocompleteController.php b/modules/token/src/Controller/TokenAutocompleteController.php
deleted file mode 100644
index a50da70..0000000
--- a/modules/token/src/Controller/TokenAutocompleteController.php
+++ /dev/null
@@ -1,78 +0,0 @@
-treeBuilder = $tree_builder;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('token.tree_builder')
- );
- }
-
- /**
- * Retrieves suggestions for block category autocompletion.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * The current request.
- * @param string $token_type
- * The token type.
- * @param string $filter
- * The autocomplete filter.
- *
- * @return \Symfony\Component\HttpFoundation\JsonResponse
- * A JSON response containing autocomplete suggestions.
- */
- public function autocomplete($token_type, $filter, Request $request) {
- $filter = substr($filter, strrpos($filter, '['));
-
- $matches = array();
-
- if (!Unicode::strlen($filter)) {
- $matches["[{$token_type}:"] = 0;
- }
- else {
- $depth = max(1, substr_count($filter, ':'));
- $tree = $this->treeBuilder->buildTree($token_type, ['flat' => TRUE, 'depth' => $depth]);
- foreach (array_keys($tree) as $token) {
- if (strpos($token, $filter) === 0) {
- $matches[$token] = levenshtein($token, $filter);
- if (isset($tree[$token]['children'])) {
- $token = rtrim($token, ':]') . ':';
- $matches[$token] = levenshtein($token, $filter);
- }
- }
- }
- }
-
- asort($matches);
-
- $keys = array_keys($matches);
- $matches = array_combine($keys, $keys);
-
- return new JsonResponse($matches);
- }
-
-}
diff --git a/modules/token/src/Controller/TokenCacheController.php b/modules/token/src/Controller/TokenCacheController.php
deleted file mode 100644
index 39dc5b0..0000000
--- a/modules/token/src/Controller/TokenCacheController.php
+++ /dev/null
@@ -1,21 +0,0 @@
-redirect('');
- }
-
-}
diff --git a/modules/token/src/Controller/TokenDevelController.php b/modules/token/src/Controller/TokenDevelController.php
deleted file mode 100644
index 332bad2..0000000
--- a/modules/token/src/Controller/TokenDevelController.php
+++ /dev/null
@@ -1,109 +0,0 @@
-treeBuilder = $tree_builder;
- $this->entityMapper = $entity_mapper;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('token.tree_builder'),
- $container->get('token.entity_mapper')
- );
- }
-
- /**
- * Prints the loaded structure of the current entity.
- *
- * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
- * A RouteMatch object.
- *
- * @return array
- * Array of page elements to render.
- */
- public function entityTokens(RouteMatchInterface $route_match) {
- $output = [];
-
- $parameter_name = $route_match->getRouteObject()->getOption('_token_entity_type_id');
- $entity = $route_match->getParameter($parameter_name);
-
- if ($entity && $entity instanceof EntityInterface) {
- $output = $this->renderTokenTree($entity);
- }
-
- return $output;
- }
-
- /**
- * Render the token tree for the specified entity.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * The entity for which the token tree should be rendered.
- *
- * @return array
- * Render array of the token tree for the $entity.
- *
- * @see static::entityLoad
- */
- protected function renderTokenTree(EntityInterface $entity) {
- $this->moduleHandler()->loadInclude('token', 'pages.inc');
- $entity_type = $entity->getEntityTypeId();
-
- $token_type = $this->entityMapper->getTokenTypeForEntityType($entity_type);
- $options = [
- 'flat' => TRUE,
- 'values' => TRUE,
- 'data' => [$token_type => $entity],
- ];
-
- $token_tree = [
- $token_type => [
- 'tokens' => $this->treeBuilder->buildTree($token_type, $options),
- ],
- ];
-// foreach ($tree as $token => $token_info) {
-// if (!isset($token_info['value']) && !empty($token_info['parent']) && !isset($tree[$token_info['parent']]['value'])) {
-// continue;
-// }
-// }
-
- $build['tokens'] = [
- '#type' => 'token_tree_table',
- '#show_restricted' => FALSE,
- '#show_nested' => FALSE,
- '#skip_empty_values' => TRUE,
- '#token_tree' => $token_tree,
- '#columns' => ['token', 'value'],
- '#empty' => $this->t('No tokens available.'),
- ];
-
- return $build;
- }
-}
diff --git a/modules/token/src/Controller/TokenTreeController.php b/modules/token/src/Controller/TokenTreeController.php
deleted file mode 100644
index f233ab2..0000000
--- a/modules/token/src/Controller/TokenTreeController.php
+++ /dev/null
@@ -1,56 +0,0 @@
-treeBuilder = $tree_builder;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('token.tree_builder')
- );
- }
-
- /**
- * Page callback to output a token tree as an empty page.
- */
- function outputTree(Request $request) {
- $options = $request->query->has('options') ? Json::decode($request->query->get('options')) : [];
-
- // The option token_types may only be an array OR 'all'. If it is not set,
- // we assume that only global token types are requested.
- $token_types = !empty($options['token_types']) ? $options['token_types'] : [];
- if ($token_types == 'all') {
- $build = $this->treeBuilder->buildAllRenderable($options);
- }
- else {
- $build = $this->treeBuilder->buildRenderable($token_types, $options);
- }
-
- $build['#cache']['contexts'][] = 'url.query_args:options';
- $build['#title'] = $this->t('Available tokens');
-
- return $build;
- }
-
-}
diff --git a/modules/token/src/Element/TokenTreeTable.php b/modules/token/src/Element/TokenTreeTable.php
deleted file mode 100644
index 6de9c95..0000000
--- a/modules/token/src/Element/TokenTreeTable.php
+++ /dev/null
@@ -1,155 +0,0 @@
- '-', '_' => '-', '/' => '-', '[' => '-', ']' => '', ':' => '--', '?' => '', '<' => '-', '>' => '-'];
-
- /**
- * {@inheritdoc}
- */
- public function getInfo() {
- $class = get_class($this);
- return [
- '#header' => [],
- '#rows' => [],
- '#token_tree' => [],
- '#columns' => ['name', 'token', 'description'],
- '#empty' => '',
- '#show_restricted' => FALSE,
- '#show_nested' => FALSE,
- '#skip_empty_values' => FALSE,
- '#click_insert' => TRUE,
- '#sticky' => FALSE,
- '#responsive' => TRUE,
- '#input' => FALSE,
- '#pre_render' => [
- [$class, 'preRenderTokenTree'],
- [$class, 'preRenderTable'],
- ],
- '#theme' => 'table__token_tree',
- '#attached' => [
- 'library' => [
- 'token/token',
- ],
- ],
- ];
- }
-
- /**
- * Pre-render the token tree to transform rows in the token tree.
- *
- * @param array $element
- *
- * @return array
- * The processed element.
- */
- public static function preRenderTokenTree($element) {
- $multiple_token_types = count($element['#token_tree']) > 1;
- foreach ($element['#token_tree'] as $token_type => $type_info) {
- // Do not show nested tokens.
- if (!empty($type_info['nested']) && empty($element['#show_nested'])) {
- continue;
- }
-
- if ($multiple_token_types) {
- $row = static::formatRow($token_type, $type_info, $element['#columns'], TRUE);
- $element['#rows'][] = $row;
- }
-
- foreach ($type_info['tokens'] as $token => $token_info) {
- if (!empty($token_info['restricted']) && empty($element['#show_restricted'])) {
- continue;
- }
- if ($element['#skip_empty_values'] && empty($token_info['value']) && !empty($token_info['parent']) && !isset($tree[$token_info['parent']]['value'])) {
- continue;
- }
- if ($multiple_token_types && !isset($token_info['parent'])) {
- $token_info['parent'] = $token_type;
- }
- $row = static::formatRow($token, $token_info, $element['#columns']);
- $element['#rows'][] = $row;
- }
- }
-
- if (!empty($element['#rows'])) {
- $element['#attached']['library'][] = 'token/jquery.treeTable';
- }
-
- // Fill headers if one is not specified.
- if (empty($element['#header'])) {
- $column_map = [
- 'name' => t('Name'),
- 'token' => t('Token'),
- 'value' => t('Value'),
- 'description' => t('Description'),
- ];
- foreach ($element['#columns'] as $col) {
- $element['#header'][] = $column_map[$col];
- }
- }
-
- $element['#attributes']['class'][] = 'token-tree';
-
- if ($element['#click_insert']) {
- $element['#caption'] = t('Click a token to insert it into the field you\'ve last clicked.');
- $element['#attributes']['class'][] = 'token-click-insert';
- }
-
- return $element;
- }
-
- protected static function cleanCssIdentifier($id) {
- return 'token-' . Html::cleanCssIdentifier(trim($id, '[]'), static::$cssFilter);
- }
-
- protected static function formatRow($token, $token_info, $columns, $is_group = FALSE) {
- $row = [
- 'id' => static::cleanCssIdentifier($token),
- 'data-tt-id' => static::cleanCssIdentifier($token),
- 'class' => [],
- 'data' => [],
- ];
-
- foreach ($columns as $col) {
- switch ($col) {
- case 'name':
- $row['data'][$col] = $token_info['name'];
- break;
-
- case 'token':
- $row['data'][$col]['data'] = $token;
- $row['data'][$col]['class'][] = 'token-key';
- break;
-
- case 'description':
- $row['data'][$col] = isset($token_info['description']) ? $token_info['description'] : '';
- break;
-
- case 'value':
- $row['data'][$col] = !$is_group && isset($token_info['value']) ? $token_info['value'] : '';
- break;
- }
- }
-
- if ($is_group) {
- // This is a token type/group.
- $row['class'][] = 'token-group';
- }
- elseif (!empty($token_info['parent'])) {
- $row['data-tt-parent-id'] = static::cleanCssIdentifier($token_info['parent']);
- unset($row['parent']);
- }
-
- return $row;
- }
-}
diff --git a/modules/token/src/Plugin/Derivative/DevelLocalTask.php b/modules/token/src/Plugin/Derivative/DevelLocalTask.php
deleted file mode 100644
index 5b22e84..0000000
--- a/modules/token/src/Plugin/Derivative/DevelLocalTask.php
+++ /dev/null
@@ -1,56 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->stringTranslation = $string_translation;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, $base_plugin_id) {
- return new static(
- $container->get('entity_type.manager'),
- $container->get('string_translation')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDerivativeDefinitions($base_plugin_definition) {
- $this->derivatives = [];
-
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- if ($entity_type->hasLinkTemplate('token-devel')) {
- $this->derivatives["$entity_type_id.token_devel_tab"] = [
- 'route_name' => "entity.$entity_type_id.token_devel",
- 'weight' => 110,
- 'title' => $this->t('Tokens'),
- 'parent_id' => "devel.entities:$entity_type_id.devel_tab",
- ];
- }
- }
-
- foreach ($this->derivatives as &$entry) {
- $entry += $base_plugin_definition;
- }
-
- return $this->derivatives;
- }
-}
diff --git a/modules/token/src/Routing/RouteSubscriber.php b/modules/token/src/Routing/RouteSubscriber.php
deleted file mode 100644
index ae6815a..0000000
--- a/modules/token/src/Routing/RouteSubscriber.php
+++ /dev/null
@@ -1,74 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->moduleHandler = $module_handler;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function alterRoutes(RouteCollection $collection) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- if ($devel_render = $entity_type->getLinkTemplate('token-devel')) {
- $options = [
- '_admin_route' => TRUE,
- '_token_entity_type_id' => $entity_type_id,
- 'parameters' => [
- $entity_type_id => [
- 'type' => 'entity:' . $entity_type_id,
- ],
- ],
- ];
-
- $route = new Route(
- $devel_render,
- [
- '_controller' => '\Drupal\token\Controller\TokenDevelController::entityTokens',
- '_title' => 'Devel Tokens',
- ],
- [
- '_permission' => 'access devel information',
- '_module_dependencies' => 'devel',
- ],
- $options
- );
-
- $collection->add("entity.$entity_type_id.token_devel", $route);
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public static function getSubscribedEvents() {
- $events = parent::getSubscribedEvents();
- $events[RoutingEvents::ALTER] = array('onAlterRoutes', 100);
- return $events;
- }
-}
diff --git a/modules/token/src/Tests/TokenBlockTest.php b/modules/token/src/Tests/TokenBlockTest.php
deleted file mode 100644
index 66e3025..0000000
--- a/modules/token/src/Tests/TokenBlockTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-admin_user = $this->drupalCreateUser(array('access content', 'administer blocks'));
- $this->drupalLogin($this->admin_user);
- }
-
- public function testBlockTitleTokens() {
- $label = 'tokenblock';
- $bundle = BlockContentType::create(array(
- 'id' => $label,
- 'label' => $label,
- 'revision' => FALSE
- ));
- $bundle->save();
-
- $block_content = BlockContent::create(array(
- 'type' => $label,
- 'label' => '[current-page:title] block title',
- 'info' => 'Test token title block',
- 'body[value]' => 'This is the test token title block.',
- ));
- $block_content->save();
-
- $block = $this->drupalPlaceBlock('block_content:' . $block_content->uuid(), array(
- 'label' => '[user:name]',
- ));
- $this->drupalGet($block->urlInfo());
- // Ensure that the link to available tokens is present and correctly
- // positioned.
- $this->assertLink('Browse available tokens.');
- $this->assertText('This field supports tokens. Browse available tokens.');
- $this->drupalPostForm(NULL, array(), t('Save block'));
- // Ensure token validation is working on the block.
- $this->assertText('Title is using the following invalid tokens: [user:name].');
-
- // Create the block for real now with a valid title.
- $settings = $block->get('settings');
- $settings['label'] = '[current-page:title] block title';
- $block->set('settings', $settings);
- $block->save();
-
- // Ensure that tokens are not double-escaped when output as a block title.
- $this->drupalCreateContentType(array('type' => 'page'));
- $node = $this->drupalCreateNode(array('title' => "Site's first node"));
- $this->drupalGet('node/' . $node->id());
- // The apostraphe should only be escaped once.
- $this->assertRaw("Site's first node block title");
- }
-}
diff --git a/modules/token/src/Tests/TokenCurrentPageTest.php b/modules/token/src/Tests/TokenCurrentPageTest.php
deleted file mode 100644
index cd8ac37..0000000
--- a/modules/token/src/Tests/TokenCurrentPageTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
- t('Log in'),
- '[current-page:url]' => Url::fromRoute('user.login', [], array('absolute' => TRUE))->toString(),
- '[current-page:url:absolute]' => Url::fromRoute('user.login', [], array('absolute' => TRUE))->toString(),
- '[current-page:url:relative]' => Url::fromRoute('user.login')->toString(),
- '[current-page:url:path]' => '/user/login',
- '[current-page:url:args:value:0]' => 'user',
- '[current-page:url:args:value:1]' => 'login',
- '[current-page:url:args:value:2]' => NULL,
- '[current-page:url:unaliased]' => Url::fromRoute('user.login', [], array('absolute' => TRUE, 'alias' => TRUE))->toString(),
- '[current-page:page-number]' => 1,
- '[current-page:query:foo]' => NULL,
- '[current-page:query:bar]' => NULL,
- // Deprecated tokens
- '[current-page:arg:0]' => 'user',
- '[current-page:arg:1]' => 'login',
- '[current-page:arg:2]' => NULL,
- );
- $this->assertPageTokens('user/login', $tokens);
-
- $this->drupalCreateContentType(array('type' => 'page'));
- $node = $this->drupalCreateNode(array('title' => 'Node title', 'path' => array('alias' => '/node-alias')));
- $tokens = array(
- '[current-page:title]' => 'Node title',
- '[current-page:url]' => $node->url('canonical', array('absolute' => TRUE)),
- '[current-page:url:absolute]' => $node->url('canonical', array('absolute' => TRUE)),
- '[current-page:url:relative]' => $node->url(),
- '[current-page:url:alias]' => '/node-alias',
- '[current-page:url:args:value:0]' => 'node-alias',
- '[current-page:url:args:value:1]' => NULL,
- '[current-page:url:unaliased]' => $node->url('canonical', array('absolute' => TRUE, 'alias' => TRUE)),
- '[current-page:url:unaliased:args:value:0]' => 'node',
- '[current-page:url:unaliased:args:value:1]' => $node->id(),
- '[current-page:url:unaliased:args:value:2]' => NULL,
- '[current-page:page-number]' => 1,
- '[current-page:query:foo]' => 'bar',
- '[current-page:query:bar]' => NULL,
- // Deprecated tokens
- '[current-page:arg:0]' => 'node',
- '[current-page:arg:1]' => 1,
- '[current-page:arg:2]' => NULL,
- );
- $this->assertPageTokens("/node/{$node->id()}", $tokens, array(), array('url_options' => array('query' => array('foo' => 'bar'))));
- }
-}
diff --git a/modules/token/src/Tests/TokenFieldUiTest.php b/modules/token/src/Tests/TokenFieldUiTest.php
deleted file mode 100644
index f7983e7..0000000
--- a/modules/token/src/Tests/TokenFieldUiTest.php
+++ /dev/null
@@ -1,280 +0,0 @@
-adminUser = $this->drupalCreateUser(['administer content types', 'administer node fields']);
- $this->drupalLogin($this->adminUser);
-
- $node_type = NodeType::create([
- 'type' => 'article',
- 'name' => 'Article',
- 'description' => "Use articles for time-sensitive content like news, press releases or blog posts.",
- ]);
- $node_type->save();
-
- entity_create('field_storage_config', array(
- 'field_name' => 'field_body',
- 'entity_type' => 'node',
- 'type' => 'text_with_summary',
- ))->save();
- entity_create('field_config', array(
- 'field_name' => 'field_body',
- 'label' => 'Body',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- ))->save();
- entity_create('field_storage_config', array(
- 'field_name' => 'field_image',
- 'entity_type' => 'node',
- 'type' => 'image',
- ))->save();
- entity_create('field_config', array(
- 'field_name' => 'field_image',
- 'label' => 'Image',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- ))->save();
- entity_create('field_storage_config', array(
- 'field_name' => 'field_image_2',
- 'entity_type' => 'node',
- 'type' => 'image',
- ))->save();
- entity_create('field_config', array(
- 'field_name' => 'field_image_2',
- 'label' => 'Image 2',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- ))->save();
- entity_create('field_storage_config', array(
- 'field_name' => 'multivalued_field_image',
- 'entity_type' => 'node',
- 'type' => 'image',
- ))->save();
- entity_create('field_config', array(
- 'field_name' => 'multivalued_field_image',
- 'label' => 'Multivalued field image',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- ))->save();
-
- entity_get_form_display('node', 'article', 'default')
- ->setComponent('field_body', [
- 'type' => 'text_textarea_with_summary',
- 'settings' => [
- 'rows' => '9',
- 'summary_rows' => '3',
- ],
- 'weight' => 5,
- ])
- ->save();
- }
-
- public function testFileFieldUi() {
- $this->drupalGet('admin/structure/types/manage/article/fields/node.article.field_image');
-
- // Ensure the 'Browse available tokens' link is present and correct.
- $this->assertLink('Browse available tokens.');
- $this->assertLinkByHref('token/tree');
-
- // Ensure that the default file directory value validates correctly.
- $this->drupalPostForm(NULL, [], t('Save settings'));
- $this->assertText(t('Saved Image configuration.'));
- }
-
- public function testFieldDescriptionTokens() {
- $edit = [
- 'description' => 'The site is called [site:name].',
- ];
- $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_body', $edit, 'Save settings');
-
- $this->drupalGet('node/add/article');
- $this->assertText('The site is called Drupal.');
- }
-
- /**
- * Test that tokens are correctly provided and replaced for the image fields.
- */
- public function testImageFieldTokens() {
- // Generate 2 different test images.
- file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example1.png');
- file_unmanaged_copy(\Drupal::root() . '/core/misc/loading.gif', 'public://example2.gif');
-
- // Resize the test images so that they will be scaled down during token
- // replacement.
- $image1 = \Drupal::service('image.factory')->get('public://example1.png');
- $image1->resize(500, 500);
- $image1->save();
- $image2 = \Drupal::service('image.factory')->get('public://example2.gif');
- $image2->resize(500, 500);
- $image2->save();
-
- /** @var \Drupal\file\Entity\File $image1 */
- $image1 = File::create(['uri' => 'public://example1.png']);
- $image1->save();
- /** @var \Drupal\file\Entity\File $image2 */
- $image2 = File::create(['uri' => 'public://example2.gif']);
- $image2->save();
-
- $node = Node::create([
- 'title' => 'Test node title',
- 'type' => 'article',
- 'field_image' => [
- [
- 'target_id' => $image1->id(),
- ],
- ],
- 'field_image_2' => [
- [
- 'target_id' => $image2->id(),
- ],
- ],
- 'multivalued_field_image' => [
- ['target_id' => $image1->id()],
- ['target_id' => $image2->id()],
- ],
- ]);
- $node->save();
-
- // Obtain the file size and dimension of the images that will be scaled
- // down during token replacement by applying the styles here.
- $style_thumbnail = ImageStyle::load('thumbnail');
- $style_thumbnail->createDerivative('public://example1.png', 'public://styles/thumbnail/public/example1-test.png');
- $style_thumbnail->createDerivative('public://example2.gif', 'public://styles/thumbnail/public/example2-test.gif');
- $image_1_thumbnail = \Drupal::service('image.factory')->get('public://styles/thumbnail/public/example1-test.png');
- $image_2_thumbnail = \Drupal::service('image.factory')->get('public://styles/thumbnail/public/example2-test.gif');
- $style_medium = ImageStyle::load('medium');
- $style_medium->createDerivative('public://example1.png', 'public://styles/medium/public/example1-test.png');
- $style_medium->createDerivative('public://example2.gif', 'public://styles/medium/public/example2-test.gif');
- $image_1_medium = \Drupal::service('image.factory')->get('public://styles/medium/public/example1-test.png');
- $image_2_medium = \Drupal::service('image.factory')->get('public://styles/medium/public/example2-test.gif');
- $style_large = ImageStyle::load('large');
- $style_large->createDerivative('public://example1.png', 'public://styles/large/public/example1-test.png');
- $style_large->createDerivative('public://example2.gif', 'public://styles/large/public/example2-test.gif');
- $image_1_large = \Drupal::service('image.factory')->get('public://styles/large/public/example1-test.png');
- $image_2_large = \Drupal::service('image.factory')->get('public://styles/large/public/example2-test.gif');
-
- // Delete the image derivatives, to make sure they are re-created.
- unlink('public://styles/thumbnail/public/example1-test.png');
- unlink('public://styles/medium/public/example1-test.png');
- unlink('public://styles/large/public/example1-test.png');
- unlink('public://styles/thumbnail/public/example2-test.gif');
- unlink('public://styles/medium/public/example2-test.gif');
- unlink('public://styles/large/public/example2-test.gif');
-
- $tokens = [
- // field_image
- 'field_image:thumbnail:mimetype' => 'image/png',
- 'field_image:medium:mimetype' => 'image/png',
- 'field_image:large:mimetype' => 'image/png',
- 'field_image:thumbnail:filesize' => $image_1_thumbnail->getFileSize(),
- 'field_image:medium:filesize' => $image_1_medium->getFileSize(),
- 'field_image:large:filesize' => $image_1_large->getFileSize(),
- 'field_image:thumbnail:height' => '100',
- 'field_image:medium:height' => '220',
- 'field_image:large:height' => '480',
- 'field_image:thumbnail:width' => '100',
- 'field_image:medium:width' => '220',
- 'field_image:large:width' => '480',
- 'field_image:thumbnail:uri' => 'public://styles/thumbnail/public/example1.png',
- 'field_image:medium:uri' => 'public://styles/medium/public/example1.png',
- 'field_image:large:uri' => 'public://styles/large/public/example1.png',
- 'field_image:thumbnail:url' => $style_thumbnail->buildUrl('public://example1.png'),
- 'field_image:medium:url' => $style_medium->buildUrl('public://example1.png'),
- 'field_image:large:url' => $style_large->buildUrl('public://example1.png'),
- 'field_image:thumbnail' => $style_thumbnail->buildUrl('public://example1.png'),
- 'field_image:medium' => $style_medium->buildUrl('public://example1.png'),
- 'field_image:large' => $style_large->buildUrl('public://example1.png'),
- // field_image_2
- 'field_image_2:thumbnail:mimetype' => 'image/gif',
- 'field_image_2:medium:mimetype' => 'image/gif',
- 'field_image_2:large:mimetype' => 'image/gif',
- 'field_image_2:thumbnail:filesize' => $image_2_thumbnail->getFileSize(),
- 'field_image_2:medium:filesize' => $image_2_medium->getFileSize(),
- 'field_image_2:large:filesize' => $image_2_large->getFileSize(),
- 'field_image_2:thumbnail:height' => '100',
- 'field_image_2:medium:height' => '220',
- 'field_image_2:large:height' => '480',
- 'field_image_2:thumbnail:width' => '100',
- 'field_image_2:medium:width' => '220',
- 'field_image_2:large:width' => '480',
- 'field_image_2:thumbnail:uri' => 'public://styles/thumbnail/public/example2.gif',
- 'field_image_2:medium:uri' => 'public://styles/medium/public/example2.gif',
- 'field_image_2:large:uri' => 'public://styles/large/public/example2.gif',
- 'field_image_2:thumbnail:url' => $style_thumbnail->buildUrl('public://example2.gif'),
- 'field_image_2:medium:url' => $style_medium->buildUrl('public://example2.gif'),
- 'field_image_2:large:url' => $style_large->buildUrl('public://example2.gif'),
- 'field_image_2:thumbnail' => $style_thumbnail->buildUrl('public://example2.gif'),
- 'field_image_2:medium' => $style_medium->buildUrl('public://example2.gif'),
- 'field_image_2:large' => $style_large->buildUrl('public://example2.gif'),
- // multivalued_field_image:0, test for thumbnail image style only.
- 'multivalued_field_image:0:thumbnail:mimetype' => 'image/png',
- 'multivalued_field_image:0:thumbnail:filesize' => $image_1_thumbnail->getFileSize(),
- 'multivalued_field_image:0:thumbnail:height' => '100',
- 'multivalued_field_image:0:thumbnail:width' => '100',
- 'multivalued_field_image:0:thumbnail:uri' => 'public://styles/thumbnail/public/example1.png',
- 'multivalued_field_image:0:thumbnail:url' => $style_thumbnail->buildUrl('public://example1.png'),
- 'multivalued_field_image:0:thumbnail' => $style_thumbnail->buildUrl('public://example1.png'),
- // multivalued_field_image:1, test for medium image style only.
- 'multivalued_field_image:1:medium:mimetype' => 'image/gif',
- 'multivalued_field_image:1:medium:filesize' => $image_2_medium->getFileSize(),
- 'multivalued_field_image:1:medium:height' => '220',
- 'multivalued_field_image:1:medium:width' => '220',
- 'multivalued_field_image:1:medium:uri' => 'public://styles/medium/public/example2.gif',
- 'multivalued_field_image:1:medium:url' => $style_medium->buildUrl('public://example2.gif'),
- 'multivalued_field_image:1:medium' => $style_medium->buildUrl('public://example2.gif'),
- ];
- $this->assertTokens('node', ['node' => $node], $tokens);
-
- /** @var \Drupal\token\Token $token_service */
- $token_service = \Drupal::service('token');
-
- // Test one of the image style's token info for cardinality 1 image field.
- $token_info = $token_service->getTokenInfo('node-field_image', 'thumbnail');
- $this->assertEqual('Thumbnail (100×100)', $token_info['name']);
- $this->assertEqual('Represents the image in the given image style.', $token_info['description']);
-
- // Test one of the image style's token info for a multivalued image field.
- $token_info = $token_service->getTokenInfo('node-multivalued_field_image', 'medium');
- $this->assertEqual('Medium (220×220)', $token_info['name']);
- $this->assertEqual('Represents the image in the given image style.', $token_info['description']);
-
- // Test few of the image styles' properties token info.
- $token_info = $token_service->getTokenInfo('image_with_image_style', 'mimetype');
- $this->assertEqual('MIME type', $token_info['name']);
- $this->assertEqual('The MIME type (image/png, image/bmp, etc.) of the image.', $token_info['description']);
-
- $token_info = $token_service->getTokenInfo('image_with_image_style', 'filesize');
- $this->assertEqual('File size', $token_info['name']);
- $this->assertEqual('The file size of the image.', $token_info['description']);
- }
-
-}
diff --git a/modules/token/src/Tests/TokenMenuTest.php b/modules/token/src/Tests/TokenMenuTest.php
deleted file mode 100644
index b9eb920..0000000
--- a/modules/token/src/Tests/TokenMenuTest.php
+++ /dev/null
@@ -1,459 +0,0 @@
-drupalCreateContentType(['type' => 'page']);
- // Add a menu.
- $menu = entity_create('menu', array(
- 'id' => 'main-menu',
- 'label' => 'Main menu',
- 'description' => 'The Main menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
- ));
- $menu->save();
-
- // Place the menu block.
- $this->drupalPlaceBlock('system_menu_block:main-menu');
-
- // Add a root link.
- /** @var \Drupal\menu_link_content\Plugin\Menu\MenuLinkContent $root_link */
- $root_link = entity_create('menu_link_content', array(
- 'link' => ['uri' => 'internal:/admin'],
- 'title' => 'Administration',
- 'menu_name' => 'main-menu',
- ));
- $root_link->save();
-
- // Add another link with the root link as the parent.
- /** @var \Drupal\menu_link_content\Plugin\Menu\MenuLinkContent $parent_link */
- $parent_link = entity_create('menu_link_content', array(
- 'link' => ['uri' => 'internal:/admin/config'],
- 'title' => 'Configuration',
- 'menu_name' => 'main-menu',
- 'parent' => $root_link->getPluginId(),
- ));
- $parent_link->save();
-
- // Test menu link tokens.
- $tokens = array(
- 'id' => $parent_link->getPluginId(),
- 'title' => 'Configuration',
- 'menu' => 'Main menu',
- 'menu:name' => 'Main menu',
- 'menu:machine-name' => $menu->id(),
- 'menu:description' => 'The Main menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
- 'menu:menu-link-count' => '2',
- 'menu:edit-url' => Url::fromRoute('entity.menu.edit_form', ['menu' => 'main-menu'], array('absolute' => TRUE))->toString(),
- 'url' => Url::fromRoute('system.admin_config', [], array('absolute' => TRUE))->toString(),
- 'url:absolute' => Url::fromRoute('system.admin_config', [], array('absolute' => TRUE))->toString(),
- 'url:relative' => Url::fromRoute('system.admin_config', [], array('absolute' => FALSE))->toString(),
- 'url:path' => '/admin/config',
- 'url:alias' => '/admin/config',
- 'edit-url' => Url::fromRoute('entity.menu_link_content.canonical', ['menu_link_content' => $parent_link->id()], array('absolute' => TRUE))->toString(),
- 'parent' => 'Administration',
- 'parent:id' => $root_link->getPluginId(),
- 'parent:title' => 'Administration',
- 'parent:menu' => 'Main menu',
- 'parent:parent' => NULL,
- 'parents' => 'Administration',
- 'parents:count' => 1,
- 'parents:keys' => $root_link->getPluginId(),
- 'root' => 'Administration',
- 'root:id' => $root_link->getPluginId(),
- 'root:parent' => NULL,
- 'root:root' => NULL,
- );
- $this->assertTokens('menu-link', array('menu-link' => $parent_link), $tokens);
-
- // Add a node.
- $node = $this->drupalCreateNode();
-
- // Allow main menu for this node type.
- //$this->config('menu.entity.node.' . $node->getType())->set('available_menus', array('main-menu'))->save();
-
- // Add a node menu link.
- /** @var \Drupal\menu_link_content\Plugin\Menu\MenuLinkContent $node_link */
- $node_link = entity_create('menu_link_content', array(
- 'link' => ['uri' =>'entity:node/' . $node->id()],
- 'title' => 'Node link',
- 'parent' => $parent_link->getPluginId(),
- 'menu_name' => 'main-menu',
- ));
- $node_link->save();
-
- // Test [node:menu] tokens.
- $tokens = array(
- 'menu-link' => 'Node link',
- 'menu-link:id' => $node_link->getPluginId(),
- 'menu-link:title' => 'Node link',
- 'menu-link:menu' => 'Main menu',
- 'menu-link:url' => $node->url('canonical', ['absolute' => TRUE]),
- 'menu-link:url:path' => '/node/' . $node->id(),
- 'menu-link:edit-url' => $node_link->url('edit-form', ['absolute' => TRUE]),
- 'menu-link:parent' => 'Configuration',
- 'menu-link:parent:id' => $parent_link->getPluginId(),
- 'menu-link:parents' => 'Administration, Configuration',
- 'menu-link:parents:count' => 2,
- 'menu-link:parents:keys' => $root_link->getPluginId() . ', ' . $parent_link->getPluginId(),
- 'menu-link:root' => 'Administration',
- 'menu-link:root:id' => $root_link->getPluginId(),
- );
- $this->assertTokens('node', array('node' => $node), $tokens);
-
- // Reload the node which will not have $node->menu defined and re-test.
- $loaded_node = Node::load($node->id());
- $this->assertTokens('node', array('node' => $loaded_node), $tokens);
-
- // Regression test for http://drupal.org/node/1317926 to ensure the
- // original node object is not changed when calling menu_node_prepare().
- $this->assertTrue(!isset($loaded_node->menu), t('The $node->menu property was not modified during token replacement.'), 'Regression');
-
- // Now add a node with a menu-link from the UI and ensure it works.
- $this->drupalLogin($this->drupalCreateUser([
- 'create page content',
- 'edit any page content',
- 'administer menu',
- 'administer nodes',
- 'administer content types',
- 'access administration pages',
- ]));
- // Setup node type menu options.
- $edit = array(
- 'menu_options[main-menu]' => 1,
- 'menu_options[main]' => 1,
- 'menu_parent' => 'main-menu:',
- );
- $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
-
- // Use a menu-link token in the body.
- $this->drupalGet('node/add/page');
- $this->drupalPostForm(NULL, [
- // This should get replaced on save.
- // @see token_module_test_node_presave()
- 'title[0][value]' => 'Node menu title test',
- 'body[0][value]' => 'This is a [node:menu-link:title] token to the menu link title',
- 'menu[enabled]' => 1,
- 'menu[title]' => 'Test preview',
- ], t('Save and publish'));
- $node = $this->drupalGetNodeByTitle('Node menu title test');
- $this->assertEqual('This is a Test preview token to the menu link title', $node->body->value);
-
- // Disable the menu link, save the node and verify that the menu link is
- // no longer displayed.
- $link = menu_ui_get_menu_link_defaults($node);
- $this->drupalPostForm('admin/structure/menu/manage/main-menu', ['links[menu_plugin_id:' . $link['id'] . '][enabled]' => FALSE], t('Save'));
- $this->assertText('Menu Main menu has been updated.');
- $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save and keep published'));
- $this->assertNoLink('Test preview');
-
- // Now test a parent link and token.
- $this->drupalGet('node/add/page');
- // Make sure that the previous node save didn't result in two menu-links
- // being created by the computed menu-link ER field.
- // @see token_entity_base_field_info()
- // @see token_node_menu_link_submit()
- $selects = $this->cssSelect('select[name="menu[menu_parent]"]');
- $select = reset($selects);
- $options = $this->getAllOptions($select);
- // Filter to items with title containing 'Test preview'.
- $options = array_filter($options, function(\SimpleXMLElement $item) {
- return strpos((string) $item[0], 'Test preview') !== FALSE;
- });
- $this->assertEqual(1, count($options));
- $this->drupalPostForm(NULL, [
- 'title[0][value]' => 'Node menu title parent path test',
- 'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent',
- 'menu[enabled]' => 1,
- 'menu[title]' => 'Child link',
- 'menu[menu_parent]' => 'main-menu:' . $parent_link->getPluginId(),
- ], t('Save and publish'));
- $node = $this->drupalGetNodeByTitle('Node menu title parent path test');
- $this->assertEqual('This is a /admin/config token to the menu link parent', $node->body->value);
-
- // Now edit the node and update the parent and title.
- $this->drupalPostForm('node/' . $node->id() . '/edit', [
- 'menu[menu_parent]' => 'main-menu:' . $node_link->getPluginId(),
- 'title[0][value]' => 'Node menu title edit parent path test',
- 'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent',
- ], t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle('Node menu title edit parent path test', TRUE);
- $this->assertEqual(sprintf('This is a /node/%d token to the menu link parent', $loaded_node->id()), $node->body->value);
-
- // Make sure that the previous node edit didn't result in two menu-links
- // being created by the computed menu-link ER field.
- // @see token_entity_base_field_info()
- // @see token_node_menu_link_submit()
- $this->drupalGet('node/add/page');
- $selects = $this->cssSelect('select[name="menu[menu_parent]"]');
- $select = reset($selects);
- $options = $this->getAllOptions($select);
- // Filter to items with title containing 'Test preview'.
- $options = array_filter($options, function(\SimpleXMLElement $item) {
- return strpos((string) $item[0], 'Child link') !== FALSE;
- });
- $this->assertEqual(1, count($options));
-
- // Now add a new node with no menu.
- $this->drupalGet('node/add/page');
- $this->drupalPostForm(NULL, [
- 'title[0][value]' => 'Node menu adding menu later test',
- 'body[0][value]' => 'Going to add a menu link on edit',
- 'menu[enabled]' => 0,
- ], t('Save and publish'));
- $node = $this->drupalGetNodeByTitle('Node menu adding menu later test');
- // Now edit it and add a menu item.
- $this->drupalGet('node/' . $node->id() . '/edit');
- $this->drupalPostForm(NULL, [
- 'title[0][value]' => 'Node menu adding menu later test',
- 'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent',
- 'menu[enabled]' => 1,
- 'menu[title]' => 'Child link',
- 'menu[menu_parent]' => 'main-menu:' . $parent_link->getPluginId(),
- ], t('Save and keep published'));
- $node = $this->drupalGetNodeByTitle('Node menu adding menu later test', TRUE);
- $this->assertEqual('This is a /admin/config token to the menu link parent', $node->body->value);
- // And make sure the menu link exists with the right URI.
- $link = menu_ui_get_menu_link_defaults($node);
- $this->assertTrue(!empty($link['entity_id']));
- $query = \Drupal::entityQuery('menu_link_content')
- ->condition('link.uri', 'entity:node/' . $node->id())
- ->sort('id', 'ASC')
- ->range(0, 1);
- $result = $query->execute();
- $this->assertTrue($result);
-
- // Create a node with a menu link and create 2 menu links linking to this
- // node after. Verify that the menu link provided by the node has priority.
- $node_title = $this->randomMachineName();
- $edit = [
- 'title[0][value]' => $node_title,
- 'menu[enabled]' => 1,
- 'menu[title]' => 'menu link provided by node',
- ];
- $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
- $this->assertText('page ' . $node_title . ' has been created');
- $node = $this->drupalGetNodeByTitle($node_title);
-
- $menu_ui_link1 = entity_create('menu_link_content', [
- 'link' => ['uri' => 'entity:node/' . $node->id()],
- 'title' => 'menu link 1 provided by menu ui',
- 'menu_name' => 'main-menu',
- ]);
- $menu_ui_link1->save();
-
- $menu_ui_link2 = entity_create('menu_link_content', [
- 'link' => ['uri' => 'entity:node/' . $node->id()],
- 'title' => 'menu link 2 provided by menu ui',
- 'menu_name' => 'main-menu',
- ]);
- $menu_ui_link2->save();
-
- $tokens = [
- 'menu-link' => 'menu link provided by node',
- 'menu-link:title' => 'menu link provided by node',
- ];
- $this->assertTokens('node', ['node' => $node], $tokens);
- }
-
- /**
- * Tests that the module doesn't affect integrity of the menu, when
- * translating them and that menu links tokens are correct.
- */
- function testMultilingualMenu() {
- // Place the menu block.
- $this->drupalPlaceBlock('system_menu_block:main');
-
- // Add a second language.
- $language = ConfigurableLanguage::create([
- 'id' => 'de',
- 'label' => 'German',
- ]);
- $language->save();
-
- // Create the article content type.
- $node_type = NodeType::create([
- 'type' => 'article',
- ]);
- $node_type->save();
-
- $permissions = array(
- 'access administration pages',
- 'administer content translation',
- 'administer content types',
- 'administer languages',
- 'create content translations',
- 'create article content',
- 'edit any article content',
- 'translate any entity',
- 'administer menu',
- );
- $this->drupalLogin($this->drupalCreateUser($permissions));
-
- // Enable translation for articles and menu links.
- $this->drupalGet('admin/config/regional/content-language');
- $edit = array(
- 'entity_types[node]' => TRUE,
- 'entity_types[menu_link_content]' => TRUE,
- 'settings[node][article][translatable]' => TRUE,
- 'settings[node][article][fields][title]' => TRUE,
- 'settings[menu_link_content][menu_link_content][translatable]' => TRUE,
- );
- $this->drupalPostForm(NULL, $edit, t('Save configuration'));
- $this->assertText('Settings successfully updated.');
-
- // Create an english node with an english menu.
- $this->drupalGet('/node/add/article');
- $edit = [
- 'title[0][value]' => 'English test node with menu',
- 'menu[enabled]' => TRUE,
- 'menu[title]' => 'English menu title',
- ];
- $this->drupalPostForm('/node/add/article', $edit, t('Save'));
- $this->assertText('English test node with menu has been created.');
-
- // Add a german translation.
- $this->drupalGet('node/1/translations');
- $this->clickLink('Add');
- $edit = [
- 'title[0][value]' => 'German test node with menu',
- 'menu[enabled]' => TRUE,
- 'menu[title]' => 'German menu title',
- ];
- $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
- $this->assertText('German test node with menu has been updated.');
-
- // Verify that the menu links are correct.
- $this->drupalGet('node/1');
- $this->assertLink('English menu title');
- $this->drupalGet('de/node/1');
- $this->assertLink('German menu title');
-
- // Verify that tokens are correct.
- $node = Node::load(1);
- $this->assertTokens('node', ['node' => $node], ['menu-link' => 'English menu title']);
- $this->assertTokens('node', ['node' => $node], [
- 'menu-link' => 'German menu title',
- 'menu-link:title' => 'German menu title',
- ], ['langcode' => 'de']);
-
- // Get the menu link and create a child menu link to assert parent and root
- // tokens.
- $url = $node->toUrl();
- /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
- $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
- $links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters());
- $link = reset($links);
-
- $base_options = [
- 'provider' => 'menu_test',
- 'menu_name' => 'menu_test',
- ];
- $child_1 = $base_options + [
- 'title' => 'child_1 title EN',
- 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child_1'],
- 'parent' => $link->getPluginId(),
- 'langcode' => 'en',
- ];
- $child_1 = MenuLinkContent::create($child_1);
- $child_1->save();
-
- // Add the german translation.
- $child_1->addTranslation('de', ['title' => 'child_1 title DE'] + $child_1->toArray());
- $child_1->save();
-
- $this->assertTokens('menu-link', ['menu-link' => $child_1], [
- 'title' => 'child_1 title EN',
- 'parents' => 'English menu title',
- 'root' => 'English menu title',
- ]);
- $this->assertTokens('menu-link', ['menu-link' => $child_1], [
- 'title' => 'child_1 title DE',
- 'parents' => 'German menu title',
- 'root' => 'German menu title',
- ], ['langcode' => 'de']);
- }
-
- /**
- * Tests menu link parents token.
- */
- public function testMenuLinkParentsToken() {
- // Create a menu with a simple link hierarchy :
- // - parent
- // - child-1
- // - child-1-1
- Menu::create(array(
- 'id' => 'menu_test',
- 'label' => 'Test menu',
- ))->save();
- $base_options = [
- 'provider' => 'menu_test',
- 'menu_name' => 'menu_test',
- ];
- $parent = $base_options + [
- 'title' => 'parent title',
- 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent'],
- ];
- $parent = MenuLinkContent::create($parent);
- $parent->save();
- $child_1 = $base_options + [
- 'title' => 'child_1 title',
- 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child_1'],
- 'parent' => $parent->getPluginId(),
- ];
- $child_1 = MenuLinkContent::create($child_1);
- $child_1->save();
- $child_1_1 = $base_options + [
- 'title' => 'child_1_1 title',
- 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child_1/child_1_1'],
- 'parent' => $child_1->getPluginId(),
- ];
- $child_1_1 = MenuLinkContent::create($child_1_1);
- $child_1_1->save();
-
- $this->assertTokens('menu-link', ['menu-link' => $child_1_1], ['parents' => 'parent title, child_1 title']);
-
- // Change the parent of child_1_1 to 'parent' at the entity level.
- $child_1_1->parent->value = $parent->getPluginId();
- $child_1_1->save();
-
- $this->assertTokens('menu-link', ['menu-link' => $child_1_1], ['parents' => 'parent title']);
-
- // Change the parent of child_1_1 to 'main', at the entity level.
- $child_1_1->parent->value = '';
- $child_1_1->save();
-
- // The token shouldn't have been generated; the menu link has no parent.
- $this->assertNoTokens('menu-link', ['menu-link' => $child_1_1], ['parents']);
- }
-
-}
diff --git a/modules/token/src/Tests/TokenTestBase.php b/modules/token/src/Tests/TokenTestBase.php
deleted file mode 100644
index 29c1ac3..0000000
--- a/modules/token/src/Tests/TokenTestBase.php
+++ /dev/null
@@ -1,21 +0,0 @@
-assertTokens($type, $data, array($token => $expected), $options);
- }
-
- function assertTokens($type, array $data, array $tokens, array $options = array()) {
- $input = $this->mapTokenNames($type, array_keys($tokens));
- $bubbleable_metadata = new BubbleableMetadata();
- $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
- foreach ($tokens as $name => $expected) {
- $token = $input[$name];
- if (!isset($expected)) {
- $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
- }
- elseif (!isset($replacements[$token])) {
- $this->fail(t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
- }
- elseif (!empty($options['regex'])) {
- $this->assertTrue(preg_match('/^' . $expected . '$/', $replacements[$token]), t("Token value for @token was '@actual', matching regular expression pattern '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
- }
- else {
- $this->assertEqual($replacements[$token], $expected, t("Token value for @token was '@actual', expected value '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
- }
- }
-
- return $replacements;
- }
-
- function mapTokenNames($type, array $tokens = array()) {
- $return = array();
- foreach ($tokens as $token) {
- $return[$token] = "[$type:$token]";
- }
- return $return;
- }
-
- function assertNoTokens($type, array $data, array $tokens, array $options = array()) {
- $input = $this->mapTokenNames($type, $tokens);
- $bubbleable_metadata = new BubbleableMetadata();
- $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
- foreach ($tokens as $name) {
- $token = $input[$name];
- $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
- }
- }
-
- function saveAlias($source, $alias, $language = Language::LANGCODE_NOT_SPECIFIED) {
- $alias = array(
- 'source' => $source,
- 'alias' => $alias,
- 'language' => $language,
- );
- \Drupal::service('path.alias_storage')->save($alias['source'], $alias['alias']);
- return $alias;
- }
-
- function saveEntityAlias($entity_type, EntityInterface $entity, $alias, $language = Language::LANGCODE_NOT_SPECIFIED) {
- $uri = $entity->toUrl()->toArray();
- return $this->saveAlias($uri['path'], $alias, $language);
- }
-
- /**
- * Make a page request and test for token generation.
- */
- function assertPageTokens($url, array $tokens, array $data = array(), array $options = array()) {
- if (empty($tokens)) {
- return TRUE;
- }
-
- $token_page_tokens = array(
- 'tokens' => $tokens,
- 'data' => $data,
- 'options' => $options,
- );
- \Drupal::state()->set('token_page_tokens', $token_page_tokens);
-
- $options += array('url_options' => array());
- $this->drupalGet($url, $options['url_options']);
- $this->refreshVariables();
- $result = \Drupal::state()->get('token_page_tokens', array());
-
- if (!isset($result['values']) || !is_array($result['values'])) {
- return $this->fail('Failed to generate tokens.');
- }
-
- foreach ($tokens as $token => $expected) {
- if (!isset($expected)) {
- $this->assertTrue(!isset($result['values'][$token]) || $result['values'][$token] === $token, t("Token value for @token was not generated.", array('@token' => $token)));
- }
- elseif (!isset($result['values'][$token])) {
- $this->fail(t('Failed to generate token @token.', array('@token' => $token)));
- }
- else {
- $this->assertIdentical($result['values'][$token], (string) $expected, t("Token value for @token was '@actual', expected value '@expected'.", array('@token' => $token, '@actual' => $result['values'][$token], '@expected' => $expected)));
- }
- }
- }
-
-}
diff --git a/modules/token/src/Tests/TokenURLTest.php b/modules/token/src/Tests/TokenURLTest.php
deleted file mode 100644
index 6241f3b..0000000
--- a/modules/token/src/Tests/TokenURLTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-saveAlias('/node/1', '/first-node');
- }
-
- function testURLTokens() {
- $url = new Url('entity.node.canonical', array('node' => 1));
- $tokens = array(
- 'absolute' => $url->setAbsolute()->toString(),
- 'relative' => $url->setAbsolute(FALSE)->toString(),
- 'path' => '/first-node',
- 'brief' => preg_replace(array('!^https?://!', '!/$!'), '', $url->setAbsolute()->toString()),
- 'args:value:0' => 'first-node',
- 'args:value:1' => NULL,
- 'args:value:N' => NULL,
- 'unaliased' => $url->setAbsolute()->setOption('alias', TRUE)->toString(),
- 'unaliased:relative' => $url->setAbsolute(FALSE)->setOption('alias', TRUE)->toString(),
- 'unaliased:path' => '/node/1',
- 'unaliased:brief' => preg_replace(array('!^https?://!', '!/$!'), '', $url->setAbsolute()->setOption('alias', TRUE)->toString()),
- 'unaliased:args:value:0' => 'node',
- 'unaliased:args:value:1' => '1',
- 'unaliased:args:value:2' => NULL,
- // Deprecated tokens.
- 'alias' => '/first-node',
- );
- $this->assertTokens('url', array('url' => new Url('entity.node.canonical', array('node' => 1))), $tokens);
- }
-}
diff --git a/modules/token/src/Tests/TokenUserTest.php b/modules/token/src/Tests/TokenUserTest.php
deleted file mode 100644
index 2178c7e..0000000
--- a/modules/token/src/Tests/TokenUserTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-account = $this->drupalCreateUser(['administer users', 'administer account settings']);
- $this->drupalLogin($this->account);
- }
-
- public function testUserTokens() {
- // Enable user pictures.
- \Drupal::state()->set('user_pictures', 1);
- \Drupal::state()->set('user_picture_file_size', '');
-
- // Set up the pictures directory.
- $picture_path = file_default_scheme() . '://' . \Drupal::state()->get('user_picture_path', 'pictures');
- if (!file_prepare_directory($picture_path, FILE_CREATE_DIRECTORY)) {
- $this->fail('Could not create directory ' . $picture_path . '.');
- }
-
- // Add a user picture to the account.
- $image = current($this->drupalGetTestFiles('image'));
- $edit = array('files[user_picture_0]' => drupal_realpath($image->uri));
- $this->drupalPostForm('user/' . $this->account->id() . '/edit', $edit, t('Save'));
-
- $storage = \Drupal::entityTypeManager()->getStorage('user');
-
- // Load actual user data from database.
- $storage->resetCache();
- $this->account = $storage->load($this->account->id());
- $this->assertTrue(!empty($this->account->user_picture->target_id), 'User picture uploaded.');
-
- $picture = [
- '#theme' => 'user_picture',
- '#account' => $this->account,
- ];
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = \Drupal::service('renderer');
- $user_tokens = array(
- 'picture' => $renderer->renderPlain($picture),
- 'picture:fid' => $this->account->user_picture->target_id,
- 'picture:size-raw' => 125,
- 'ip-address' => NULL,
- 'roles' => implode(', ', $this->account->getRoles()),
- );
- $this->assertTokens('user', array('user' => $this->account), $user_tokens);
-
- // Remove the simpletest-created user role.
- $roles = $this->account->getRoles();
- $this->account->removeRole(end($roles));
- $this->account->save();
-
- // Remove the user picture field and reload the user.
- FieldStorageConfig::loadByName('user', 'user_picture')->delete();
- $storage->resetCache();
- $this->account = $storage->load($this->account->id());
-
- $user_tokens = array(
- 'picture' => NULL,
- 'picture:fid' => NULL,
- 'ip-address' => NULL,
- 'roles' => 'authenticated',
- 'roles:keys' => (string) DRUPAL_AUTHENTICATED_RID,
- );
- $this->assertTokens('user', array('user' => $this->account), $user_tokens);
-
- // The ip address token should work for the current user token type.
- $tokens = array(
- 'ip-address' => \Drupal::request()->getClientIp(),
- );
- $this->assertTokens('current-user', array(), $tokens);
-
- $anonymous = new AnonymousUserSession();
- $tokens = array(
- 'roles' => 'anonymous',
- 'roles:keys' => (string) DRUPAL_ANONYMOUS_RID,
- );
- $this->assertTokens('user', array('user' => $anonymous), $tokens);
- }
-
- public function testUserAccountSettings() {
- $this->drupalGet('admin/config/people/accounts');
- $this->assertText('The list of available tokens that can be used in e-mails is provided below.');
- $this->assertLink('Browse available tokens.');
- $this->assertLinkByHref('token/tree');
- }
-}
\ No newline at end of file
diff --git a/modules/token/src/Tests/Tree/AutocompleteTest.php b/modules/token/src/Tests/Tree/AutocompleteTest.php
deleted file mode 100644
index 30b3ea4..0000000
--- a/modules/token/src/Tests/Tree/AutocompleteTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-drupalGetJSON($url);
-
- $this->assertTrue(isset($response['[node:nid]']));
- $this->assertTrue(isset($response['[node:author]']));
- $this->assertTrue(isset($response['[node:url]']));
- $this->assertTrue(isset($response['[node:url:']));
-
- $url = $url_prefix . 'Title of [node:url:';
- $response = $this->drupalGetJSON($url);
-
- $this->assertTrue(isset($response['[node:url:path]']));
- $this->assertTrue(isset($response['[node:url:absolute]']));
- }
-
- /**
- * Tests autocomplete for user tokens.
- */
- public function testUserAutocomplete() {
- $url_prefix = "token/autocomplete/user/";
-
- $url = $url_prefix . 'Name of the [us';
- $response = $this->drupalGetJSON($url);
-
- $this->assertTrue(isset($response['[user:uid]']));
- $this->assertTrue(isset($response['[user:original]']));
- $this->assertTrue(isset($response['[user:url]']));
- $this->assertTrue(isset($response['[user:url:']));
-
- $url = $url_prefix . 'Title of [user:original:';
- $response = $this->drupalGetJSON($url);
-
- $this->assertTrue(isset($response['[user:original:uid]']));
- }
-}
diff --git a/modules/token/src/Tests/Tree/HelpPageTest.php b/modules/token/src/Tests/Tree/HelpPageTest.php
deleted file mode 100644
index a957e32..0000000
--- a/modules/token/src/Tests/Tree/HelpPageTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-account = $this->drupalCreateUser(['access administration pages']);
- $this->drupalLogin($this->account);
- }
-
- /**
- * Tests the token browser on the token help page.
- */
- public function testHelpPageTree() {
- $this->drupalGet('admin/help/token');
- $this->assertText('The list of the currently available tokens on this site are shown below.');
-
- $this->assertTokenGroup('Current date');
- $this->assertTokenGroup('Site information');
-
- $this->assertTokenInTree('[current-date:html_date]', 'current-date');
- $this->assertTokenInTree('[current-date:html_week]', 'current-date');
- $this->assertTokenInTree('[date:html_date]', 'date');
- $this->assertTokenInTree('[date:html_week]', 'date');
-
- $this->assertTokenInTree('[current-user:account-name]', 'current-user');
- $this->assertTokenInTree('[user:account-name]', 'user');
-
- $this->assertTokenInTree('[current-page:url:unaliased]', 'current-page--url');
- $this->assertTokenInTree('[current-page:url:unaliased:args]', 'current-page--url--unaliased');
- $this->assertTokenInTree('[user:original:account-name]', 'user--original');
-
- // Assert some of the restricted tokens to ensure they are shown.
- $this->assertTokenInTree('[user:one-time-login-url]', 'user');
- $this->assertTokenInTree('[user:original:cancel-url]', 'user--original');
-
- // The Array token is marked as nested, so it should not show up as a top
- // level token, only nested under another token. For instance, user:roles
- // is of type Array and tokens of type Array have 'nested' setting true.
- $this->assertTokenNotGroup('Array');
- $this->assertTokenNotGroup('user:roles');
- $this->assertTokenInTree('[user:roles]', 'user');
- }
-
-}
diff --git a/modules/token/src/Tests/Tree/TokenTreeTestTrait.php b/modules/token/src/Tests/Tree/TokenTreeTestTrait.php
deleted file mode 100644
index dc70a23..0000000
--- a/modules/token/src/Tests/Tree/TokenTreeTestTrait.php
+++ /dev/null
@@ -1,131 +0,0 @@
-xpath('//tr[contains(@class, "token-group")]/td[1]');
- return array_map(function ($item) {
- return (string) $item;
- }, $groups);
- }
-
- /**
- * Check to see if the specified token group is present in the token browser.
- *
- * @param string $token_group
- * The name of the token group.
- * @param string $message
- * (optional) A message to display with the assertion.
- * @param string $group
- * (optional) The group this message is in, which is displayed in a column
- * in test output.
- */
- protected function assertTokenGroup($token_group, $message = '', $group = 'Other') {
- $groups = $this->getTokenGroups();
-
- if (!$message) {
- $message = "Token group $token_group found.";
- }
-
- $this->assertTrue(in_array($token_group, $groups), $message, $group);
- }
-
- /**
- * Check to see if the specified token group is not present in the token
- * browser.
- *
- * @param string $token_group
- * The name of the token group.
- * @param string $message
- * (optional) A message to display with the assertion.
- * @param string $group
- * (optional) The group this message is not in, which is displayed in a
- * column in test output.
- */
- protected function assertTokenNotGroup($token_group, $message = '', $group = 'Other') {
- $groups = $this->getTokenGroups();
-
- if (!$message) {
- $message = "Token group $token_group not found.";
- }
-
- $this->assertFalse(in_array($token_group, $groups), $message, $group);
- }
-
- /**
- * Check to see if the specified token is present in the token browser.
- *
- * @param $token
- * The token name with the surrounding square brackets [].
- * @param string $parent
- * (optional) The parent CSS identifier of this token.
- * @param string $message
- * (optional) A message to display with the assertion.
- * @param string $group
- * (optional) The group this message is in, which is displayed in a column
- * in test output.
- */
- protected function assertTokenInTree($token, $parent = '', $message = '', $group = 'Other') {
- $xpath = $this->getXpathForTokenInTree($token, $parent);
-
- if (!$message) {
- $message = "Token $token found.";
- }
-
- $this->assertIdentical(1, count($this->xpath($xpath)), $message, $group);
- }
-
- /**
- * Check to see if the specified token is present in the token browser.
- *
- * @param $token
- * The token name with the surrounding square brackets [].
- * @param string $parent
- * (optional) The parent CSS identifier of this token.
- * @param string $message
- * (optional) A message to display with the assertion.
- * @param string $group
- * (optional) The group this message is in, which is displayed in a column
- * in test output.
- */
- protected function assertTokenNotInTree($token, $parent = '', $message = '', $group = 'Other') {
- $xpath = $this->getXpathForTokenInTree($token, $parent);
-
- if (!$message) {
- $message = "Token $token not found.";
- }
-
- $this->assertIdentical(0, count($this->xpath($xpath)), $message, $group);
- }
-
- /**
- * Get xpath to check for token in tree.
- *
- * @param $token
- * The token name with the surrounding square brackets [].
- * @param string $parent
- * (optional) The parent CSS identifier of this token.
- *
- * @return string
- * The xpath to check for the token and parent.
- */
- protected function getXpathForTokenInTree($token, $parent = '') {
- $xpath = "//tr";
- if ($parent) {
- $xpath .= '[@data-tt-parent-id="token-' . $parent . '"]';
- }
- $xpath .= '/td[contains(@class, "token-key") and text() = "' . $token . '"]';
- return $xpath;
- }
-}
diff --git a/modules/token/src/Tests/Tree/TreeTest.php b/modules/token/src/Tests/Tree/TreeTest.php
deleted file mode 100644
index ed1dd3c..0000000
--- a/modules/token/src/Tests/Tree/TreeTest.php
+++ /dev/null
@@ -1,148 +0,0 @@
-account = $this->drupalCreateUser(['administer account settings']);
- $this->drupalLogin($this->account);
- }
-
- /**
- * Test various tokens that are possible on the site.
- */
- public function testAllTokens() {
- $this->drupalGet($this->getTokenTreeUrl(['token_types' => 'all']));
-
- $this->assertTokenGroup('Current date');
- $this->assertTokenGroup('Site information');
-
- $this->assertTokenInTree('[current-date:html_date]', 'current-date');
- $this->assertTokenInTree('[current-date:html_week]', 'current-date');
- $this->assertTokenInTree('[date:html_date]', 'date');
- $this->assertTokenInTree('[date:html_week]', 'date');
-
- $this->assertTokenInTree('[current-user:account-name]', 'current-user');
- $this->assertTokenInTree('[user:account-name]', 'user');
-
- $this->assertTokenInTree('[current-page:url:unaliased]', 'current-page--url');
- $this->assertTokenInTree('[current-page:url:unaliased:args]', 'current-page--url--unaliased');
- $this->assertTokenInTree('[user:original:account-name]', 'user--original');
- }
-
- /**
- * Test various tokens that are possible on the site.
- */
- public function testGlobalTokens() {
- $this->drupalGet($this->getTokenTreeUrl());
-
- $this->assertTokenGroup('Current date');
- $this->assertTokenGroup('Site information');
-
- // Assert that non-global tokens are not listed.
- $this->assertTokenNotInTree('[user:account-name]', 'user');
- $this->assertTokenNotInTree('[user:original:account-name]', 'user--original');
-
- // Assert some of the global tokens, just to be sure.
- $this->assertTokenInTree('[current-date:html_date]', 'current-date');
- $this->assertTokenInTree('[current-date:html_week]', 'current-date');
-
- $this->assertTokenInTree('[current-user:account-name]', 'current-user');
-
- $this->assertTokenInTree('[current-page:url:unaliased]', 'current-page--url');
- $this->assertTokenInTree('[current-page:url:unaliased:args]', 'current-page--url--unaliased');
- }
-
- /**
- * Tests if the token browser displays the user tokens.
- */
- public function testUserTokens() {
- $this->drupalGet($this->getTokenTreeUrl(['token_types' => ['user']]));
-
- $this->assertTokenGroup('Users');
-
- $this->assertTokenInTree('[user:account-name]', 'user');
- $this->assertTokenInTree('[user:original:account-name]', 'user--original');
-
- // Assert some of the restricted tokens to ensure they are not shown.
- $this->assertTokenNotInTree('[user:one-time-login-url]', 'user');
- $this->assertTokenNotInTree('[user:original:cancel-url]', 'user--original');
-
- // Request with show_restricted set to TRUE to show restricted tokens and
- // check for them.
- $this->drupalGet($this->getTokenTreeUrl(['token_types' => ['user'], 'show_restricted' => TRUE]));
- $this->assertEqual('MISS', $this->drupalGetHeader('x-drupal-dynamic-cache'), 'Cache was not hit');
- $this->assertTokenInTree('[user:one-time-login-url]', 'user');
- $this->assertTokenInTree('[user:original:cancel-url]', 'user--original');
- }
-
- /**
- * Tests if the token browser displays the node tokens.
- */
- public function testNodeTokens() {
- $this->drupalGet($this->getTokenTreeUrl(['token_types' => ['node']]));
-
- $this->assertTokenGroup('Nodes');
-
- $this->assertTokenInTree('[node:body]', 'node');
- $this->assertTokenInTree('[node:author:original:account-name]', 'node--author--original');
- }
-
- /**
- * Get the URL for the token tree based on the specified options.
- *
- * The token tree route's URL requires CSRF and cannot be generated in the
- * test code. The CSRF token generated using the test runner's session is
- * different from the session inside the test environment. This is why the
- * link has to be generated inside the environment.
- *
- * This function calls a page in token_module_test module which generates the
- * link and the token. This then replaces the options query parameter with the
- * specified options.
- *
- * The page also uses a title callback to set title to a render array, which
- * allows us to test if [current-page:title] works properly.
- *
- * @param array $options
- * The options for the token tree browser.
- *
- * @return string
- * The complete URL of the token tree browser with the CSRF token.
- */
- protected function getTokenTreeUrl($options = []) {
- $this->drupalGet('token_module_test/browse');
- $this->assertTitle('Available Tokens | Drupal');
- $links = $this->xpath('//a[contains(@href, :href)]/@href', array(':href' => 'token/tree'));
- $link = $this->getAbsoluteUrl((string) current($links));
- if (!empty($options)) {
- $options = Json::encode($options);
- $link = str_replace('options=%5B%5D', 'options=' . urlencode($options), $link);
- }
- return $link;
- }
-}
diff --git a/modules/token/src/Token.php b/modules/token/src/Token.php
deleted file mode 100644
index 360ae35..0000000
--- a/modules/token/src/Token.php
+++ /dev/null
@@ -1,213 +0,0 @@
-tokenInfo)) {
- $cache_id = 'token_info_sorted:' . $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
- $cache = $this->cache->get($cache_id);
- if ($cache) {
- $this->tokenInfo = $cache->data;
- }
- else {
- $token_info = $this->moduleHandler->invokeAll('token_info');
- $this->moduleHandler->alter('token_info', $token_info);
-
- foreach (array_keys($token_info['types']) as $type_key) {
- if (isset($token_info['types'][$type_key]['type'])) {
- $base_type = $token_info['types'][$type_key]['type'];
- // If this token type extends another token type, then merge in
- // the base token type's tokens.
- if (isset($token_info['tokens'][$base_type])) {
- $token_info['tokens'] += [$type_key => []];
- $token_info['tokens'][$type_key] += $token_info['tokens'][$base_type];
- }
- }
- else {
- // Add a 'type' value to each token type information.
- $token_info['types'][$type_key]['type'] = $type_key;
- }
- }
-
- // Pre-sort tokens.
- $by_name = $this->prepareMultisort($token_info['types']);
- array_multisort($by_name, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE, $token_info['types']);
- foreach (array_keys($token_info['tokens']) as $type) {
- $by_name = $this->prepareMultisort($token_info['tokens'][$type]);
- array_multisort($by_name, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE, $token_info['tokens'][$type]);
- }
-
- $this->tokenInfo = $token_info;
- $this->cache->set($cache_id, $this->tokenInfo, CacheBackendInterface::CACHE_PERMANENT, array(
- static::TOKEN_INFO_CACHE_TAG,
- ));
- }
- }
-
- return $this->tokenInfo;
- }
-
- /**
- * Extracts data from the token data for use in array_multisort().
- *
- * @param array $token_info
- * List of tokens or token types, each element must have a name key.
- *
- * @return string[]
- * List of the names keyed by the token key.
- */
- protected function prepareMultisort($token_info) {
- $by_name = [];
- foreach ($token_info as $key => $token_info_element) {
- $by_name[$key] = $token_info_element['name'];
- }
- return $by_name;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getTokenInfo($token_type, $token) {
- if (empty($this->tokenInfo)) {
- $this->getInfo();
- }
-
- return isset($this->tokenInfo['tokens'][$token_type][$token]) ? $this->tokenInfo['tokens'][$token_type][$token] : NULL;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getTypeInfo($token_type) {
- if (empty($this->tokenInfo)) {
- $this->getInfo();
- }
-
- return isset($this->tokenInfo['types'][$token_type]) ? $this->tokenInfo['types'][$token_type] : NULL;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getGlobalTokenTypes() {
- if (empty($this->globalTokenTypes)) {
- $token_info = $this->getInfo();
- foreach ($token_info['types'] as $type => $type_info) {
- // If the token types has not specified that 'needs-data' => TRUE, then
- // it is a global token type that will always be replaced in any context.
- if (empty($type_info['needs-data'])) {
- $this->globalTokenTypes[] = $type;
- }
- }
- }
-
- return $this->globalTokenTypes;
- }
-
- /**
- * {@inheritdoc}
- */
- function getInvalidTokens($type, $tokens) {
- $token_info = $this->getInfo();
- $invalid_tokens = array();
-
- foreach ($tokens as $token => $full_token) {
- if (isset($token_info['tokens'][$type][$token])) {
- continue;
- }
-
- // Split token up if it has chains.
- $parts = explode(':', $token, 2);
-
- if (!isset($token_info['tokens'][$type][$parts[0]])) {
- // This is an invalid token (not defined).
- $invalid_tokens[] = $full_token;
- }
- elseif (count($parts) == 2) {
- $sub_token_info = $token_info['tokens'][$type][$parts[0]];
- if (!empty($sub_token_info['dynamic'])) {
- // If this token has been flagged as a dynamic token, skip it.
- continue;
- }
- elseif (empty($sub_token_info['type'])) {
- // If the token has chains, but does not support it, it is invalid.
- $invalid_tokens[] = $full_token;
- }
- else {
- // Recursively check the chained tokens.
- $sub_tokens = $this->findWithPrefix(array($token => $full_token), $parts[0]);
- $invalid_tokens = array_merge($invalid_tokens, $this->getInvalidTokens($sub_token_info['type'], $sub_tokens));
- }
- }
- }
-
- return $invalid_tokens;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getInvalidTokensByContext($value, array $valid_types = []) {
- if (in_array('all', $valid_types)) {
- $info = $this->getInfo();
- $valid_types = array_keys($info['types']);
- }
- else {
- // Add the token types that are always valid in global context.
- $valid_types = array_merge($valid_types, $this->getGlobalTokenTypes());
- }
-
- $invalid_tokens = array();
- $value_tokens = is_string($value) ? $this->scan($value) : $value;
-
- foreach ($value_tokens as $type => $tokens) {
- if (!in_array($type, $valid_types)) {
- // If the token type is not a valid context, its tokens are invalid.
- $invalid_tokens = array_merge($invalid_tokens, array_values($tokens));
- }
- else {
- // Check each individual token for validity.
- $invalid_tokens = array_merge($invalid_tokens, $this->getInvalidTokens($type, $tokens));
- }
- }
-
- array_unique($invalid_tokens);
- return $invalid_tokens;
- }
-
- /**
- * {@inheritdoc}
- */
- public function resetInfo() {
- parent::resetInfo();
- $this->globalTokenTypes = NULL;
- }
-
-}
diff --git a/modules/token/src/TokenEntityMapper.php b/modules/token/src/TokenEntityMapper.php
deleted file mode 100644
index 051df8f..0000000
--- a/modules/token/src/TokenEntityMapper.php
+++ /dev/null
@@ -1,82 +0,0 @@
-entityTypeManager = $entity_type_manager;
- $this->moduleHandler = $module_handler;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getEntityTypeMappings() {
- if (empty($this->entityMappings)) {
- foreach ($this->entityTypeManager->getDefinitions() as $entity_type => $info) {
- $this->entityMappings[$entity_type] = $info->get('token_type') ?: $entity_type;
- }
- // Allow modules to alter the mapping array.
- $this->moduleHandler->alter('token_entity_mapping', $this->entityMappings);
- }
-
- return $this->entityMappings;
- }
-
- /**
- * {@inheritdoc}
- */
- function getEntityTypeForTokenType($token_type, $fallback = FALSE) {
- if (empty($this->entityMappings)) {
- $this->getEntityTypeMappings();
- }
-
- $return = array_search($token_type, $this->entityMappings);
- return $return !== FALSE ? $return : ($fallback ? $token_type : FALSE);
- }
-
- /**
- * {@inheritdoc}
- */
- function getTokenTypeForEntityType($entity_type, $fallback = FALSE) {
- if (empty($this->entityMappings)) {
- $this->getEntityTypeMappings();
- }
-
- return isset($this->entityMappings[$entity_type]) ? $this->entityMappings[$entity_type] : ($fallback ? $entity_type : FALSE);
- }
-
- /**
- * {@inheritdoc}
- */
- public function resetInfo() {
- $this->entityMappings = NULL;
- }
-
-}
diff --git a/modules/token/src/TokenEntityMapperInterface.php b/modules/token/src/TokenEntityMapperInterface.php
deleted file mode 100644
index 5eb038e..0000000
--- a/modules/token/src/TokenEntityMapperInterface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-getDefinition('token');
- $definition->setClass('\Drupal\token\Token');
- }
-}
diff --git a/modules/token/src/TreeBuilder.php b/modules/token/src/TreeBuilder.php
deleted file mode 100644
index 80ebca2..0000000
--- a/modules/token/src/TreeBuilder.php
+++ /dev/null
@@ -1,267 +0,0 @@
-tokenService = $token_service;
- $this->entityMapper = $entity_mapper;
- $this->cacheBackend = $cache_backend;
- $this->languageManager = $language_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRenderable(array $token_types, array $options = []) {
- // Set default options.
- $options += [
- 'global_types' => TRUE,
- 'click_insert' => TRUE,
- 'show_restricted' => FALSE,
- 'show_nested' => FALSE,
- 'recursion_limit' => 3,
- ];
-
- $info = $this->tokenService->getInfo();
- if ($options['global_types']) {
- $token_types = array_merge($token_types, $this->tokenService->getGlobalTokenTypes());
- }
-
- $element = array(
- /*'#cache' => array(
- 'cid' => 'tree-rendered:' . hash('sha256', serialize(array('token_types' => $token_types, 'global_types' => NULL) + $variables)),
- 'tags' => array(Token::TOKEN_INFO_CACHE_TAG),
- ),*/
- );
-
- // @todo Find a way to use the render cache for this.
- /*if ($cached_output = token_render_cache_get($element)) {
- return $cached_output;
- }*/
-
- $tree_options = [
- 'flat' => TRUE,
- 'restricted' => $options['show_restricted'],
- 'nested' => $options['show_nested'],
- 'depth' => $options['recursion_limit'],
- ];
-
- $token_tree = [];
- foreach ($info['types'] as $type => $type_info) {
- if (!in_array($type, $token_types)) {
- continue;
- }
-
- $token_tree[$type] = $type_info;
- $token_tree[$type]['tokens'] = $this->buildTree($type, $tree_options);
- }
-
- $element += [
- '#type' => 'token_tree_table',
- '#token_tree' => $token_tree,
- '#show_restricted' => $options['show_restricted'],
- '#show_nested' => $options['show_nested'],
- '#click_insert' => $options['click_insert'],
- '#columns' => ['name', 'token', 'description'],
- '#empty' => t('No tokens available'),
- ];
-
- return $element;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildAllRenderable(array $options = []) {
- $info = $this->tokenService->getInfo();
- $token_types = array_keys($info['types']);
-
- // Disable merging in global types as we will be adding in all token types
- // explicitly. There is no difference in leaving this set to TRUE except for
- // an additional method call which is unnecessary.
- $options['global_types'] = FALSE;
- return $this->buildRenderable($token_types, $options);
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildTree($token_type, array $options = []) {
- $options += [
- 'restricted' => FALSE,
- 'depth' => 4,
- 'data' => [],
- 'values' => FALSE,
- 'flat' => FALSE,
- ];
-
- // Do not allow past the maximum token information depth.
- $options['depth'] = min($options['depth'], static::MAX_DEPTH);
-
- // If $token_type is an entity, make sure we are using the actual token type.
- if ($entity_token_type = $this->entityMapper->getTokenTypeForEntityType($token_type)) {
- $token_type = $entity_token_type;
- }
-
- $langcode = $this->languageManager->getCurrentLanguage()->getId();
- $tree_cid = "token_tree:{$token_type}:{$langcode}:{$options['depth']}";
-
- // If we do not have this base tree in the static cache, check the cache
- // otherwise generate and store it in the cache.
- if (!isset($this->builtTrees[$tree_cid])) {
- if ($cache = $this->cacheBackend->get($tree_cid)) {
- $this->builtTrees[$tree_cid] = $cache->data;
- }
- else {
- $options['parents'] = [];
- $this->builtTrees[$tree_cid] = $this->getTokenData($token_type, $options);
- $this->cacheBackend->set($tree_cid, $this->builtTrees[$tree_cid], Cache::PERMANENT, [Token::TOKEN_INFO_CACHE_TAG]);
- }
- }
-
- $tree = $this->builtTrees[$tree_cid];
-
- // If the user has requested a flat tree, convert it.
- if (!empty($options['flat'])) {
- $tree = $this->flattenTree($tree);
- }
-
- // Fill in token values.
- if (!empty($options['values'])) {
- $token_values = [];
- foreach ($tree as $token => $token_info) {
- if (!empty($token_info['dynamic']) || !empty($token_info['restricted'])) {
- continue;
- }
- elseif (!isset($token_info['value'])) {
- $token_values[$token_info['token']] = $token;
- }
- }
- if (!empty($token_values)) {
- $token_values = $this->tokenService->generate($token_type, $token_values, $options['data'], [], new BubbleableMetadata());
- foreach ($token_values as $token => $replacement) {
- $tree[$token]['value'] = $replacement;
- }
- }
- }
-
- return $tree;
- }
-
- /**
- * {@inheritdoc}
- */
- public function flattenTree(array $tree) {
- $result = [];
- foreach ($tree as $token => $token_info) {
- $result[$token] = $token_info;
- if (isset($token_info['children']) && is_array($token_info['children'])) {
- $result += $this->flattenTree($token_info['children']);
- }
- }
- return $result;
- }
-
- /**
- * Generate a token tree.
- *
- * @param string $token_type
- * The token type.
- * @param array $options
- * An associative array of additional options. See documentation for
- * TreeBuilderInterface::buildTree() for more information.
- *
- * @return array
- * The token data for the specified $token_type.
- *
- * @internal
- */
- protected function getTokenData($token_type, array $options) {
- $options += [
- 'parents' => [],
- ];
-
- $info = $this->tokenService->getInfo();
- if ($options['depth'] <= 0 || !isset($info['types'][$token_type]) || !isset($info['tokens'][$token_type])) {
- return [];
- }
-
- $tree = [];
- foreach ($info['tokens'][$token_type] as $token => $token_info) {
- // Build the raw token string.
- $token_parents = $options['parents'];
- if (empty($token_parents)) {
- // If the parents array is currently empty, assume the token type is its
- // parent.
- $token_parents[] = $token_type;
- }
- elseif (in_array($token, array_slice($token_parents, 1), TRUE)) {
- // Prevent duplicate recursive tokens. For example, this will prevent
- // the tree from generating the following tokens or deeper:
- // [comment:parent:parent]
- // [comment:parent:root:parent]
- continue;
- }
-
- $token_parents[] = $token;
- if (!empty($token_info['dynamic'])) {
- $token_parents[] = '?';
- }
- $raw_token = '[' . implode(':', $token_parents) . ']';
- $tree[$raw_token] = $token_info;
- $tree[$raw_token]['raw token'] = $raw_token;
-
- // Add the token's real name (leave out the base token type).
- $tree[$raw_token]['token'] = implode(':', array_slice($token_parents, 1));
-
- // Add the token's parent as its raw token value.
- if (!empty($options['parents'])) {
- $tree[$raw_token]['parent'] = '[' . implode(':', $options['parents']) . ']';
- }
-
- // Fetch the child tokens.
- if (!empty($token_info['type'])) {
- $child_options = $options;
- $child_options['depth']--;
- $child_options['parents'] = $token_parents;
- $tree[$raw_token]['children'] = $this->getTokenData($token_info['type'], $child_options);
- }
- }
-
- return $tree;
- }
-}
diff --git a/modules/token/src/TreeBuilderInterface.php b/modules/token/src/TreeBuilderInterface.php
deleted file mode 100644
index c4212c2..0000000
--- a/modules/token/src/TreeBuilderInterface.php
+++ /dev/null
@@ -1,79 +0,0 @@
- \Drupal::token()->replace('[current-page:title]'),
- '#type' => 'markup',
- ];
- return $build;
- }
-
- /**
- * Title callback for the page outputting a link.
- *
- * We are using a title callback instead of directly defining the title in the
- * routing YML file. This is so that we could return an array instead of a
- * simple string. This allows us to test if [current-page:title] works with
- * render arrays and other objects as titles.
- */
- public function getTitle() {
- return [
- '#type' => 'markup',
- '#markup' => 'Available Tokens',
- ];
- }
-
-}
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.info.yml b/modules/token/tests/modules/token_module_test/token_module_test.info.yml
deleted file mode 100644
index 342ef6c..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-type: module
-name: Token Module Test
-description: Testing module for token functionality.
-package: Testing
-# core: 8.x
-hidden: TRUE
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'token'
-datestamp: 1493466847
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.module b/modules/token/tests/modules/token_module_test/token_module_test.module
deleted file mode 100644
index c263320..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.module
+++ /dev/null
@@ -1,32 +0,0 @@
-get('token_page_tokens', array())) {
- $debug += array('tokens' => array(), 'data' => array(), 'options' => array());
- foreach (array_keys($debug['tokens']) as $token) {
- $debug['values'][$token] = \Drupal::token()->replace($token, $debug['data'], $debug['options']);
- }
- \Drupal::state()->set('token_page_tokens', $debug);
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave for Node entities.
- */
-function token_module_test_node_presave(NodeInterface $node) {
- // Transform tokens in the body.
- // @see \Drupal\token\Tests\TokenMenuTest::testMenuTokens()
- if ($node->hasField('body')) {
- $node->body->value = \Drupal::token()
- ->replace($node->body->value, ['node' => $node]);
- }
-}
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.routing.yml b/modules/token/tests/modules/token_module_test/token_module_test.routing.yml
deleted file mode 100644
index fb99f1c..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-token_module_test.browse:
- path: '/token_module_test/browse'
- defaults:
- _controller: '\Drupal\token_module_test\Controller\TokenTreeBrowseController::outputLink'
- _title_callback: '\Drupal\token_module_test\Controller\TokenTreeBrowseController::getTitle'
- requirements:
- _access: 'TRUE'
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.tokens.inc b/modules/token/tests/modules/token_module_test/token_module_test.tokens.inc
deleted file mode 100644
index ba8da53..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.tokens.inc
+++ /dev/null
@@ -1,13 +0,0 @@
- t('A test token with colons in the name'),
- 'description' => NULL,
- );
-
- return $info;
-}
diff --git a/modules/token/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml b/modules/token/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml
deleted file mode 100644
index a30d012..0000000
--- a/modules/token/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: de
-status: true
-dependencies:
- module:
- - image
- - user
-id: user.user.default
-targetEntityType: user
-bundle: user
-mode: default
-content:
- account:
- weight: -10
- user_picture:
- type: image_image
- settings:
- progress_indicator: throbber
- preview_image_style: thumbnail
- third_party_settings: { }
- weight: -1
- timezone:
- weight: 6
-hidden: { }
diff --git a/modules/token/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml b/modules/token/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml
deleted file mode 100644
index 45f6e82..0000000
--- a/modules/token/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-id: user.user.user_picture
-status: true
-langcode: en
-entity_type: user
-bundle: user
-field_name: user_picture
-label: Picture
-description: 'Your virtual face or picture.'
-required: false
-default_value: { }
-default_value_function: ''
-settings:
- file_extensions: 'png gif jpg jpeg'
- file_directory: pictures
- max_filesize: '30 KB'
- alt_field: false
- title_field: false
- max_resolution: 85x85
- min_resolution: ''
- default_image:
- uuid: null
- alt: ''
- title: ''
- width: null
- height: null
- alt_field_required: false
- title_field_required: false
-field_type: image
-dependencies:
- config:
- - field.storage.user.user_picture
diff --git a/modules/token/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml b/modules/token/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml
deleted file mode 100644
index 01d0939..0000000
--- a/modules/token/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-id: user.user_picture
-status: true
-langcode: en
-field_name: user_picture
-entity_type: user
-type: image
-settings:
- uri_scheme: public
- default_image:
- uuid: null
- alt: ''
- title: ''
- width: null
- height: null
-module: image
-locked: false
-cardinality: 1
-translatable: false
-indexes:
- target_id:
- - target_id
-dependencies:
- module:
- - image
- - user
diff --git a/modules/token/tests/modules/token_user_picture/token_user_picture.info.yml b/modules/token/tests/modules/token_user_picture/token_user_picture.info.yml
deleted file mode 100644
index 4f8b990..0000000
--- a/modules/token/tests/modules/token_user_picture/token_user_picture.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-type: module
-name: Token User picture
-description: Testing module that provides user pictures field.
-package: Testing
-# core: 8.x
-hidden: TRUE
-dependencies:
- - image
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'token'
-datestamp: 1493466847
diff --git a/modules/token/tests/src/Kernel/ArrayTest.php b/modules/token/tests/src/Kernel/ArrayTest.php
deleted file mode 100644
index a7f83ae..0000000
--- a/modules/token/tests/src/Kernel/ArrayTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
- 'a', 1 => 'b', 2 => 'c', 4 => 'd');
- $tokens = array(
- 'first' => 'a',
- 'last' => 'd',
- 'value:0' => 'a',
- 'value:2' => 'c',
- 'count' => 4,
- 'keys' => '0, 1, 2, 4',
- 'keys:value:3' => '4',
- 'keys:join' => '0124',
- 'reversed' => 'd, c, b, a',
- 'reversed:keys' => '4, 2, 1, 0',
- 'join:/' => 'a/b/c/d',
- 'join' => 'abcd',
- 'join:, ' => 'a, b, c, d',
- 'join: ' => 'a b c d',
- );
- $this->assertTokens('array', array('array' => $array), $tokens);
-
- // Test a mixed simple and render array.
- // 2 => c, 0 => a, 4 => d, 1 => b
- $array = array(
- '#property' => 'value',
- 0 => 'a',
- 1 => array('#markup' => 'b', '#weight' => 0.01),
- 2 => array('#markup' => 'c', '#weight' => -10),
- 4 => array('#markup' => 'd', '#weight' => 0),
- );
- $tokens = array(
- 'first' => 'c',
- 'last' => 'b',
- 'value:0' => 'a',
- 'value:2' => 'c',
- 'count' => 4,
- 'keys' => '2, 0, 4, 1',
- 'keys:value:3' => '1',
- 'keys:join' => '2041',
- 'reversed' => 'b, d, a, c',
- 'reversed:keys' => '1, 4, 0, 2',
- 'join:/' => 'c/a/d/b',
- 'join' => 'cadb',
- 'join:, ' => 'c, a, d, b',
- 'join: ' => 'c a d b',
- );
- $this->assertTokens('array', array('array' => $array), $tokens);
- }
-}
diff --git a/modules/token/tests/src/Kernel/BookTest.php b/modules/token/tests/src/Kernel/BookTest.php
deleted file mode 100644
index 67a13ee..0000000
--- a/modules/token/tests/src/Kernel/BookTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-installEntitySchema('user');
- $this->installEntitySchema('node');
- $this->installSchema('book', array('book'));
- $this->installSchema('node', array('node_access'));
- $this->installConfig(array('node', 'book', 'field'));
- }
-
- function testBookTokens() {
- $book = Node::create([
- 'type' => 'book',
- 'title' => 'Book Main Page',
- 'book' => ['bid' => 'new'],
- ]);
- $book->save();
-
- $page1 = Node::create([
- 'type' => 'book',
- 'title' => '1st Page',
- 'book' => ['bid' => $book->id(), 'pid' => $book->id()],
- ]);
- $page1->save();
-
- $page2 = Node::create([
- 'type' => 'book',
- 'title' => '2nd Page',
- 'book' => ['bid' => $book->id(), 'pid' => $page1->id()],
- ]);
- $page2->save();
-
- $book_title = $book->getTitle();
-
- $tokens = [
- 'nid' => $book->id(),
- 'title' => $book_title,
- 'book:title' => $book_title,
- 'book:root' => $book_title,
- 'book:root:nid' => $book->id(),
- 'book:root:title' => $book_title,
- 'book:root:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
- 'book:root:content-type' => 'Book page',
- 'book:parent' => null,
- 'book:parents' => null,
- ];
- $this->assertTokens('node', array('node' => $book), $tokens);
-
- $tokens = [
- 'nid' => $page1->id(),
- 'title' => $page1->getTitle(),
- 'book:title' => $book_title,
- 'book:root' => $book_title,
- 'book:root:nid' => $book->id(),
- 'book:root:title' => $book_title,
- 'book:root:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
- 'book:root:content-type' => 'Book page',
- 'book:parent:nid' => $book->id(),
- 'book:parent:title' => $book_title,
- 'book:parent:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
- 'book:parents:count' => 1,
- 'book:parents:join:/' => $book_title,
- ];
- $this->assertTokens('node', array('node' => $page1), $tokens);
-
- $tokens = [
- 'nid' => $page2->id(),
- 'title' => $page2->getTitle(),
- 'book:title' => $book_title,
- 'book:root' => $book_title,
- 'book:root:nid' => $book->id(),
- 'book:root:title' => $book_title,
- 'book:root:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
- 'book:root:content-type' => 'Book page',
- 'book:parent:nid' => $page1->id(),
- 'book:parent:title' => $page1->getTitle(),
- 'book:parent:url' => Url::fromRoute('entity.node.canonical', ['node' => $page1->id()], array('absolute' => TRUE))->toString(),
- 'book:parents:count' => 2,
- 'book:parents:join:/' => $book_title . '/' . $page1->getTitle(),
- ];
- $this->assertTokens('node', array('node' => $page2), $tokens);
- }
-}
diff --git a/modules/token/tests/src/Kernel/CommentTest.php b/modules/token/tests/src/Kernel/CommentTest.php
deleted file mode 100644
index 499f087..0000000
--- a/modules/token/tests/src/Kernel/CommentTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-installEntitySchema('node');
- $this->installEntitySchema('user');
- $this->installEntitySchema('comment');
- $this->installSchema('comment', ['comment_entity_statistics']);
-
- $node_type = NodeType::create(['type' => 'page', 'name' => t('Page')]);
- $node_type->save();
-
- $this->installConfig(['comment']);
-
- $this->addDefaultCommentField('node', 'page');
- }
-
- function testCommentTokens() {
- $node = Node::create([
- 'type' => 'page',
- 'title' => $this->randomMachineName()
- ]);
- $node->save();
-
- $parent_comment = Comment::create([
- 'entity_id' => $node->id(),
- 'entity_type' => 'node',
- 'field_name' => 'comment',
- 'name' => 'anonymous user',
- 'mail' => 'anonymous@example.com',
- 'subject' => $this->randomMachineName(),
- 'body' => $this->randomMachineName(),
- ]);
- $parent_comment->save();
-
- // Fix http://example.com/index.php/comment/1 fails 'url:path' test.
- $parent_comment_path = $parent_comment->url();
-
- $tokens = array(
- 'url' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->setAbsolute()->toString(),
- 'url:absolute' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->setAbsolute()->toString(),
- 'url:relative' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->toString(),
- 'url:path' => $parent_comment_path,
- 'parent:url:absolute' => NULL,
- );
- $this->assertTokens('comment', array('comment' => $parent_comment), $tokens);
-
- $comment = Comment::create([
- 'entity_id' => $node->id(),
- 'pid' => $parent_comment->id(),
- 'entity_type' => 'node',
- 'field_name' => 'comment',
- 'uid' => 1,
- 'name' => 'anonymous user',
- 'mail' => 'anonymous@example.com',
- 'subject' => $this->randomMachineName(),
- 'body' => $this->randomMachineName(),
- ]);
- $comment->save();
-
- // Fix http://example.com/index.php/comment/1 fails 'url:path' test.
- $comment_path = Url::fromRoute('entity.comment.canonical', array('comment' => $comment->id()))->toString();
-
- $tokens = array(
- 'url' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])->setAbsolute()->toString(),
- 'url:absolute' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])->setAbsolute()->toString(),
- 'url:relative' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])->toString(),
- 'url:path' => $comment_path,
- 'parent:url:absolute' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->setAbsolute()->toString(),
- );
- $this->assertTokens('comment', array('comment' => $comment), $tokens);
- }
-
-}
diff --git a/modules/token/tests/src/Kernel/DateTest.php b/modules/token/tests/src/Kernel/DateTest.php
deleted file mode 100644
index c25bf03..0000000
--- a/modules/token/tests/src/Kernel/DateTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-installConfig(['system', 'token_module_test']);
- }
-
- function testDateTokens() {
- $tokens = array(
- 'token_module_test' => '1984',
- 'invalid_format' => NULL,
- );
-
- $this->assertTokens('date', array('date' => 453859200), $tokens);
- }
-}
diff --git a/modules/token/tests/src/Kernel/EntityTest.php b/modules/token/tests/src/Kernel/EntityTest.php
deleted file mode 100644
index 7ff471d..0000000
--- a/modules/token/tests/src/Kernel/EntityTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
- 'Tags',
- 'vid' => 'tags',
- ]);
- $vocabulary->save();
-
- $this->installEntitySchema('taxonomy_term');
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
-
- $this->vocab = $vocabulary;
- }
-
- function testEntityMapping() {
- /** @var \Drupal\token\TokenEntityMapperInterface $mapper */
- $mapper = \Drupal::service('token.entity_mapper');
- $this->assertIdentical($mapper->getEntityTypeForTokenType('node'), 'node');
- $this->assertIdentical($mapper->getEntityTypeForTokenType('term'), 'taxonomy_term');
- $this->assertIdentical($mapper->getEntityTypeForTokenType('vocabulary'), 'taxonomy_vocabulary');
- $this->assertIdentical($mapper->getEntityTypeForTokenType('invalid'), FALSE);
- $this->assertIdentical($mapper->getEntityTypeForTokenType('invalid', TRUE), 'invalid');
- $this->assertIdentical($mapper->getTokenTypeForEntityType('node'), 'node');
- $this->assertIdentical($mapper->getTokenTypeForEntityType('taxonomy_term'), 'term');
- $this->assertIdentical($mapper->getTokenTypeForEntityType('taxonomy_vocabulary'), 'vocabulary');
- $this->assertIdentical($mapper->getTokenTypeForEntityType('invalid'), FALSE);
- $this->assertIdentical($mapper->getTokenTypeForEntityType('invalid', TRUE), 'invalid');
-
- // Test that when we send the mis-matched entity type into token_replace()
- // that we still get the tokens replaced.
- $vocabulary = entity_load('taxonomy_vocabulary', 'tags');
- $term = $this->addTerm($vocabulary);
- $this->assertIdentical(\Drupal::token()->replace('[vocabulary:name]', array('taxonomy_vocabulary' => $vocabulary)), $vocabulary->label());
- $this->assertIdentical(\Drupal::token()->replace('[term:name][term:vocabulary:name]', array('taxonomy_term' => $term)), $term->label() . $vocabulary->label());
- }
-
- function addTerm(VocabularyInterface $vocabulary, array $term = array()) {
- $term += array(
- 'name' => Unicode::strtolower($this->randomMachineName(5)),
- 'vid' => $vocabulary->id(),
- );
- $term = entity_create('taxonomy_term', $term);
- $term->save();
- return $term;
- }
-
- /**
- * Test the [entity:original:*] tokens.
- */
- function testEntityOriginal() {
- $node = Node::create(['type' => 'page', 'title' => 'Original title']);
- $node->save();
-
- $tokens = array(
- 'nid' => $node->id(),
- 'title' => 'Original title',
- 'original' => NULL,
- 'original:nid' => NULL,
- );
- $this->assertTokens('node', array('node' => $node), $tokens);
-
- // Emulate the original entity property that would be available from
- // node_save() and change the title for the node.
- $node->original = entity_load_unchanged('node', $node->id());
- $node->title = 'New title';
-
- $tokens = array(
- 'nid' => $node->id(),
- 'title' => 'New title',
- 'original' => 'Original title',
- 'original:nid' => $node->id(),
- );
- $this->assertTokens('node', array('node' => $node), $tokens);
- }
-}
diff --git a/modules/token/tests/src/Kernel/FieldTest.php b/modules/token/tests/src/Kernel/FieldTest.php
deleted file mode 100644
index de94699..0000000
--- a/modules/token/tests/src/Kernel/FieldTest.php
+++ /dev/null
@@ -1,708 +0,0 @@
-installEntitySchema('user');
- $this->installEntitySchema('node');
- $this->installEntitySchema('taxonomy_term');
-
- // Create the article content type with a text field.
- $node_type = NodeType::create([
- 'type' => 'article',
- ]);
- $node_type->save();
-
- $field_storage = FieldStorageConfig::create([
- 'field_name' => 'test_field',
- 'entity_type' => 'node',
- 'type' => 'text',
- ]);
- $field_storage->save();
-
- $field = FieldConfig::create([
- 'field_name' => 'test_field',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'label' => 'Test field',
- ]);
- $field->save();
-
- // Create a reference field with the same name on user.
- $field_storage = FieldStorageConfig::create([
- 'field_name' => 'test_field',
- 'entity_type' => 'user',
- 'type' => 'entity_reference',
- ]);
- $field_storage->save();
-
- $field = FieldConfig::create([
- 'field_name' => 'test_field',
- 'entity_type' => 'user',
- 'bundle' => 'user',
- 'label' => 'Test field',
- ]);
- $field->save();
-
- $this->testFormat = FilterFormat::create([
- 'format' => 'test',
- 'weight' => 1,
- 'filters' => [
- 'filter_html_escape' => ['status' => TRUE],
- ],
- ]);
- $this->testFormat->save();
-
- // Create a multi-value list_string field.
- $field_storage = FieldStorageConfig::create([
- 'field_name' => 'test_list',
- 'entity_type' => 'node',
- 'type' => 'list_string',
- 'cardinality' => 2,
- 'settings' => [
- 'allowed_values' => [
- 'key1' => 'value1',
- 'key2' => 'value2',
- ]
- ],
- ]);
- $field_storage->save();
-
- $this->field = FieldConfig::create([
- 'field_name' => 'test_list',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- ])->save();
-
- // Add an untranslatable node reference field.
- FieldStorageConfig::create([
- 'field_name' => 'test_reference',
- 'type' => 'entity_reference',
- 'entity_type' => 'node',
- 'settings' => [
- 'target_type' => 'node',
- ],
- 'translatable' => FALSE,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'test_reference',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'label' => 'Test reference',
- ])->save();
-
- // Add an untranslatable taxonomy term reference field.
- $this->vocabulary = $this->createVocabulary();
-
- FieldStorageConfig::create([
- 'field_name' => 'test_term_reference',
- 'type' => 'entity_reference',
- 'entity_type' => 'node',
- 'settings' => [
- 'target_type' => 'taxonomy_term',
- ],
- 'translatable' => FALSE,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'test_term_reference',
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'label' => 'Test term reference',
- 'settings' => [
- 'handler' => 'default:taxonomy_term',
- 'handler_settings' => [
- 'target_bundles' => [
- $this->vocabulary->id() => $this->vocabulary->id(),
- ],
- ],
- ],
- ])->save();
-
- // Add a field to terms of the created vocabulary.
- $storage = FieldStorageConfig::create([
- 'field_name' => 'term_field',
- 'entity_type' => 'taxonomy_term',
- 'type' => 'text',
- ]);
- $storage->save();
- $field = FieldConfig::create([
- 'field_name' => 'term_field',
- 'entity_type' => 'taxonomy_term',
- 'bundle' => $this->vocabulary->id(),
- ]);
- $field->save();
-
- // Add a second language.
- $language = ConfigurableLanguage::create([
- 'id' => 'de',
- 'label' => 'German',
- ]);
- $language->save();
-
- // Add a datetime field.
- $field_datetime_storage = FieldStorageConfig::create(array(
- 'field_name' => 'field_datetime',
- 'type' => 'datetime',
- 'entity_type' => 'node',
- 'settings' => array('datetime_type' => DateTimeItem::DATETIME_TYPE_DATETIME),
- ));
- $field_datetime_storage->save();
- $field_datetime = FieldConfig::create([
- 'field_storage' => $field_datetime_storage,
- 'bundle' => 'article',
- ]);
- $field_datetime->save();
-
- // Add a daterange field.
- $field_daterange_storage = FieldStorageConfig::create(array(
- 'field_name' => 'field_daterange',
- 'type' => 'daterange',
- 'entity_type' => 'node',
- 'settings' => array('datetime_type' => DateRangeItem::DATETIME_TYPE_DATETIME),
- ));
- $field_daterange_storage->save();
- $field_daterange = FieldConfig::create([
- 'field_storage' => $field_daterange_storage,
- 'bundle' => 'article',
- ]);
- $field_daterange->save();
- }
-
- /**
- * Tests [entity:field_name] tokens.
- */
- public function testEntityFieldTokens() {
- // Create a node with a value in its fields and test its tokens.
- $entity = Node::create([
- 'title' => 'Test node title',
- 'type' => 'article',
- 'test_field' => [
- 'value' => 'foo',
- 'format' => $this->testFormat->id(),
- ],
- 'test_list' => [
- 'value1',
- 'value2',
- ],
- ]);
- $entity->save();
- $this->assertTokens('node', ['node' => $entity], [
- 'test_field' => Markup::create('foo'),
- 'test_field:0' => Markup::create('foo'),
- 'test_field:0:value' => 'foo',
- 'test_field:value' => 'foo',
- 'test_field:0:format' => $this->testFormat->id(),
- 'test_field:format' => $this->testFormat->id(),
- 'test_list:0' => Markup::create('value1'),
- 'test_list:1' => Markup::create('value2'),
- 'test_list:0:value' => Markup::create('value1'),
- 'test_list:value' => Markup::create('value1'),
- 'test_list:1:value' => Markup::create('value2'),
- ]);
-
- // Verify that no third token was generated for the list_string field.
- $this->assertNoTokens('node', ['node' => $entity], [
- 'test_list:2',
- 'test_list:2:value',
- ]);
-
- // Test the test_list token metadata.
- $tokenService = \Drupal::service('token');
- $token_info = $tokenService->getTokenInfo('node', 'test_list');
- $this->assertEqual($token_info['name'], 'test_list');
- $this->assertEqual($token_info['module'], 'token');
- $this->assertEqual($token_info['type'], 'list');
- $typeInfo = $tokenService->getTypeInfo('list');
- $this->assertEqual($typeInfo['name'], 'List of test_list values');
- $this->assertEqual($typeInfo['type'], 'list');
-
- // Create a node type that does not have test_field field.
- $node_type = NodeType::create([
- 'type' => 'page',
- ]);
- $node_type->save();
-
- $node_without_test_field = Node::create([
- 'title' => 'Node without test_field',
- 'type' => 'page',
- ]);
- $node_without_test_field->save();
-
- // Ensure that trying to generate tokens for a non-existing field does not
- // throw an exception.
- $this->assertNoTokens('node', ['node' => $node_without_test_field], ['test_field']);
-
- // Create a node without a value in the text field and test its token.
- $entity = Node::create([
- 'title' => 'Test node title',
- 'type' => 'article',
- ]);
- $entity->save();
-
- $this->assertNoTokens('node', ['node' => $entity], [
- 'test_field',
- ]);
- }
-
- /**
- * Tests the token metadata for a field token.
- */
- public function testFieldTokenInfo() {
- /** @var \Drupal\token\Token $tokenService */
- $tokenService = \Drupal::service('token');
-
- // Test the token info of the text field of the artcle content type.
- $token_info = $tokenService->getTokenInfo('node', 'test_field');
- $this->assertEqual($token_info['name'], 'Test field', 'The token info name is correct.');
- $this->assertEqual($token_info['description'], 'Text (formatted) field.', 'The token info description is correct.');
- $this->assertEqual($token_info['module'], 'token', 'The token info module is correct.');
-
- // Now create two more content types that share the field but the last
- // of them sets a different label. This should show an alternative label
- // at the token info.
- $node_type = NodeType::create([
- 'type' => 'article2',
- ]);
- $node_type->save();
- $field = FieldConfig::create([
- 'field_name' => 'test_field',
- 'entity_type' => 'node',
- 'bundle' => 'article2',
- 'label' => 'Test field',
- ]);
- $field->save();
-
- $node_type = NodeType::create([
- 'type' => 'article3',
- ]);
- $node_type->save();
- $field = FieldConfig::create([
- 'field_name' => 'test_field',
- 'entity_type' => 'node',
- 'bundle' => 'article3',
- 'label' => 'Different test field',
- ]);
- $field->save();
-
- $token_info = $tokenService->getTokenInfo('node', 'test_field');
- $this->assertEqual($token_info['name'], 'Test field', 'The token info name is correct.');
- $this->assertEqual((string) $token_info['description'], 'Text (formatted) field. Also known as Different test field .', 'When a field is used in several bundles with different labels, this is noted at the token info description.');
- $this->assertEqual($token_info['module'], 'token', 'The token info module is correct.');
- $this->assertEqual($token_info['type'], 'node-test_field', 'The field property token info type is correct.');
-
- // Test field property token info.
- $token_info = $tokenService->getTokenInfo('node-test_field', 'value');
- $this->assertEqual($token_info['name'], 'Text', 'The field property token info name is correct.');
- // This particular field property description happens to be empty.
- $this->assertEqual((string) $token_info['description'], '', 'The field property token info description is correct.');
- $this->assertEqual($token_info['module'], 'token', 'The field property token info module is correct.');
- }
-
- /**
- * Test tokens on node with the token view mode overriding default formatters.
- */
- public function testTokenViewMode() {
- $value = 'A really long string that should be trimmed by the special formatter on token view we are going to have.';
-
- // The formatter we are going to use will eventually call Unicode::strlen.
- // This expects that the Unicode has already been explicitly checked, which
- // happens in DrupalKernel. But since that doesn't run in kernel tests, we
- // explicitly call this here.
- Unicode::check();
-
- // Create a node with a value in the text field and test its token.
- $entity = Node::create([
- 'title' => 'Test node title',
- 'type' => 'article',
- 'test_field' => [
- 'value' => $value,
- 'format' => $this->testFormat->id(),
- ],
- ]);
- $entity->save();
-
- $this->assertTokens('node', ['node' => $entity], [
- 'test_field' => Markup::create($value),
- ]);
-
- // Now, create a token view mode which sets a different format for
- // test_field. When replacing tokens, this formatter should be picked over
- // the default formatter for the field type.
- // @see field_tokens().
- $view_mode = EntityViewMode::create([
- 'id' => 'node.token',
- 'targetEntityType' => 'node',
- ]);
- $view_mode->save();
- $entity_display = entity_get_display('node', 'article', 'token');
- $entity_display->setComponent('test_field', [
- 'type' => 'text_trimmed',
- 'settings' => [
- 'trim_length' => 50,
- ]
- ]);
- $entity_display->save();
-
- $this->assertTokens('node', ['node' => $entity], [
- 'test_field' => Markup::create(substr($value, 0, 50)),
- ]);
- }
-
- /**
- * Test that tokens are properly created for an entity's base fields.
- */
- public function testBaseFieldTokens() {
- // Create a new contact_message entity and verify that tokens are generated
- // for its base fields. The contact_message entity type is used because it
- // provides no tokens by default.
- $contact_form = ContactForm::create([
- 'id' => 'form_id',
- ]);
- $contact_form->save();
-
- $entity = Message::create([
- 'contact_form' => 'form_id',
- 'uuid' => '123',
- 'langcode' => 'en',
- 'name' => 'Test name',
- 'mail' => 'Test mail',
- 'subject' => 'Test subject',
- 'message' => 'Test message',
- 'copy' => FALSE,
- ]);
- $entity->save();
- $this->assertTokens('contact_message', ['contact_message' => $entity], [
- 'uuid' => Markup::create('123'),
- 'langcode' => Markup::create('English'),
- 'name' => Markup::create('Test name'),
- 'mail' => Markup::create('Test mail'),
- 'subject' => Markup::create('Test subject'),
- 'message' => Markup::create('Test message'),
- 'copy' => 'Off',
- ]);
-
- // Test the metadata of one of the tokens.
- $tokenService = \Drupal::service('token');
- $token_info = $tokenService->getTokenInfo('contact_message', 'subject');
- $this->assertEquals($token_info['name'], 'Subject');
- $this->assertEquals($token_info['description'], 'Text (plain) field.');
- $this->assertEquals($token_info['module'], 'token');
-
- // Verify that node entity type doesn't have a uid token.
- $this->assertNull($tokenService->getTokenInfo('node', 'uid'));
- }
-
- /*
- * Tests chaining entity reference tokens.
- */
- public function testEntityReferenceTokens() {
- $reference = Node::create([
- 'title' => 'Test node to reference',
- 'type' => 'article',
- 'test_field' => [
- 'value' => 'foo',
- 'format' => $this->testFormat->id(),
- ]
- ]);
- $reference->save();
- $term_reference_field_value = $this->randomString();
- $term_reference = $this->createTerm($this->vocabulary, [
- 'name' => 'Term to reference',
- 'term_field' => [
- 'value' => $term_reference_field_value,
- 'format' => $this->testFormat->id(),
- ],
- ]);
- $entity = Node::create([
- 'title' => 'Test entity reference',
- 'type' => 'article',
- 'test_reference' => ['target_id' => $reference->id()],
- 'test_term_reference' => ['target_id' => $term_reference->id()],
- ]);
- $entity->save();
-
- $this->assertTokens('node', ['node' => $entity], [
- 'test_reference:entity:title' => Markup::create('Test node to reference'),
- 'test_reference:entity:test_field' => Markup::create('foo'),
- 'test_term_reference:entity:term_field' => Html::escape($term_reference_field_value),
- 'test_reference:target_id' => $reference->id(),
- 'test_term_reference:target_id' => $term_reference->id(),
- 'test_term_reference:entity:url:path' => '/' . $term_reference->toUrl('canonical')->getInternalPath(),
- // Expects the entity's label to be returned for :entity tokens.
- 'test_reference:entity' => $reference->label(),
- 'test_term_reference:entity' => $term_reference->label(),
- ]);
-
- // Test some non existent tokens.
- $this->assertNoTokens('node', ['node' => $entity], [
- 'test_reference:1:title',
- 'test_reference:entity:does_not_exist',
- 'test_reference:does_not:exist',
- 'test_term_reference:does_not_exist',
- 'test_term_reference:does:not:exist',
- 'test_term_reference:does_not_exist:0',
- 'non_existing_field:entity:title',
- ]);
-
- /** @var \Drupal\token\Token $token_service */
- $token_service = \Drupal::service('token');
-
- $token_info = $token_service->getTokenInfo('node', 'test_reference');
- $this->assertEquals('Test reference', $token_info['name']);
- $this->assertEquals('Entity reference field.', (string) $token_info['description']);
- $this->assertEquals('token', $token_info['module']);
- $this->assertEquals('node-test_reference', $token_info['type']);
-
- // Test target_id field property token info.
- $token_info = $token_service->getTokenInfo('node-test_reference', 'target_id');
- $this->assertEquals('Content ID', $token_info['name']);
- $this->assertEquals('token', $token_info['module']);
- $this->assertEquals('token', $token_info['module']);
-
- // Test entity field property token info.
- $token_info = $token_service->getTokenInfo('node-test_reference', 'entity');
- $this->assertEquals('Content', $token_info['name']);
- $this->assertEquals('The referenced entity', $token_info['description']);
- $this->assertEquals('token', $token_info['module']);
- $this->assertEquals('node', $token_info['type']);
-
- // Test entity field property token info of the term reference.
- $token_info = $token_service->getTokenInfo('node-test_term_reference', 'entity');
- $this->assertEquals('Taxonomy term', $token_info['name']);
- $this->assertEquals('The referenced entity', $token_info['description']);
- $this->assertEquals('token', $token_info['module']);
- $this->assertEquals('term', $token_info['type']);
-
- }
-
- /**
- * Tests support for cardinality > 1 for entity reference tokens.
- */
- public function testEntityReferenceTokensCardinality() {
- /** @var \Drupal\field\FieldStorageConfigInterface $storage */
- $storage = FieldStorageConfig::load('node.test_term_reference');
- $storage->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
- $storage->save();
-
- // Add a few terms.
- $terms = [];
- $terms_value = [];
- foreach (range(1, 3) as $i) {
- $terms_value[$i] = $this->randomString();
- $terms[$i] = $this->createTerm($this->vocabulary, [
- 'name' => $this->randomString(),
- 'term_field' => [
- 'value' => $terms_value[$i],
- 'format' => $this->testFormat->id(),
- ],
- ]);
- }
-
- $entity = Node::create([
- 'title' => 'Test multivalue chained tokens',
- 'type' => 'article',
- 'test_term_reference' => [
- ['target_id' => $terms[1]->id()],
- ['target_id' => $terms[2]->id()],
- ['target_id' => $terms[3]->id()],
- ],
- ]);
- $entity->save();
-
- $this->assertTokens('node', ['node' => $entity], [
- 'test_term_reference:0:entity:term_field' => Html::escape($terms[1]->term_field->value),
- 'test_term_reference:1:entity:term_field' => Html::escape($terms[2]->term_field->value),
- 'test_term_reference:2:entity:term_field' => Html::escape($terms[3]->term_field->value),
- 'test_term_reference:0:target_id' => $terms[1]->id(),
- 'test_term_reference:1:target_id' => $terms[2]->id(),
- 'test_term_reference:2:target_id' => $terms[3]->id(),
- // Expects the entity's label to be returned for :entity tokens.
- 'test_term_reference:0:entity' => $terms[1]->label(),
- 'test_term_reference:1:entity' => $terms[2]->label(),
- 'test_term_reference:2:entity' => $terms[3]->label(),
- // To make sure tokens without an explicit delta can also be replaced in
- // the same token replacement call.
- 'test_term_reference:entity:term_field' => Html::escape($terms[1]->term_field->value),
- 'test_term_reference:target_id' => $terms[1]->id(),
- ]);
-
- // Test some non existent tokens.
- $this->assertNoTokens('node', ['node' => $entity], [
- 'test_term_reference:3:term_field',
- 'test_term_reference:0:does_not_exist',
- 'test_term_reference:1:does:not:exist',
- 'test_term_reference:1:2:does_not_exist',
- ]);
- }
-
- /**
- * Test tokens for multilingual fields and entities.
- */
- public function testMultilingualFields() {
- // Create an english term and add a german translation for it.
- $term = $this->createTerm($this->vocabulary, [
- 'name' => 'english-test-term',
- 'langcode' => 'en',
- 'term_field' => [
- 'value' => 'english-term-field-value',
- 'format' => $this->testFormat->id(),
- ],
- ]);
- $term->addTranslation('de', [
- 'name' => 'german-test-term',
- 'term_field' => [
- 'value' => 'german-term-field-value',
- 'format' => $this->testFormat->id(),
- ],
- ])->save();
- $german_term = $term->getTranslation('de');
-
- // Create an english node, add a german translation for it and add the
- // english term to the english node's entity reference field and the
- // german term to the german's entity reference field.
- $node = Node::create([
- 'title' => 'english-node-title',
- 'type' => 'article',
- 'test_term_reference' => [
- 'target_id' => $term->id(),
- ],
- 'test_field' => [
- 'value' => 'test-english-field',
- 'format' => $this->testFormat->id(),
- ],
- ]);
- $node->addTranslation('de', [
- 'title' => 'german-node-title',
- 'test_term_reference' => [
- 'target_id' => $german_term->id(),
- ],
- 'test_field' => [
- 'value' => 'test-german-field',
- 'format' => $this->testFormat->id(),
- ],
- ])->save();
-
- // Verify the :title token of the english node and the :name token of the
- // english term it refers to. Also verify the value of the term's field.
- $this->assertTokens('node', ['node' => $node], [
- 'title' => 'english-node-title',
- 'test_term_reference:entity:name' => 'english-test-term',
- 'test_term_reference:entity:term_field:value' => 'english-term-field-value',
- 'test_term_reference:entity:term_field' => 'english-term-field-value',
- 'test_field' => 'test-english-field',
- 'test_field:value' => 'test-english-field',
- ]);
-
- // Same test for the german node and its german term.
- $german_node = $node->getTranslation('de');
- $this->assertTokens('node', ['node' => $german_node], [
- 'title' => 'german-node-title',
- 'test_term_reference:entity:name' => 'german-test-term',
- 'test_term_reference:entity:term_field:value' => 'german-term-field-value',
- 'test_term_reference:entity:term_field' => 'german-term-field-value',
- 'test_field' => 'test-german-field',
- 'test_field:value' => 'test-german-field',
- ]);
-
- // If the langcode is specified, it should have priority over the node's
- // active language.
- $tokens = [
- 'test_field' => 'test-german-field',
- 'test_field:value' => 'test-german-field',
- 'test_term_reference:entity:term_field' => 'german-term-field-value',
- 'test_term_reference:entity:term_field:value' => 'german-term-field-value',
- ];
- $this->assertTokens('node', ['node' => $node], $tokens, ['langcode' => 'de']);
- }
-
- /**
- * Tests support for a datetime fields.
- */
- public function testDatetimeFieldTokens() {
-
- $node = Node::create([
- 'title' => 'Node for datetime field',
- 'type' => 'article',
- ]);
-
- $node->set('field_datetime', '1925-09-28T00:00:00')->save();
- $this->assertTokens('node', ['node' => $node], [
- 'field_datetime:date:custom:Y' => '1925',
- 'field_datetime:date:html_month' => '1925-09',
- 'field_datetime:date' => $node->field_datetime->date->getTimestamp(),
- ]);
- }
-
- /**
- * Tests support for a daterange fields.
- */
- public function testDatetimeRangeFieldTokens() {
-
- $node = Node::create([
- 'title' => 'Node for daterange field',
- 'type' => 'article',
- ]);
-
- $node->field_daterange->value = '2013-12-22T00:00:00';
- $node->field_daterange->end_value = '2016-08-26T00:00:00';
- $node->save();
- $this->assertTokens('node', ['node' => $node], [
- 'field_daterange:start_date:html_month' => '2013-12',
- 'field_daterange:start_date:custom:Y' => '2013',
- 'field_daterange:end_date:custom:Y' => '2016',
- 'field_daterange:start_date' => $node->field_daterange->start_date->getTimestamp(),
- ]);
- }
-
-}
diff --git a/modules/token/tests/src/Kernel/FileTest.php b/modules/token/tests/src/Kernel/FileTest.php
deleted file mode 100644
index 3a6a7fd..0000000
--- a/modules/token/tests/src/Kernel/FileTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-installEntitySchema('file');
- }
-
- function testFileTokens() {
- // Create a test file object.
- $file = entity_create('file', array(
- 'fid' => 1,
- 'filename' => 'test.png',
- 'filesize' => 100,
- 'uri' => 'public://images/test.png',
- 'filemime' => 'image/png',
- ));
-
- $tokens = array(
- 'basename' => 'test.png',
- 'extension' => 'png',
- 'size-raw' => 100,
- );
- $this->assertTokens('file', array('file' => $file), $tokens);
-
- // Test a file with no extension and a fake name.
- $file->filename = 'Test PNG image';
- $file->uri = 'public://images/test';
-
- $tokens = array(
- 'basename' => 'test',
- 'extension' => '',
- 'size-raw' => 100,
- );
- $this->assertTokens('file', array('file' => $file), $tokens);
- }
-}
diff --git a/modules/token/tests/src/Kernel/KernelTestBase.php b/modules/token/tests/src/Kernel/KernelTestBase.php
deleted file mode 100644
index a9657f6..0000000
--- a/modules/token/tests/src/Kernel/KernelTestBase.php
+++ /dev/null
@@ -1,33 +0,0 @@
-installSchema('system', ['router', 'url_alias']);
- \Drupal::service('router.builder')->rebuild();
- $this->installConfig(['system']);
- }
-
-}
diff --git a/modules/token/tests/src/Kernel/NodeTest.php b/modules/token/tests/src/Kernel/NodeTest.php
deleted file mode 100644
index e44b9ab..0000000
--- a/modules/token/tests/src/Kernel/NodeTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-installEntitySchema('user');
- $this->installEntitySchema('node');
-
- $node_type = NodeType::create([
- 'type' => 'page',
- 'name' => 'Basic page',
- 'description' => "Use basic pages for your static content, such as an 'About us' page.",
- ]);
- $node_type->save();
- $node_type = NodeType::create([
- 'type' => 'article',
- 'name' => 'Article',
- 'description' => "Use articles for time-sensitive content like news, press releases or blog posts.",
- ]);
- $node_type->save();
- }
-
- function testNodeTokens() {
- $page = Node::create([
- 'type' => 'page',
- 'title' => 'Source Title',
- 'revision_log' => $this->randomMachineName(),
- 'path' => array('alias' => '/content/source-node')
- ]);
- $page->save();
- $tokens = array(
- 'log' => $page->revision_log->value,
- 'url:path' => '/content/source-node',
- 'url:absolute' => Url::fromRoute('entity.node.canonical', ['node' => $page->id()], array('absolute' => TRUE))->toString(),
- 'url:relative' => Url::fromRoute('entity.node.canonical', ['node' => $page->id()], array('absolute' => FALSE))->toString(),
- 'url:unaliased:path' => "/node/{$page->id()}",
- 'content-type' => 'Basic page',
- 'content-type:name' => 'Basic page',
- 'content-type:machine-name' => 'page',
- 'content-type:description' => "Use basic pages for your static content, such as an 'About us' page.",
- 'content-type:node-count' => 1,
- 'content-type:edit-url' => Url::fromRoute('entity.node_type.edit_form', ['node_type' => 'page'], array('absolute' => TRUE))->toString(),
- 'source:title' => 'Source Title',
- // Deprecated tokens.
- 'type' => 'page',
- 'type-name' => 'Basic page',
- 'url:alias' => '/content/source-node',
- );
- $this->assertTokens('node', array('node' => $page), $tokens);
-
- $article = Node::create([
- 'type' => 'article',
- 'title' => 'Source Title',
- ]);
- $article->save();
- $tokens = array(
- 'log' => '',
- 'url:path' => "/node/{$article->id()}",
- 'url:absolute' => Url::fromRoute('entity.node.canonical', ['node' => $article->id()], array('absolute' => TRUE))->toString(),
- 'url:relative' => Url::fromRoute('entity.node.canonical', ['node' => $article->id()], array('absolute' => FALSE))->toString(),
- 'url:unaliased:path' => "/node/{$article->id()}",
- 'content-type' => 'Article',
- 'content-type:name' => 'Article',
- 'content-type:machine-name' => 'article',
- 'content-type:description' => "Use articles for time-sensitive content like news, press releases or blog posts.",
- 'content-type:node-count' => 1,
- 'content-type:edit-url' => Url::fromRoute('entity.node_type.edit_form', ['node_type' => 'article'], array('absolute' => TRUE))->toString(),
- 'source:title' => 'Source Title',
- // Deprecated tokens.
- 'type' => 'article',
- 'type-name' => 'Article',
- 'url:alias' => "/node/{$article->id()}",
- );
- $this->assertTokens('node', array('node' => $article), $tokens);
- }
-}
diff --git a/modules/token/tests/src/Kernel/RandomTest.php b/modules/token/tests/src/Kernel/RandomTest.php
deleted file mode 100644
index a4b0930..0000000
--- a/modules/token/tests/src/Kernel/RandomTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
- '[0-9]{1,}',
- 'hash:md5' => '[0-9a-f]{32}',
- 'hash:sha1' => '[0-9a-f]{40}',
- 'hash:sha256' => '[0-9a-f]{64}',
- 'hash:invalid-algo' => NULL,
- );
-
- $first_set = $this->assertTokens('random', array(), $tokens, array('regex' => TRUE));
- $second_set = $this->assertTokens('random', array(), $tokens, array('regex' => TRUE));
- foreach ($first_set as $token => $value) {
- $this->assertNotIdentical($first_set[$token], $second_set[$token]);
- }
- }
-}
diff --git a/modules/token/tests/src/Kernel/TaxonomyTest.php b/modules/token/tests/src/Kernel/TaxonomyTest.php
deleted file mode 100644
index 73274df..0000000
--- a/modules/token/tests/src/Kernel/TaxonomyTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-installEntitySchema('taxonomy_term');
-
- // Create the default tags vocabulary.
- $vocabulary = Vocabulary::create([
- 'name' => 'Tags',
- 'vid' => 'tags',
- ]);
- $vocabulary->save();
- $this->vocab = $vocabulary;
- }
-
- /**
- * Test the additional taxonomy term tokens.
- */
- function testTaxonomyTokens() {
- $root_term = $this->addTerm($this->vocab, array('name' => 'Root term', 'path' => array('alias' => '/root-term')));
- $tokens = array(
- 'url' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $root_term->id()], array('absolute' => TRUE))->toString(),
- 'url:absolute' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $root_term->id()], array('absolute' => TRUE))->toString(),
- 'url:relative' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $root_term->id()], array('absolute' => FALSE))->toString(),
- 'url:path' => '/root-term',
- 'url:unaliased:path' => "/taxonomy/term/{$root_term->id()}",
- 'edit-url' => Url::fromRoute('entity.taxonomy_term.edit_form', ['taxonomy_term' => $root_term->id()], array('absolute' => TRUE))->toString(),
- 'parents' => NULL,
- 'parents:count' => NULL,
- 'parents:keys' => NULL,
- 'root' => NULL,
- // Deprecated tokens
- 'url:alias' => '/root-term',
- );
- $this->assertTokens('term', array('term' => $root_term), $tokens);
-
- $parent_term = $this->addTerm($this->vocab, array('name' => 'Parent term', 'parent' => $root_term->id()));
- $tokens = array(
- 'url' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $parent_term->id()], array('absolute' => TRUE))->toString(),
- 'url:absolute' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $parent_term->id()], array('absolute' => TRUE))->toString(),
- 'url:relative' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $parent_term->id()], array('absolute' => FALSE))->toString(),
- 'url:path' => "/taxonomy/term/{$parent_term->id()}",
- 'url:unaliased:path' => "/taxonomy/term/{$parent_term->id()}",
- 'edit-url' => Url::fromRoute('entity.taxonomy_term.edit_form', ['taxonomy_term' => $parent_term->id()], array('absolute' => TRUE))->toString(),
- 'parents' => 'Root term',
- 'parents:count' => 1,
- 'parents:keys' => $root_term->id(),
- 'root' => $root_term->label(),
- 'root:tid' => $root_term->id(),
- // Deprecated tokens
- 'url:alias' => "/taxonomy/term/{$parent_term->id()}",
- );
- $this->assertTokens('term', array('term' => $parent_term), $tokens);
-
- $term = $this->addTerm($this->vocab, array('name' => 'Test term', 'parent' => $parent_term->id()));
- $tokens = array(
- 'parents' => 'Root term, Parent term',
- 'parents:count' => 2,
- 'parents:keys' => implode(', ', array($root_term->id(), $parent_term->id())),
- );
- $this->assertTokens('term', array('term' => $term), $tokens);
- }
-
- /**
- * Test the additional vocabulary tokens.
- */
- function testVocabularyTokens() {
- $vocabulary = $this->vocab;
- $tokens = array(
- 'machine-name' => 'tags',
- 'edit-url' => Url::fromRoute('entity.taxonomy_vocabulary.edit_form', ['taxonomy_vocabulary' => $vocabulary->id()], array('absolute' => TRUE))->toString(),
- );
- $this->assertTokens('vocabulary', array('vocabulary' => $vocabulary), $tokens);
- }
-
- function addVocabulary(array $vocabulary = array()) {
- $vocabulary += array(
- 'name' => Unicode::strtolower($this->randomMachineName(5)),
- 'nodes' => array('article' => 'article'),
- );
- $vocabulary = entity_create('taxonomy_vocabulary', $vocabulary)->save();
- return $vocabulary;
- }
-
- function addTerm($vocabulary, array $term = array()) {
- $term += array(
- 'name' => Unicode::strtolower($this->randomMachineName(5)),
- 'vid' => $vocabulary->id(),
- );
- $term = entity_create('taxonomy_term', $term);
- $term->save();
- return $term;
- }
-
- /**
- * Test the multilingual terms.
- */
- function testMultilingualTerms() {
- // Add a second language.
- $language = ConfigurableLanguage::createFromLangcode('de');
- $language->save();
-
- // Create an english parent term and add a german translation for it.
- $parent_term = $this->addTerm($this->vocab, [
- 'name' => 'english-parent-term',
- 'langcode' => 'en',
- ]);
- $parent_term->addTranslation('de', [
- 'name' => 'german-parent-term',
- ])->save();
-
- // Create a term related to the parent term.
- $child_term = $this->addTerm($this->vocab, [
- 'name' => 'english-child-term',
- 'langcode' => 'en',
- 'parent' => $parent_term->id(),
- ]);
- $child_term->addTranslation('de', [
- 'name' => 'german-child-term',
- ])->save();
-
- // Expect the parent term to be in the specified language.
- $this->assertTokens('term', array('term' => $child_term), ['parents' => 'german-parent-term'], ['langcode' => 'de']);
- }
-}
diff --git a/modules/token/tests/src/Kernel/UnitTest.php b/modules/token/tests/src/Kernel/UnitTest.php
deleted file mode 100644
index c91f194..0000000
--- a/modules/token/tests/src/Kernel/UnitTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-tokenService = \Drupal::token();
- }
-
- /**
- * Test invalid tokens.
- */
- public function testGetInvalidTokens() {
- $tests = array();
- $tests[] = array(
- 'valid tokens' => array(
- '[node:title]',
- '[node:created:short]',
- '[node:created:custom:invalid]',
- '[node:created:custom:mm-YYYY]',
- '[node:colons:in:name]',
- '[site:name]',
- '[site:slogan]',
- '[current-date:short]',
- '[current-user:uid]',
- '[current-user:ip-address]',
- ),
- 'invalid tokens' => array(
- '[node:title:invalid]',
- '[node:created:invalid]',
- '[node:created:short:invalid]',
- '[node:colons:in:name:invalid]',
- '[invalid:title]',
- '[site:invalid]',
- '[user:ip-address]',
- '[user:uid]',
- '[comment:cid]',
- // Deprecated tokens
- '[node:tnid]',
- '[node:type]',
- '[node:type-name]',
- '[date:short]',
- ),
- 'types' => array('node'),
- );
- $tests[] = array(
- 'valid tokens' => array(
- '[node:title]',
- '[node:created:short]',
- '[node:created:custom:invalid]',
- '[node:created:custom:mm-YYYY]',
- '[node:colons:in:name]',
- '[site:name]',
- '[site:slogan]',
- '[user:uid]',
- '[current-date:short]',
- '[current-user:uid]',
- ),
- 'invalid tokens' => array(
- '[node:title:invalid]',
- '[node:created:invalid]',
- '[node:created:short:invalid]',
- '[node:colons:in:name:invalid]',
- '[invalid:title]',
- '[site:invalid]',
- '[user:ip-address]',
- '[comment:cid]',
- // Deprecated tokens
- '[node:tnid]',
- '[node:type]',
- '[node:type-name]',
- ),
- 'types' => array('all'),
- );
-
- foreach ($tests as $test) {
- $tokens = array_merge($test['valid tokens'], $test['invalid tokens']);
- shuffle($tokens);
-
- $invalid_tokens = $this->tokenService->getInvalidTokensByContext(implode(' ', $tokens), $test['types']);
-
- sort($invalid_tokens);
- sort($test['invalid tokens']);
- $this->assertEqual($invalid_tokens, $test['invalid tokens'], 'Invalid tokens detected properly: ' . implode(', ', $invalid_tokens));
- }
- }
-
- /**
- * Test that tokens are generated only for content entities.
- */
- public function testContentEntityOnlyTokens() {
- // Verify that type and token info for a config entity is not generated.
- $this->assertNull($this->tokenService->getTokenInfo('user_role', 'original'));
- $this->assertNull($this->tokenService->getTokenInfo('user_role', 'url'));
- $this->assertNull($this->tokenService->getTypeInfo('user_role'));
- }
-}
diff --git a/modules/token/token.drush.inc b/modules/token/token.drush.inc
deleted file mode 100644
index b31b8d7..0000000
--- a/modules/token/token.drush.inc
+++ /dev/null
@@ -1,20 +0,0 @@
- $problem) {
- if (!empty($problem['problems'])) {
- $problems = array_unique($problem['problems']);
-
- $build = [
- '#theme' => 'item_list',
- '#items' => $problems,
- ];
-
- $requirements['token-' . $problem_key] = array(
- 'title' => $problem['label'],
- 'value' => \Drupal::service('renderer')->renderPlain($build),
- 'severity' => $problem['severity'],
- );
- }
- }
- }
-
- return $requirements;
-}
-
-/**
- * Implements hook_install().
- */
-function token_install() {
- // Create a token view mode for each entity type.
- $info = \Drupal::entityTypeManager()->getDefinitions();
- foreach ($info as $entity_type => $entity_type_info) {
- // We're only interested in entity types with a view builder.
- if (!$entity_type_info->getViewBuilderClass()) {
- continue;
- }
- // Try to find a token view mode for that entity type.
- $storage = \Drupal::entityTypeManager()->getStorage('entity_view_mode');
- // Add a token view mode if it does not already exist.
- if (!$storage->load("$entity_type.token")) {
- $storage->create(array(
- 'targetEntityType' => $entity_type,
- 'id' => "$entity_type.token",
- 'status' => TRUE,
- 'label' => t('Token'),
- ))->save();
- }
- }
-}
-
-/**
- * Build a list of Drupal 6 tokens and their Drupal 7 token names.
- */
-function _token_upgrade_token_list() {
- $tokens = array(
- // Global tokens
- 'user-name' => 'current-user:name',
- 'user-id' => 'current-user:id',
- 'user-mail' => 'current-user:mail',
- 'site-url' => 'site:url',
- 'site-name' => 'site:name',
- 'site-slogan' => 'site:slogan',
- 'site-mission' => 'site:mission',
- 'site-mail' => 'site:mail',
- 'site-date' => 'date:short',
- //'site-date-' => '', // Date tokens expanded below
- 'current-page-path' => 'current-page:path',
- 'current-page-url' => 'current-page:url',
- 'page-number' => 'current-page:page-number',
-
- // Comment tokens
- 'comment-cid' => 'comment:cid',
- 'comment-nid' => 'comment:node:nid',
- 'comment-title' => 'comment:title',
- 'comment-body' => 'comment:body',
- 'comment-author-name' => 'comment:author:name',
- 'comment-author-mail' => 'comment:author:mail',
- //'comment-body-format' => '',
- //'comment-' => '', // Date tokens expanded below
- 'comment-node-title' => 'comment:node',
-
- // Node tokens
- 'nid' => 'node:nid',
- 'type' => 'node:type',
- 'type-name' => 'node:type-name',
- 'language' => 'node:language',
- 'title' => 'node:title',
- 'author-uid' => 'node:author:uid',
- 'author-name' => 'node:author:name',
- 'author-mail' => 'node:author:mail',
- 'node_comment_count' => 'node:comment-count',
- 'unread_comment_count' => 'node:comment-count-new',
- 'log' => 'node:log',
- //'' => '', // Date tokens expanded below
- //'mod-' => '', // Date tokens expanded below
- 'menupath' => 'node:menu-link:parent:path][node:menu-link',
- 'menu' => 'node:menu-link:menu-name',
- 'menu-link-title' => 'node:menu-link',
- 'menu-link-mlid' => 'node:menu-link:mlid',
- 'menu-link-plid' => 'node:menu-link:parent:mlid',
- //'term' => 'node:term',
- //'term-id' => 'node:term:tid',
- //'vocab' => 'node:term:vocabulary',
- //'vocab-id' => 'node:term:vocabulary:vid',
-
- // Book tokens
- //'book' => 'node:book',
- //'book_id' => 'node:book:bid',
- //'bookpath' => 'node:book:path',
-
- // Taxonomy tokens
- 'tid' => 'term:tid',
- 'cat' => 'term:name',
- 'cat-description' => 'term:description',
- 'vid' => 'term:vocabulary:vid',
- 'vocab' => 'term:vocabulary',
- 'vocab-description' => 'term:vocabulary:description',
-
- // User tokens
- 'user' => 'user:name',
- 'uid' => 'user:uid',
- 'mail' => 'user:mail',
- 'reg-date' => 'user:created',
- 'reg-since' => 'user:created:since',
- //'user-created' => '', // Date tokens expanded below
- 'log-date' => 'user:last-login',
- 'log-since' => 'user:last-login:since',
- //'user-last-login' => '', // Date tokens expanded below
- //'date-in-tz' => '',
- 'account-url' => 'user:url',
- 'account-edit' => 'user:edit-url',
- );
-
- // Account for date tokens which need to be expanded.
- $tokens += _token_upgrade_token_date_list('site-', 'site:date');
- $tokens += _token_upgrade_token_date_list('', 'node:created');
- $tokens += _token_upgrade_token_date_list('mod-', 'node:changed');
- //$tokens += _token_upgrade_token_date_list('node-revision-', 'node:changed');
- $tokens += _token_upgrade_token_date_list('comment-', 'comment:created');
- $tokens += _token_upgrade_token_date_list('user-register-', 'user:created');
- $tokens += _token_upgrade_token_date_list('user-last-login-', 'user:last-login');
-
- return $tokens;
-}
-
-/**
- * Build a list of Drupal 6 date tokens and their Drupal 7 token names.
- */
-function _token_upgrade_token_date_list($old_token, $new_token) {
- $tokens = array();
- $formats = array(
- 'yyyy' => 'Y',
- 'yy' => 'y',
- 'month' => 'F',
- 'mon' => 'M',
- 'mm' => 'm',
- 'm' => 'n',
- 'ww' => 'W',
- 'date' => 'N',
- 'day' => 'l',
- 'ddd' => 'D',
- 'dd' => 'd',
- 'd' => 'j',
- );
- foreach ($formats as $token_format => $date_format) {
- $tokens[$old_token . $token_format] = "$new_token:custom:$date_format";
- }
- $tokens[$old_token . 'raw'] = "$new_token:raw";
- $tokens[$old_token . 'since'] = "$new_token:since";
- return $tokens;
-}
-
-/**
- * Update a string containing Drupal 6 style tokens to Drupal 7 style tokens.
- *
- * @param $text
- * A string containing tokens.
- * @param $updates
- * An optional array of Drupal 7 tokens keyed by their Drupal 6 token name.
- * The default tokens will be merged into this array. Note neither the old
- * or new token names should include the surrounding bracket ([ and ])
- * characters.
- * @return
- * A string with the tokens upgraded
- *
- * @see _token_upgrade_token_list()
- */
-function token_update_token_text($text, $updates = array(), $leading = '[', $trailing = ']') {
- $updates += _token_upgrade_token_list();
- $regex = '/' . preg_quote($leading, '/') . '([^\s]*)' . preg_quote($trailing, '/') . '/';
- preg_match_all($regex, $text, $matches);
-
- foreach ($matches[1] as $index => $old_token) {
- if (isset($updates[$old_token])) {
- $new_token = $updates[$old_token];
- $text = str_replace("{$leading}{$old_token}{$trailing}", "[$new_token]", $text);
- // Also replace any tokens that have a -raw suffix.
- $text = str_replace("{$leading}{$old_token}-raw{$trailing}", "[$new_token]", $text);
- }
- }
-
- return $text;
-}
-
-/**
- * Get token problems.
- */
-function token_get_token_problems() {
- // @todo Improve the duplicate checking to report which modules are the offenders.
- //$token_info = array();
- //foreach (module_implements('token_info') as $module) {
- // $module_token_info = module_invoke($module, 'token_info');
- // if (in_array($module, _token_core_supported_modules())) {
- // $module .= '/token';
- // }
- // if (isset($module_token_info['types'])) {
- // if (is_array($module_token_info['types'])) {
- // foreach (array_keys($module_token_info['types']) as $type) {
- // if (is_array($module_token_info['types'][$type])) {
- // $module_token_info['types'][$type] += array('module' => $module);
- // }
- // }
- // }
- // }
- // if (isset($module_token_info['tokens'])) {
- // if (is_array($module_token_info['tokens'])) {
- //
- // }
- // }
- // if (is_array($module_token_info)) {
- // $token_info = array_merge_recursive($token_info, $module_token_info);
- // }
- //}
-
- $token_info = \Drupal::token()->getInfo();
- $token_problems = array(
- 'not-array' => array(
- 'label' => t('Tokens or token types not defined as arrays'),
- 'severity' => REQUIREMENT_ERROR,
- ),
- 'missing-info' => array(
- 'label' => t('Tokens or token types missing name property'),
- 'severity' => REQUIREMENT_WARNING,
- ),
- 'type-no-tokens' => array(
- 'label' => t('Token types do not have any tokens defined'),
- 'severity' => REQUIREMENT_INFO,
- ),
- 'tokens-no-type' => array(
- 'label' => t('Token types are not defined but have tokens'),
- 'severity' => REQUIREMENT_INFO,
- ),
- 'duplicate' => array(
- 'label' => t('Token or token types are defined by multiple modules'),
- 'severity' => REQUIREMENT_ERROR,
- ),
- );
-
- // Check token types for problems.
- foreach ($token_info['types'] as $type => $type_info) {
- $real_type = !empty($type_info['type']) ? $type_info['type'] : $type;
- if (!is_array($type_info)) {
- $token_problems['not-array']['problems'][] = "\$info['types']['$type']";
- continue;
- }
- elseif (!isset($type_info['name'])) {
- $token_problems['missing-info']['problems'][] = "\$info['types']['$type']";
- }
- elseif (is_array($type_info['name'])) {
- $token_problems['duplicate']['problems'][] = "\$info['types']['$type']";
- }
- elseif (empty($token_info['tokens'][$real_type])) {
- $token_problems['type-no-tokens']['problems'][] = "\$info['types']['$real_type']";
- }
- }
-
- // Check tokens for problems.
- foreach ($token_info['tokens'] as $type => $tokens) {
- if (!is_array($tokens)) {
- $token_problems['not-array']['problems'][] = "\$info['tokens']['$type']";
- continue;
- }
- else {
- foreach (array_keys($tokens) as $token) {
- if (!is_array($tokens[$token])) {
- $token_problems['not-array']['problems'][] = "\$info['tokens']['$type']['$token']";
- continue;
- }
- elseif (!isset($tokens[$token]['name'])) {
- $token_problems['missing-info']['problems'][] = "\$info['tokens']['$type']['$token']";
- }
- elseif (is_array($tokens[$token]['name'])) {
- $token_problems['duplicate']['problems'][] = "\$info['tokens']['$type']['$token']";
- }
- }
- }
- if (!isset($token_info['types'][$type])) {
- $token_problems['tokens-no-type']['problems'][] = "\$info['types']['$type']";
- }
- }
-
- return $token_problems;
-}
\ No newline at end of file
diff --git a/modules/token/token.libraries.yml b/modules/token/token.libraries.yml
deleted file mode 100644
index 5c7ca14..0000000
--- a/modules/token/token.libraries.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-jquery.treeTable:
- remote: 'http://plugins.jquery.com/treetable/'
- version: 3.2.0
- license:
- name: MIT
- url: https://github.com/ludo/jquery-treetable/blob/3.2.0/MIT-LICENSE.txt
- gpl-compatible: true
- js:
- js/jquery.treetable.js: {}
- css:
- component:
- css/jquery.treetable.css: {}
- css/token.treetable.theme.css: {}
- dependencies:
- - core/jquery
-token:
- version: VERSION
- js:
- js/token.js: {}
- css:
- component:
- css/token.css: {}
- dependencies:
- - core/jquery
- - core/drupal
diff --git a/modules/token/token.links.task.yml b/modules/token/token.links.task.yml
deleted file mode 100644
index e89ce16..0000000
--- a/modules/token/token.links.task.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-token.devel_entities:
- class: \Drupal\Core\Menu\LocalTaskDefault
- deriver: \Drupal\token\Plugin\Derivative\DevelLocalTask
diff --git a/modules/token/token.module b/modules/token/token.module
deleted file mode 100644
index 32a38da..0000000
--- a/modules/token/token.module
+++ /dev/null
@@ -1,788 +0,0 @@
-buildAllRenderable([
- 'click_insert' => FALSE,
- 'show_restricted' => TRUE,
- 'show_nested' => FALSE,
- ]);
- $output = '' . t('About') . ' ';
- $output .= '' . t('The Token module provides a user interface for the site token system. It also adds some additional tokens that are used extensively during site development. Tokens are specially formatted chunks of text that serve as placeholders for a dynamically generated value. For more information, covering both the token system and the additional tools provided by the Token module, see the online documentation .', [':online' => 'https://www.drupal.org/documentation/modules/token', ':project' => 'https://www.drupal.org/project/token']) . '
';
- $output .= '' . t('Uses') . ' ';
- $output .= '' . t('Your website uses a shared token system for exposing and using placeholder tokens and their appropriate replacement values. This allows for any module to provide placeholder tokens for strings without having to reinvent the wheel. It also ensures consistency in the syntax used for tokens, making the system as a whole easier for end users to use.') . '
';
- $output .= '';
- $output .= '' . t('The list of the currently available tokens on this site are shown below.') . ' ';
- $output .= '' . \Drupal::service('renderer')->render($token_tree) . ' ';
- $output .= ' ';
- return $output;
- }
-}
-
-/**
- * Return an array of the core modules supported by token.module.
- */
-function _token_core_supported_modules() {
- return array('book', 'field', 'menu_ui');
-}
-
-/**
- * Implements hook_theme().
- */
-function token_theme() {
- $info['token_tree_link'] = [
- 'variables' => [
- 'token_types' => [],
- 'global_types' => TRUE,
- 'click_insert' => TRUE,
- 'show_restricted' => FALSE,
- 'show_nested' => FALSE,
- 'recursion_limit' => 3,
- 'text' => NULL,
- 'options' => [],
- ],
- 'file' => 'token.pages.inc',
- ];
-
- return $info;
-}
-
-/**
- * Implements hook_block_view_alter().
- */
-function token_block_view_alter(&$build, BlockPluginInterface $block) {
- $label = $build['#configuration']['label'];
- if ($label != '') {
- // The label is automatically escaped, avoid escaping it twice.
- // @todo https://www.drupal.org/node/2580723 will add a method or option
- // to the token API to do this, use that when available.
- $bubbleable_metadata = BubbleableMetadata::createFromRenderArray($build);
- $build['#configuration']['label'] = PlainTextOutput::renderFromHtml(\Drupal::token()->replace($label, [], [], $bubbleable_metadata));
- $bubbleable_metadata->applyTo($build);
- }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function token_form_block_form_alter(&$form, FormStateInterface $form_state) {
- $token_tree = [
- '#theme' => 'token_tree_link',
- '#token_types' => [],
- ];
- $rendered_token_tree = \Drupal::service('renderer')->render($token_tree);
- $form['settings']['label']['#description'] =
- t('This field supports tokens. @browse_tokens_link', ['@browse_tokens_link' => $rendered_token_tree])
- ;
- $form['settings']['label']['#element_validate'][] = 'token_element_validate';
- $form['settings']['label'] += ['#token_types' => []];
-}
-
-/**
- * Implements hook_field_info_alter().
- */
-function token_field_info_alter(&$info) {
- $defaults = array(
- 'taxonomy_term_reference' => 'taxonomy_term_reference_plain',
- 'number_integer' => 'number_unformatted',
- 'number_decimal' => 'number_unformatted',
- 'number_float' => 'number_unformatted',
- 'file' => 'file_url_plain',
- 'image' => 'file_url_plain',
- 'text' => 'text_default',
- 'text_long' => 'text_default',
- 'text_with_summary' => 'text_default',
- 'list_integer' => 'list_default',
- 'list_float' => 'list_default',
- 'list_string' => 'list_default',
- 'list_boolean' => 'list_default',
- );
- foreach ($defaults as $field_type => $default_token_formatter) {
- if (isset($info[$field_type])) {
- $info[$field_type] += array('default_token_formatter' => $default_token_formatter);
- }
- }
-}
-
-/**
- * Implements hook_date_format_insert().
- */
-function token_date_format_insert() {
- token_clear_cache();
-}
-
-/**
- * Implements hook_date_format_delete().
- */
-function token_date_format_delete() {
- token_clear_cache();
-}
-
-/**
- * Implements hook_field_storage_config_presave().
- */
-function token_field_config_presave($instance) {
- token_clear_cache();
-}
-
-/**
- * Implements hook_field_storage_config_delete().
- */
-function token_field_config_delete($instance) {
- token_clear_cache();
-}
-
-/**
- * Clear token caches and static variables.
- */
-function token_clear_cache() {
- \Drupal::token()->resetInfo();
- \Drupal::service('token.entity_mapper')->resetInfo();
- drupal_static_reset('token_menu_link_load_all_parents');
- drupal_static_reset('token_book_link_load');
-}
-
-/**
- * Implements hook_entity_type_alter().
- *
- * Because some token types to do not match their entity type names, we have to
- * map them to the proper type. This is purely for other modules' benefit.
- *
- * @see \Drupal\token\TokenEntityMapperInterface::getEntityTypeMappings()
- * @see http://drupal.org/node/737726
- */
-function token_entity_type_alter(array &$entity_types) {
- $devel_exists = \Drupal::moduleHandler()->moduleExists('devel');
- /* @var $entity_types EntityTypeInterface[] */
- foreach ($entity_types as $entity_type_id => $entity_type) {
- if (!$entity_type->get('token_type')) {
- // Fill in default token types for entities.
- switch ($entity_type_id) {
- case 'taxonomy_term':
- case 'taxonomy_vocabulary':
- // Stupid taxonomy token types...
- $entity_type->set('token_type', str_replace('taxonomy_', '', $entity_type_id));
- break;
-
- default:
- // By default the token type is the same as the entity type.
- $entity_type->set('token_type', $entity_type_id);
- break;
- }
- }
-
- if ($devel_exists
- && $entity_type->hasViewBuilderClass()
- && ($canonical = $entity_type->getLinkTemplate('canonical'))
- && !$entity_type->hasLinkTemplate('token-devel')) {
- $entity_type->setLinkTemplate('token-devel', $canonical . '/devel/token');
- }
- }
-}
-
-/**
- * Implements hook_entity_view_modes_info().
- */
-
-/**
- * Implements hook_module_implements_alter().
- *
- * Adds missing token support for core modules.
- */
-function token_module_implements_alter(&$implementations, $hook) {
- module_load_include('inc', 'token', 'token.tokens');
-
- if ($hook == 'tokens' || $hook == 'token_info' || $hook == 'token_info_alter' || $hook == 'tokens_alter') {
- foreach (_token_core_supported_modules() as $module) {
- if (\Drupal::moduleHandler()->moduleExists($module) && function_exists($module . '_' . $hook)) {
- $implementations[$module] = TRUE;
- }
- }
- // Move token.module to get included first since it is responsible for
- // other modules.
- if (isset($implementations['token'])) {
- unset($implementations['token']);
- $implementations = array_merge(array('token' => 'tokens'), $implementations);
- }
- }
-}
-
-/**
- * Return the module responsible for a token.
- *
- * @param string $type
- * The token type.
- * @param string $name
- * The token name.
- *
- * @return mixed
- * The value of $info['tokens'][$type][$name]['module'] from token info, or
- * NULL if the value does not exist.
- */
-function _token_module($type, $name) {
- $token_info = \Drupal::token()->getTokenInfo($type, $name);
- return isset($token_info['module']) ? $token_info['module'] : NULL;
-}
-
-/**
- * Validate a form element that should have tokens in it.
- *
- * Form elements that want to add this validation should have the #token_types
- * parameter defined.
- *
- * For example:
- * @code
- * $form['my_node_text_element'] = array(
- * '#type' => 'textfield',
- * '#title' => t('Some text to token-ize that has a node context.'),
- * '#default_value' => 'The title of this node is [node:title].',
- * '#element_validate' => array('token_element_validate'),
- * '#token_types' => array('node'),
- * '#min_tokens' => 1,
- * '#max_tokens' => 10,
- * );
- * @endcode
- */
-function token_element_validate($element, FormStateInterface $form_state) {
- $value = isset($element['#value']) ? $element['#value'] : $element['#default_value'];
-
- if (!Unicode::strlen($value)) {
- // Empty value needs no further validation since the element should depend
- // on using the '#required' FAPI property.
- return $element;
- }
-
- $tokens = \Drupal::token()->scan($value);
- $title = empty($element['#title']) ? $element['#parents'][0] : $element['#title'];
-
- // Validate if an element must have a minimum number of tokens.
- if (isset($element['#min_tokens']) && count($tokens) < $element['#min_tokens']) {
- $error = \Drupal::translation()->formatPlural($element['#min_tokens'], '%name must contain at least one token.', '%name must contain at least @count tokens.', array('%name' => $title));
- $form_state->setError($element, $error);
- }
-
- // Validate if an element must have a maximum number of tokens.
- if (isset($element['#max_tokens']) && count($tokens) > $element['#max_tokens']) {
- $error = \Drupal::translation()->formatPlural($element['#max_tokens'], '%name must contain at most one token.', '%name must contain at most @count tokens.', array('%name' => $title));
- $form_state->setError($element, $error);
- }
-
- // Check if the field defines specific token types.
- if (isset($element['#token_types'])) {
- $invalid_tokens = \Drupal::token()->getInvalidTokensByContext($tokens, $element['#token_types']);
- if ($invalid_tokens) {
- $form_state->setError($element, t('%name is using the following invalid tokens: @invalid-tokens.', array('%name' => $title, '@invalid-tokens' => implode(', ', $invalid_tokens))));
- }
- }
-
- return $element;
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function token_form_field_config_edit_form_alter(&$form, FormStateInterface $form_state) {
- $field_config = $form_state->getFormObject()->getEntity();
- $field_storage = $field_config->getFieldStorageDefinition();
- if ($field_storage->isLocked()) {
- return;
- }
- $field_type = $field_storage->getType();
- if (($field_type == 'file' || $field_type == 'image') && isset($form['settings']['file_directory'])) {
- // GAH! We can only support global tokens in the upload file directory path.
- $form['settings']['file_directory']['#element_validate'][] = 'token_element_validate';
- // Date support needs to be implicitly added, as while technically it's not
- // a global token, it is a not only used but is the default value.
- // https://www.drupal.org/node/2642160
- $form['settings']['file_directory'] += array('#token_types' => array('date'));
- $form['settings']['file_directory']['#description'] .= ' ' . t('This field supports tokens.');
- }
-
- // Note that the description is tokenized via token_field_widget_form_alter().
- $form['description']['#element_validate'][] = 'token_element_validate';
- $form['description'] += array('#token_types' => array());
-
- $form['token_tree'] = array(
- '#theme' => 'token_tree_link',
- '#token_types' => array(),
- '#weight' => $form['description']['#weight'] + 0.5,
- );
-}
-
-/**
- * Implements hook_form_BASE_FORM_ID_alter().
- *
- * Alters the configure action form to add token context validation and
- * adds the token tree for a better token UI and selection.
- */
-function token_form_action_form_alter(&$form, $form_state) {
- switch ($form['plugin']['#value']) {
- case 'action_message_action':
- case 'action_send_email_action':
- case 'action_goto_action':
- $form['token_tree'] = [
- '#theme' => 'token_tree_link',
- '#token_types' => 'all',
- '#weight' => 100,
- ];
- $form['actions']['#weight'] = 101;
- // @todo Add token validation to the action fields that can use tokens.
- break;
- }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Alters the user e-mail fields to add token context validation and
- * adds the token tree for a better token UI and selection.
- */
-function token_form_user_admin_settings_alter(&$form, FormStateInterface $form_state) {
- $email_token_help = t('Available variables are: [site:name], [site:url], [user:display-name], [user:account-name], [user:mail], [site:login-url], [site:url-brief], [user:edit-url], [user:one-time-login-url], [user:cancel-url].');
-
- foreach (Element::children($form) as $key) {
- $element = &$form[$key];
-
- // Remove the crummy default token help text.
- if (!empty($element['#description'])) {
- $element['#description'] = trim(str_replace($email_token_help, t('The list of available tokens that can be used in e-mails is provided below.'), $element['#description']));
- }
-
- switch ($key) {
- case 'email_admin_created':
- case 'email_pending_approval':
- case 'email_no_approval_required':
- case 'email_password_reset':
- case 'email_cancel_confirm':
- // Do nothing, but allow execution to continue.
- break;
- case 'email_activated':
- case 'email_blocked':
- case 'email_canceled':
- // These fieldsets have their e-mail elements inside a 'settings'
- // sub-element, so switch to that element instead.
- $element = &$form[$key]['settings'];
- break;
- default:
- continue 2;
- }
-
- foreach (Element::children($element) as $sub_key) {
- if (!isset($element[$sub_key]['#type'])) {
- continue;
- }
- elseif ($element[$sub_key]['#type'] == 'textfield' && substr($sub_key, -8) === '_subject') {
- // Add validation to subject textfields.
- $element[$sub_key]['#element_validate'][] = 'token_element_validate';
- $element[$sub_key] += array('#token_types' => array('user'));
- }
- elseif ($element[$sub_key]['#type'] == 'textarea' && substr($sub_key, -5) === '_body') {
- // Add validation to body textareas.
- $element[$sub_key]['#element_validate'][] = 'token_element_validate';
- $element[$sub_key] += array('#token_types' => array('user'));
- }
- }
- }
-
- // Add the token tree UI.
- $form['email']['token_tree'] = array(
- '#theme' => 'token_tree_link',
- '#token_types' => array('user'),
- '#show_restricted' => TRUE,
- '#show_nested' => FALSE,
- '#weight' => 90,
- );
-}
-
-/**
- * Prepare a string for use as a valid token name.
- *
- * @param $name
- * The token name to clean.
- * @return
- * The cleaned token name.
- */
-function token_clean_token_name($name) {
- static $names = array();
-
- if (!isset($names[$name])) {
- $cleaned_name = strtr($name, array(' ' => '-', '_' => '-', '/' => '-', '[' => '-', ']' => ''));
- $cleaned_name = preg_replace('/[^\w\-]/i', '', $cleaned_name);
- $cleaned_name = trim($cleaned_name, '-');
- $names[$name] = $cleaned_name;
- }
-
- return $names[$name];
-}
-
-/**
- * Do not use this function yet. Its API has not been finalized.
- */
-function token_render_array(array $array, array $options = array()) {
- $rendered = array();
-
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = \Drupal::service('renderer');
-
- foreach (token_element_children($array) as $key) {
- $value = $array[$key];
- $rendered[] = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
- }
- $join = isset($options['join']) ? $options['join'] : ', ';
- return implode($join, $rendered);
-}
-
-/**
- * Do not use this function yet. Its API has not been finalized.
- */
-function token_render_array_value($value, array $options = array()) {
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = \Drupal::service('renderer');
-
- $rendered = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
- return $rendered;
-}
-
-/**
- * Copy of drupal_render_cache_get() that does not care about request method.
- */
-function token_render_cache_get($elements) {
- if (!$cid = drupal_render_cid_create($elements)) {
- return FALSE;
- }
- $bin = isset($elements['#cache']['bin']) ? $elements['#cache']['bin'] : 'render';
-
- if (!empty($cid) && $cache = \Drupal::cache($bin)->get($cid)) {
- // Add additional libraries, JavaScript, CSS and other data attached
- // to this element.
- if (isset($cache->data['#attached'])) {
- drupal_process_attached($cache->data);
- }
- // Return the rendered output.
- return $cache->data['#markup'];
- }
- return FALSE;
-}
-
-/**
- * Coyp of drupal_render_cache_set() that does not care about request method.
- */
-function token_render_cache_set(&$markup, $elements) {
- // This should only run of drupal_render_cache_set() did not.
- if (in_array(\Drupal::request()->server->get('REQUEST_METHOD'), array('GET', 'HEAD'))) {
- return FALSE;
- }
-
- $original_method = \Drupal::request()->server->get('REQUEST_METHOD');
- \Drupal::request()->server->set('REQUEST_METHOD', 'GET');
- drupal_render_cache_set($markup, $elements);
- \Drupal::request()->server->set('REQUEST_METHOD', $original_method);
-}
-
-/**
- * Loads menu link titles for all purents of a menu link plugin ID.
- *
- * @param string $plugin_id
- * The menu link plugin ID.
- * @param string $langcode
- * The language code.
- *
- * @return string[]
- * List of menu link parent titles.
- */
-function token_menu_link_load_all_parents($plugin_id, $langcode) {
- $cache = &drupal_static(__FUNCTION__, array());
-
- if (!isset($cache[$plugin_id][$langcode])) {
- $cache[$plugin_id][$langcode] = array();
- /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
- $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
- $parent_ids = $menu_link_manager->getParentIds($plugin_id);
- // Remove the current plugin ID from the parents.
- unset($parent_ids[$plugin_id]);
- foreach ($parent_ids as $parent_id) {
- $parent = $menu_link_manager->createInstance($parent_id);
- $cache[$plugin_id][$langcode] = array($parent_id => token_menu_link_translated_title($parent, $langcode)) + $cache[$plugin_id][$langcode];
- }
- }
-
- return $cache[$plugin_id][$langcode];
-}
-
-/**
- * Returns the translated link of a menu title.
- *
- * If the underlying entity is a content menu item, load it to get the
- * translated menu item title.
- *
- * @todo Remove this when there is a better way to get a translated menu
- * item title in core: https://www.drupal.org/node/2795143
- *
- * @param \Drupal\Core\Menu\MenuLinkInterface $menu_link
- * The menu link.
- * @param string|null $langcode
- * (optional) The langcode, defaults to the current language.
- *
- * @return string
- * The menu link title.
- */
-function token_menu_link_translated_title(MenuLinkInterface $menu_link, $langcode = NULL) {
- $metadata = $menu_link->getMetaData();
- if (isset($metadata['entity_id']) && $menu_link->getProvider() == 'menu_link_content') {
- /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
- $entity = \Drupal::entityTypeManager()->getStorage('menu_link_content')->load($metadata['entity_id']);
- $entity = \Drupal::service('entity.repository')->getTranslationFromContext($entity, $langcode);
- return $entity->getTitle();
- }
- return $menu_link->getTitle();
-}
-
-/**
- * Loads all the parents of the term in the specified language.
- *
- * @param int $tid
- * The term id.
- * @param string $langcode
- * The language code.
- *
- * @return string[]
- * The term parents collection.
- */
-function token_taxonomy_term_load_all_parents($tid, $langcode) {
- $cache = &drupal_static(__FUNCTION__, array());
-
- if (!is_numeric($tid)) {
- return array();
- }
-
- if (!isset($cache[$langcode][$tid])) {
- $cache[$langcode][$tid] = array();
- /** @var \Drupal\taxonomy\TermStorageInterface $term_storage */
- $term_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
- $parents = $term_storage->loadAllParents($tid);
- // Remove this term from the array.
- array_shift($parents);
- $parents = array_reverse($parents);
- foreach ($parents as $term) {
- $translation = \Drupal::service('entity.repository')->getTranslationFromContext($term, $langcode);
- $cache[$langcode][$tid][$term->id()] = $translation->label();
- }
- }
-
- return $cache[$langcode][$tid];
-}
-
-function token_element_children(&$elements, $sort = FALSE) {
- // Do not attempt to sort elements which have already been sorted.
- $sort = isset($elements['#sorted']) ? !$elements['#sorted'] : $sort;
-
- // Filter out properties from the element, leaving only children.
- $children = array();
- $sortable = FALSE;
- foreach ($elements as $key => $value) {
- if ($key === '' || $key[0] !== '#') {
- $children[$key] = $value;
- if (is_array($value) && isset($value['#weight'])) {
- $sortable = TRUE;
- }
- }
- }
- // Sort the children if necessary.
- if ($sort && $sortable) {
- uasort($children, 'Drupal\Component\Utility\SortArray::sortByWeightProperty');
- // Put the sorted children back into $elements in the correct order, to
- // preserve sorting if the same element is passed through
- // element_children() twice.
- foreach ($children as $key => $child) {
- unset($elements[$key]);
- $elements[$key] = $child;
- }
- $elements['#sorted'] = TRUE;
- }
-
- return array_keys($children);
-}
-
-/**
- * Loads all the parents of the book page.
- *
- * @param array $book
- * The book data. The 'nid' key points to the current page of the book.
- * The 'p1' ... 'p9' keys point to parents of the page, if they exist, with 'p1'
- * pointing to the book itself and the last defined pX to the current page.
- *
- * @return string[]
- * List of node titles of the book parents.
- */
-function token_book_load_all_parents(array $book) {
- $cache = &drupal_static(__FUNCTION__, array());
-
- if (empty($book['nid'])) {
- return array();
- }
- $nid = $book['nid'];
-
- if (!isset($cache[$nid])) {
- $cache[$nid] = array();
- $i = 1;
- while ($book["p$i"] != $nid) {
- $cache[$nid][] = Node::load($book["p$i"])->getTitle();
- $i++;
- }
- }
-
- return $cache[$nid];
-}
-
-/**
- * Implements hook_entity_base_field_info().
- */
-function token_entity_base_field_info(EntityTypeInterface $entity_type) {
- // We add a psuedo entity-reference field to track the menu entry created
- // from the node add/edit form so that tokens generated at that time that
- // reference the menu link can access the yet to be saved menu link.
- // @todo Revisit when https://www.drupal.org/node/2315773 is resolved.
- if ($entity_type->id() === 'node' && \Drupal::moduleHandler()->moduleExists('menu_ui')) {
- $fields['menu_link'] = BaseFieldDefinition::create('entity_reference')
- ->setLabel(t('Menu link'))
- ->setDescription(t('Computed menu link for the node (only available during node saving).'))
- ->setRevisionable(TRUE)
- ->setSetting('target_type', 'menu_link_content')
- ->setTranslatable(TRUE)
- ->setDisplayOptions('view', array(
- 'label' => 'hidden',
- 'type' => 'hidden',
- ))
- ->setComputed(TRUE)
- ->setDisplayOptions('form', array(
- 'type' => 'hidden',
- ));
-
- return $fields;
- }
- return [];
-}
-
-/**
- * Implements hook_form_BASE_FORM_ID_alter() for node_form.
- *
- * Populates menu_link field on nodes from the menu item on unsaved nodes.
- *
- * @see menu_ui_form_node_form_submit()
- * @see token_entity_base_field_info()
- */
-function token_form_node_form_alter(&$form, FormStateInterface $form_state) {
- if (!\Drupal::moduleHandler()->moduleExists('menu_ui')) {
- return;
- }
- /** @var \Drupal\node\NodeForm $form_object */
- if (!\Drupal::currentUser()->hasPermission('administer menu')) {
- // We're only interested in when the node is unsaved and the editor has
- // permission to create new menu links.
- return;
- }
- $form['#entity_builders'][] = 'token_node_menu_link_submit';
-}
-
-/**
- * Entity builder.
- */
-function token_node_menu_link_submit($entity_type, NodeInterface $node, &$form, FormStateInterface $form_state) {
- // Entity builders run twice, once during validation and again during
- // submission, so we only run this code after validation has been performed.
- if (!$form_state->isValueEmpty('menu') && $form_state->getTemporaryValue('entity_validated')) {
- $values = $form_state->getValue('menu');
- if (!empty($values['enabled']) && trim($values['title'])) {
- if (!empty($values['menu_parent'])) {
- list($menu_name, $parent) = explode(':', $values['menu_parent'], 2);
- $values['menu_name'] = $menu_name;
- $values['parent'] = $parent;
- }
- // Construct an unsaved entity.
- if ($entity_id = $form_state->getValue(['menu', 'entity_id'])) {
- // Use the existing menu_link_content entity.
- $entity = MenuLinkContent::load($entity_id);
- // If the loaded MenuLinkContent doesn't have a translation for the
- // Node's active langcode, create a new translation.
- if ($entity->isTranslatable()) {
- if (!$entity->hasTranslation($node->language()->getId())) {
- $entity = $entity->addTranslation($node->language()->getId(), $entity->toArray());
- }
- else {
- $entity = $entity->getTranslation($node->language()->getId());
- }
- }
- }
- else {
- if ($node->isNew()) {
- // Create a new menu_link_content entity.
- $entity = MenuLinkContent::create(array(
- // Lets just reference the UUID for now, the link is not important for
- // token generation.
- 'link' => ['uri' => 'internal:/node/' . $node->uuid()],
- 'langcode' => $node->language()->getId(),
- ));
- }
- else {
- // Create a new menu_link_content entity.
- $entity = MenuLinkContent::create(array(
- 'link' => ['uri' => 'entity:node/' . $node->id()],
- 'langcode' => $node->language()->getId(),
- ));
- }
- }
- $entity->title->value = trim($values['title']);
- $entity->description->value = trim($values['description']);
- $entity->menu_name->value = $values['menu_name'];
- $entity->parent->value = $values['parent'];
- $entity->weight->value = isset($values['weight']) ? $values['weight'] : 0;
- $entity->save();
- $node->menu_link = $entity;
- // Leave this for _menu_ui_node_save() to pick up so we don't end up with
- // duplicate menu-links.
- $form_state->setValue(['menu', 'entity_id'], $entity->id());
- }
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_insert for node entities.
- */
-function token_node_insert(NodeInterface $node) {
- if ($node->hasField('menu_link') && $menu_link = $node->menu_link->entity) {
- // Update the menu-link to point to the now saved node.
- $menu_link->link = 'entity:node/' . $node->id();
- $menu_link->save();
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave() for menu_link_content.
- */
-function token_menu_link_content_presave(MenuLinkContentInterface $menu_link_content) {
- drupal_static_reset('token_menu_link_load_all_parents');
-}
diff --git a/modules/token/token.pages.inc b/modules/token/token.pages.inc
deleted file mode 100644
index 4b92df1..0000000
--- a/modules/token/token.pages.inc
+++ /dev/null
@@ -1,61 +0,0 @@
- [],
- 'global_types' => TRUE,
- 'click_insert' => TRUE,
- 'show_restricted' => FALSE,
- 'show_nested' => FALSE,
- 'recursion_limit' => 3,
- ];
- $query_options = array_intersect_key($variables, $tree_variables);
- $query_options = DiffArray::diffAssocRecursive($query_options, $tree_variables);
- if (!isset($variables['options']['query']['options'])) {
- $variables['options']['query']['options'] = [];
- }
- $variables['options']['query']['options'] += $query_options;
-
- // Because PHP converts query strings with arrays into a different syntax on
- // the next request, the options have to be encoded with JSON in the query
- // string so that we can reliably decode it for token comparison.
- $variables['options']['query']['options'] = Json::encode($variables['options']['query']['options']);
-
- // Set the token tree to open in a separate window.
- $variables['options']['attributes'] += [
- 'data-dialog-type' => 'dialog',
- 'data-dialog-options' => json_encode([
- 'dialogClass' => 'token-tree-dialog',
- 'width' => 600,
- 'height' => 400,
- 'position' => ['my' => 'right bottom', 'at' => 'right-10 bottom-10'],
- 'draggable' => TRUE,
- 'autoResize' => FALSE,
- ]),
- ];
-
- $variables['link'] = Link::createFromRoute($variables['text'], 'token.tree', [], $variables['options'])->toRenderable();
- $variables['url'] = new Url('token.tree', [], $variables['options']);
- $variables['attributes'] = $variables['options']['attributes'];
-}
diff --git a/modules/token/token.routing.yml b/modules/token/token.routing.yml
deleted file mode 100644
index f2105ae..0000000
--- a/modules/token/token.routing.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-token.tree:
- path: '/token/tree'
- defaults:
- _controller: '\Drupal\token\Controller\TokenTreeController::outputTree'
- requirements:
- _csrf_token: 'TRUE'
-
-token.autocomplete:
- path: '/token/autocomplete/{token_type}/{filter}'
- defaults:
- _controller: '\Drupal\token\Controller\TokenAutocompleteController::autocomplete'
- requirements:
- _access: 'TRUE'
-
-token.flush_cache:
- path: '/token/flush-cache'
- defaults:
- _controller: '\Drupal\token\Controller\TokenCacheController::flush'
- requirements:
- _permission: 'flush caches'
- _csrf_token: 'TRUE'
- _module_dependencies: 'admin_menu'
diff --git a/modules/token/token.services.yml b/modules/token/token.services.yml
deleted file mode 100644
index f6011aa..0000000
--- a/modules/token/token.services.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-services:
- token.entity_mapper:
- class: Drupal\token\TokenEntityMapper
- arguments: ['@entity_type.manager', '@module_handler']
- token.tree_builder:
- class: Drupal\token\TreeBuilder
- arguments: ['@token', '@token.entity_mapper', '@cache.data', '@language_manager']
- token.route_subscriber:
- class: Drupal\token\Routing\RouteSubscriber
- arguments: ['@entity_type.manager', '@module_handler']
- tags:
- - { name: event_subscriber }
diff --git a/modules/token/token.tokens.inc b/modules/token/token.tokens.inc
deleted file mode 100644
index f6ad619..0000000
--- a/modules/token/token.tokens.inc
+++ /dev/null
@@ -1,1721 +0,0 @@
- t('Current date'),
- 'description' => t('Tokens related to the current date and time.'),
- 'type' => 'date',
- );
-
- // Add a 'dynamic' key to any tokens that have chained but dynamic tokens.
- $info['tokens']['date']['custom']['dynamic'] = TRUE;
-
- // The [file:size] may not always return in kilobytes.
- // @todo Remove when http://drupal.org/node/1193044 is fixed.
- if (!empty($info['tokens']['file']['size'])) {
- $info['tokens']['file']['size']['description'] = t('The size of the file.');
- }
-
- // Remove deprecated tokens from being listed.
- unset($info['tokens']['node']['tnid']);
- unset($info['tokens']['node']['type']);
- unset($info['tokens']['node']['type-name']);
-
- // Support 'url' type tokens for core tokens.
- if (isset($info['tokens']['comment']['url']) && \Drupal::moduleHandler()->moduleExists('comment')) {
- $info['tokens']['comment']['url']['type'] = 'url';
- }
- if (isset($info['tokens']['node']['url']) && \Drupal::moduleHandler()->moduleExists('node')) {
- $info['tokens']['node']['url']['type'] = 'url';
- }
- if (isset($info['tokens']['term']['url']) && \Drupal::moduleHandler()->moduleExists('taxonomy')) {
- $info['tokens']['term']['url']['type'] = 'url';
- }
- $info['tokens']['user']['url']['type'] = 'url';
-
- // Add [token:url] tokens for any URI-able entities.
- $entities = \Drupal::entityTypeManager()->getDefinitions();
- foreach ($entities as $entity => $entity_info) {
- // Do not generate tokens if the entity doesn't define a token type or is
- // not a content entity.
- if (!$entity_info->get('token_type') || (!$entity_info instanceof ContentEntityTypeInterface)) {
- continue;
- }
-
- $token_type = $entity_info->get('token_type');
- if (!isset($info['types'][$token_type]) || !isset($info['tokens'][$token_type])) {
- // Define tokens for entity type's without their own integration.
- $info['types'][$entity_info->id()] = [
- 'name' => $entity_info->getLabel(),
- 'needs-data' => $entity_info->id(),
- 'module' => 'token',
- ];
- }
-
- // Add [entity:url] tokens if they do not already exist.
- // @todo Support entity:label
- if (!isset($info['tokens'][$token_type]['url'])) {
- $info['tokens'][$token_type]['url'] = array(
- 'name' => t('URL'),
- 'description' => t('The URL of the @entity.', array('@entity' => Unicode::strtolower($entity_info->getLabel()))),
- 'module' => 'token',
- 'type' => 'url',
- );
- }
-
- // Add [entity:original] tokens if they do not already exist.
- if (!isset($info['tokens'][$token_type]['original'])) {
- $info['tokens'][$token_type]['original'] = array(
- 'name' => t('Original @entity', array('@entity' => Unicode::strtolower($entity_info->getLabel()))),
- 'description' => t('The original @entity data if the @entity is being updated or saved.', array('@entity' => Unicode::strtolower($entity_info->getLabel()))),
- 'module' => 'token',
- 'type' => $token_type,
- );
- }
- }
-
- // Add support for custom date formats.
- // @todo Remove when http://drupal.org/node/1173706 is fixed.
- $date_format_types = \Drupal::entityTypeManager()->getStorage('date_format')->loadMultiple();
- foreach ($date_format_types as $date_format_type => $date_format_type_info) {
- /* @var \Drupal\system\Entity\DateFormat $date_format_type_info */
- if (!isset($info['tokens']['date'][$date_format_type])) {
- $info['tokens']['date'][$date_format_type] = array(
- 'name' => Html::escape($date_format_type_info->label()),
- 'description' => t("A date in '@type' format. (%date)", array('@type' => $date_format_type, '%date' => format_date(REQUEST_TIME, $date_format_type))),
- 'module' => 'token',
- );
- }
- }
-}
-
-/**
- * Implements hook_token_info().
- */
-function token_token_info() {
- // Node tokens.
- $info['tokens']['node']['source'] = array(
- 'name' => t('Translation source node'),
- 'description' => t("The source node for this current node's translation set."),
- 'type' => 'node',
- );
- $info['tokens']['node']['log'] = array(
- 'name' => t('Revision log message'),
- 'description' => t('The explanation of the most recent changes made to the node.'),
- );
- $info['tokens']['node']['content-type'] = array(
- 'name' => t('Content type'),
- 'description' => t('The content type of the node.'),
- 'type' => 'content-type',
- );
-
- // Content type tokens.
- $info['types']['content-type'] = array(
- 'name' => t('Content types'),
- 'description' => t('Tokens related to content types.'),
- 'needs-data' => 'node_type',
- );
- $info['tokens']['content-type']['name'] = array(
- 'name' => t('Name'),
- 'description' => t('The name of the content type.'),
- );
- $info['tokens']['content-type']['machine-name'] = array(
- 'name' => t('Machine-readable name'),
- 'description' => t('The unique machine-readable name of the content type.'),
- );
- $info['tokens']['content-type']['description'] = array(
- 'name' => t('Description'),
- 'description' => t('The optional description of the content type.'),
- );
- $info['tokens']['content-type']['node-count'] = array(
- 'name' => t('Node count'),
- 'description' => t('The number of nodes belonging to the content type.'),
- );
- $info['tokens']['content-type']['edit-url'] = array(
- 'name' => t('Edit URL'),
- 'description' => t("The URL of the content type's edit page."),
- // 'type' => 'url',
- );
-
- // Taxonomy term and vocabulary tokens.
- if (\Drupal::moduleHandler()->moduleExists('taxonomy')) {
- $info['tokens']['term']['edit-url'] = array(
- 'name' => t('Edit URL'),
- 'description' => t("The URL of the taxonomy term's edit page."),
- // 'type' => 'url',
- );
- $info['tokens']['term']['parents'] = array(
- 'name' => t('Parents'),
- 'description' => t("An array of all the term's parents, starting with the root."),
- 'type' => 'array',
- );
- $info['tokens']['term']['root'] = array(
- 'name' => t('Root term'),
- 'description' => t("The root term of the taxonomy term."),
- 'type' => 'term',
- );
-
- $info['tokens']['vocabulary']['machine-name'] = array(
- 'name' => t('Machine-readable name'),
- 'description' => t('The unique machine-readable name of the vocabulary.'),
- );
- $info['tokens']['vocabulary']['edit-url'] = array(
- 'name' => t('Edit URL'),
- 'description' => t("The URL of the vocabulary's edit page."),
- // 'type' => 'url',
- );
- }
-
- // File tokens.
- $info['tokens']['file']['basename'] = array(
- 'name' => t('Base name'),
- 'description' => t('The base name of the file.'),
- );
- $info['tokens']['file']['extension'] = array(
- 'name' => t('Extension'),
- 'description' => t('The extension of the file.'),
- );
- $info['tokens']['file']['size-raw'] = array(
- 'name' => t('File byte size'),
- 'description' => t('The size of the file, in bytes.'),
- );
-
- // User tokens.
- // Add information on the restricted user tokens.
- $info['tokens']['user']['cancel-url'] = array(
- 'name' => t('Account cancellation URL'),
- 'description' => t('The URL of the confirm delete page for the user account.'),
- 'restricted' => TRUE,
- // 'type' => 'url',
- );
- $info['tokens']['user']['one-time-login-url'] = array(
- 'name' => t('One-time login URL'),
- 'description' => t('The URL of the one-time login page for the user account.'),
- 'restricted' => TRUE,
- // 'type' => 'url',
- );
- $info['tokens']['user']['roles'] = array(
- 'name' => t('Roles'),
- 'description' => t('The user roles associated with the user account.'),
- 'type' => 'array',
- );
-
- // Current user tokens.
- $info['tokens']['current-user']['ip-address'] = array(
- 'name' => t('IP address'),
- 'description' => 'The IP address of the current user.',
- );
-
- // Menu link tokens (work regardless if menu module is enabled or not).
- $info['types']['menu-link'] = array(
- 'name' => t('Menu links'),
- 'description' => t('Tokens related to menu links.'),
- 'needs-data' => 'menu-link',
- );
- $info['tokens']['menu-link']['mlid'] = array(
- 'name' => t('Link ID'),
- 'description' => t('The unique ID of the menu link.'),
- );
- $info['tokens']['menu-link']['title'] = array(
- 'name' => t('Title'),
- 'description' => t('The title of the menu link.'),
- );
- $info['tokens']['menu-link']['url'] = array(
- 'name' => t('URL'),
- 'description' => t('The URL of the menu link.'),
- 'type' => 'url',
- );
- $info['tokens']['menu-link']['parent'] = array(
- 'name' => t('Parent'),
- 'description' => t("The menu link's parent."),
- 'type' => 'menu-link',
- );
- $info['tokens']['menu-link']['parents'] = array(
- 'name' => t('Parents'),
- 'description' => t("An array of all the menu link's parents, starting with the root."),
- 'type' => 'array',
- );
- $info['tokens']['menu-link']['root'] = array(
- 'name' => t('Root'),
- 'description' => t("The menu link's root."),
- 'type' => 'menu-link',
- );
-
- // Current page tokens.
- $info['types']['current-page'] = array(
- 'name' => t('Current page'),
- 'description' => t('Tokens related to the current page request.'),
- );
- $info['tokens']['current-page']['title'] = array(
- 'name' => t('Title'),
- 'description' => t('The title of the current page.'),
- );
- $info['tokens']['current-page']['url'] = array(
- 'name' => t('URL'),
- 'description' => t('The URL of the current page.'),
- 'type' => 'url',
- );
- $info['tokens']['current-page']['page-number'] = array(
- 'name' => t('Page number'),
- 'description' => t('The page number of the current page when viewing paged lists.'),
- );
- $info['tokens']['current-page']['query'] = array(
- 'name' => t('Query string value'),
- 'description' => t('The value of a specific query string field of the current page.'),
- 'dynamic' => TRUE,
- );
-
- // URL tokens.
- $info['types']['url'] = array(
- 'name' => t('URL'),
- 'description' => t('Tokens related to URLs.'),
- 'needs-data' => 'path',
- );
- $info['tokens']['url']['path'] = array(
- 'name' => t('Path'),
- 'description' => t('The path component of the URL.'),
- );
- $info['tokens']['url']['relative'] = array(
- 'name' => t('Relative URL'),
- 'description' => t('The relative URL.'),
- );
- $info['tokens']['url']['absolute'] = array(
- 'name' => t('Absolute URL'),
- 'description' => t('The absolute URL.'),
- );
- $info['tokens']['url']['brief'] = array(
- 'name' => t('Brief URL'),
- 'description' => t('The URL without the protocol and trailing backslash.'),
- );
- $info['tokens']['url']['unaliased'] = array(
- 'name' => t('Unaliased URL'),
- 'description' => t('The unaliased URL.'),
- 'type' => 'url',
- );
- $info['tokens']['url']['args'] = array(
- 'name' => t('Arguments'),
- 'description' => t("The specific argument of the current page (e.g. 'arg:1' on the page 'node/1' returns '1')."),
- 'type' => 'array',
- );
-
- // Array tokens.
- $info['types']['array'] = array(
- 'name' => t('Array'),
- 'description' => t('Tokens related to arrays of strings.'),
- 'needs-data' => 'array',
- 'nested' => TRUE,
- );
- $info['tokens']['array']['first'] = array(
- 'name' => t('First'),
- 'description' => t('The first element of the array.'),
- );
- $info['tokens']['array']['last'] = array(
- 'name' => t('Last'),
- 'description' => t('The last element of the array.'),
- );
- $info['tokens']['array']['count'] = array(
- 'name' => t('Count'),
- 'description' => t('The number of elements in the array.'),
- );
- $info['tokens']['array']['reversed'] = array(
- 'name' => t('Reversed'),
- 'description' => t('The array reversed.'),
- 'type' => 'array',
- );
- $info['tokens']['array']['keys'] = array(
- 'name' => t('Keys'),
- 'description' => t('The array of keys of the array.'),
- 'type' => 'array',
- );
- $info['tokens']['array']['join'] = array(
- 'name' => t('Imploded'),
- 'description' => t('The values of the array joined together with a custom string in-between each value.'),
- 'dynamic' => TRUE,
- );
- $info['tokens']['array']['value'] = array(
- 'name' => t('Value'),
- 'description' => t('The specific value of the array.'),
- 'dynamic' => TRUE,
- );
-
- // Random tokens.
- $info['types']['random'] = array(
- 'name' => t('Random'),
- 'description' => t('Tokens related to random data.'),
- );
- $info['tokens']['random']['number'] = array(
- 'name' => t('Number'),
- 'description' => t('A random number from 0 to @max.', array('@max' => mt_getrandmax())),
- );
- $info['tokens']['random']['hash'] = array(
- 'name' => t('Hash'),
- 'description' => t('A random hash. The possible hashing algorithms are: @hash-algos.', array('@hash-algos' => implode(', ', hash_algos()))),
- 'dynamic' => TRUE,
- );
-
- // Define image_with_image_style token type.
- if (\Drupal::moduleHandler()->moduleExists('image')) {
- $info['types']['image_with_image_style'] = [
- 'name' => t('Image with image style'),
- 'needs-data' => 'image_with_image_style',
- 'module' => 'token',
- 'nested' => TRUE,
- ];
-
- // Provide tokens for the ImageStyle attributes.
- $info['tokens']['image_with_image_style']['mimetype'] = [
- 'name' => t('MIME type'),
- 'description' => t('The MIME type (image/png, image/bmp, etc.) of the image.'),
- ];
- $info['tokens']['image_with_image_style']['filesize'] = [
- 'name' => t('File size'),
- 'description' => t('The file size of the image.'),
- ];
- $info['tokens']['image_with_image_style']['height'] = [
- 'name' => t('Height'),
- 'description' => t('The height the image, in pixels.'),
- ];
- $info['tokens']['image_with_image_style']['width'] = [
- 'name' => t('Width'),
- 'description' => t('The width of the image, in pixels.'),
- ];
- $info['tokens']['image_with_image_style']['uri'] = [
- 'name' => t('URI'),
- 'description' => t('The URI to the image.'),
- ];
- $info['tokens']['image_with_image_style']['url'] = [
- 'name' => t('URL'),
- 'description' => t('The URL to the image.'),
- ];
- }
-
- return $info;
-}
-
-/**
- * Implements hook_tokens().
- */
-function token_tokens($type, array $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
- $replacements = array();
- $language_manager = \Drupal::languageManager();
- $url_options = array('absolute' => TRUE);
- if (isset($options['langcode'])) {
- $url_options['language'] = $language_manager->getLanguage($options['langcode']);
- $langcode = $options['langcode'];
- }
- else {
- $langcode = $language_manager->getCurrentLanguage()->getId();
- }
-
- // Date tokens.
- if ($type == 'date') {
- $date = !empty($data['date']) ? $data['date'] : REQUEST_TIME;
-
- // @todo Remove when http://drupal.org/node/1173706 is fixed.
- $date_format_types = \Drupal::entityTypeManager()->getStorage('date_format')->loadMultiple();
- foreach ($tokens as $name => $original) {
- if (isset($date_format_types[$name]) && _token_module('date', $name) == 'token') {
- $replacements[$original] = format_date($date, $name, '', NULL, $langcode);
- }
- }
- }
-
- // Current date tokens.
- // @todo Remove when http://drupal.org/node/943028 is fixed.
- if ($type == 'current-date') {
- $replacements += \Drupal::token()->generate('date', $tokens, array('date' => REQUEST_TIME), $options, $bubbleable_metadata);
- }
-
- // Comment tokens.
- if ($type == 'comment' && !empty($data['comment'])) {
- /* @var \Drupal\comment\CommentInterface $comment */
- $comment = $data['comment'];
-
- // Chained token relationships.
- if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
- // Add fragment to url options.
- $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])), $options, $bubbleable_metadata);
- }
- }
-
- // Node tokens.
- if ($type == 'node' && !empty($data['node'])) {
- /* @var \Drupal\node\NodeInterface $node */
- $node = $data['node'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'log':
- $replacements[$original] = (string) $node->revision_log->value;
- break;
- case 'content-type':
- $type_name = \Drupal::entityTypeManager()->getStorage('node_type')->load($node->getType())->label();
- $replacements[$original] = $type_name;
- break;
- }
- }
-
- // Chained token relationships.
- if (($parent_tokens = \Drupal::token()->findWithPrefix($tokens, 'source')) && $source_node = $node->getUntranslated()) {
- $replacements += \Drupal::token()->generate('node', $parent_tokens, array('node' => $source_node), $options, $bubbleable_metadata);
- }
- if (($node_type_tokens = \Drupal::token()->findWithPrefix($tokens, 'content-type')) && $node_type = node_type_load($node->bundle())) {
- $replacements += \Drupal::token()->generate('content-type', $node_type_tokens, array('node_type' => $node_type), $options, $bubbleable_metadata);
- }
- if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
- $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $node->urlInfo()), $options, $bubbleable_metadata);
- }
- }
-
- // Content type tokens.
- if ($type == 'content-type' && !empty($data['node_type'])) {
- /* @var \Drupal\node\NodeTypeInterface $node_type */
- $node_type = $data['node_type'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'name':
- $replacements[$original] = $node_type->label();
- break;
- case 'machine-name':
- $replacements[$original] = $node_type->id();
- break;
- case 'description':
- $replacements[$original] = $node_type->getDescription();
- break;
- case 'node-count':
- $count = \Drupal::entityQueryAggregate('node')
- ->aggregate('nid', 'COUNT')
- ->condition('type', $node_type->id())
- ->execute();
- $replacements[$original] = (int) $count;
- break;
- case 'edit-url':
- $replacements[$original] = $node_type->url('edit-form', $url_options);
- break;
- }
- }
- }
-
- // Taxonomy term tokens.
- if ($type == 'term' && !empty($data['term'])) {
- /* @var \Drupal\taxonomy\TermInterface $term */
- $term = $data['term'];
-
- /** @var \Drupal\taxonomy\TermStorageInterface $term_storage */
- $term_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'edit-url':
- $replacements[$original] = Url::fromRoute('entity.taxonomy_term.edit_form', ['taxonomy_term' => $term->id()], $url_options)->toString();
- break;
-
- case 'parents':
- if ($parents = token_taxonomy_term_load_all_parents($term->id(), $langcode)) {
- $replacements[$original] = token_render_array($parents, $options);
- }
- break;
-
- case 'root':
- $parents = $term_storage->loadAllParents($term->id());
- $root_term = end($parents);
- if ($root_term->id() != $term->id()) {
- $replacements[$original] = $root_term->label();
- }
- break;
- }
- }
-
- // Chained token relationships.
- if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
- $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $term->urlInfo()), $options, $bubbleable_metadata);
- }
- // [term:parents:*] chained tokens.
- if ($parents_tokens = \Drupal::token()->findWithPrefix($tokens, 'parents')) {
- if ($parents = token_taxonomy_term_load_all_parents($term->id(), $langcode)) {
- $replacements += \Drupal::token()->generate('array', $parents_tokens, array('array' => $parents), $options, $bubbleable_metadata);
- }
- }
- if ($root_tokens = \Drupal::token()->findWithPrefix($tokens, 'root')) {
- $parents = $term_storage->loadAllParents($term->id());
- $root_term = end($parents);
- if ($root_term->tid != $term->id()) {
- $replacements += \Drupal::token()->generate('term', $root_tokens, array('term' => $root_term), $options, $bubbleable_metadata);
- }
- }
- }
-
- // Vocabulary tokens.
- if ($type == 'vocabulary' && !empty($data['vocabulary'])) {
- $vocabulary = $data['vocabulary'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'machine-name':
- $replacements[$original] = $vocabulary->id();
- break;
- case 'edit-url':
- $replacements[$original] = Url::fromRoute('entity.taxonomy_vocabulary.edit_form', ['taxonomy_vocabulary' => $vocabulary->id()], $url_options)->toString();
- break;
- }
- }
- }
-
- // File tokens.
- if ($type == 'file' && !empty($data['file'])) {
- $file = $data['file'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'basename':
- $basename = pathinfo($file->uri->value, PATHINFO_BASENAME);
- $replacements[$original] = $basename;
- break;
- case 'extension':
- $extension = pathinfo($file->uri->value, PATHINFO_EXTENSION);
- $replacements[$original] = $extension;
- break;
- case 'size-raw':
- $replacements[$original] = (int) $file->filesize->value;
- break;
- }
- }
- }
-
- // User tokens.
- if ($type == 'user' && !empty($data['user'])) {
- /* @var \Drupal\user\UserInterface $account */
- $account = $data['user'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'picture':
- if ($account instanceof UserInterface && $account->hasField('user_picture')) {
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = \Drupal::service('renderer');
- $output = [
- '#theme' => 'user_picture',
- '#account' => $account,
- ];
- $replacements[$original] = $renderer->renderPlain($output);
- }
- break;
-
- case 'roles':
- $roles = $account->getRoles();
- $roles_names = array_combine($roles, $roles);
- $replacements[$original] = token_render_array($roles_names, $options);
- break;
- }
- }
-
- // Chained token relationships.
- if ($account instanceof UserInterface && $account->hasField('user_picture') && ($picture_tokens = \Drupal::token()->findWithPrefix($tokens, 'picture'))) {
- $replacements += \Drupal::token()->generate('file', $picture_tokens, array('file' => $account->user_picture->entity), $options, $bubbleable_metadata);
- }
- if ($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) {
- $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $account->urlInfo()), $options, $bubbleable_metadata);
- }
- if ($role_tokens = \Drupal::token()->findWithPrefix($tokens, 'roles')) {
- $roles = $account->getRoles();
- $roles_names = array_combine($roles, $roles);
- $replacements += \Drupal::token()->generate('array', $role_tokens, array('array' => $roles_names), $options, $bubbleable_metadata);
- }
- }
-
- // Current user tokens.
- if ($type == 'current-user') {
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'ip-address':
- $ip = \Drupal::request()->getClientIp();
- $replacements[$original] = $ip;
- break;
- }
- }
- }
-
- // Menu link tokens.
- if ($type == 'menu-link' && !empty($data['menu-link'])) {
- /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
- $link = $data['menu-link'];
- /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
- $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-
- if ($link instanceof MenuLinkContentInterface) {
- $link = $menu_link_manager->createInstance($link->getPluginId());
- }
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'id':
- $replacements[$original] = $link->getPluginId();
- break;
- case 'title':
- $replacements[$original] = token_menu_link_translated_title($link, $langcode);
- break;
- case 'url':
- $replacements[$original] = $link->getUrlObject()->setAbsolute()->toString();
- break;
- case 'parent':
-
- /** @var \Drupal\Core\Menu\MenuLinkInterface $parent */
- if ($link->getParent() && $parent = $menu_link_manager->createInstance($link->getParent())) {
- $replacements[$original] = token_menu_link_translated_title($parent, $langcode);
- }
- break;
- case 'parents':
- if ($parents = token_menu_link_load_all_parents($link->getPluginId(), $langcode)) {
- $replacements[$original] = token_render_array($parents, $options);
- }
- break;
- case 'root';
- if ($link->getParent() && $parent_ids = array_keys(token_menu_link_load_all_parents($link->getPluginId(), $langcode))) {
- $root = $menu_link_manager->createInstance(array_shift($parent_ids));
- $replacements[$original] = token_menu_link_translated_title($root, $langcode);
- }
- break;
- }
- }
-
- // Chained token relationships.
- /** @var \Drupal\Core\Menu\MenuLinkInterface $parent */
- if ($link->getParent() && ($parent_tokens = \Drupal::token()->findWithPrefix($tokens, 'parent')) && $parent = $menu_link_manager->createInstance($link->getParent())) {
- $replacements += \Drupal::token()->generate('menu-link', $parent_tokens, array('menu-link' => $parent), $options, $bubbleable_metadata);
- }
- // [menu-link:parents:*] chained tokens.
- if ($parents_tokens = \Drupal::token()->findWithPrefix($tokens, 'parents')) {
- if ($parents = token_menu_link_load_all_parents($link->getPluginId(), $langcode)) {
- $replacements += \Drupal::token()->generate('array', $parents_tokens, array('array' => $parents), $options, $bubbleable_metadata);
- }
- }
- if (($root_tokens = \Drupal::token()->findWithPrefix($tokens, 'root')) && $link->getParent() && $parent_ids = array_keys(token_menu_link_load_all_parents($link->getPluginId(), $langcode))) {
- $root = $menu_link_manager->createInstance(array_shift($parent_ids));
- $replacements += \Drupal::token()->generate('menu-link', $root_tokens, array('menu-link' => $root), $options, $bubbleable_metadata);
- }
- if ($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) {
- $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $link->getUrlObject()), $options, $bubbleable_metadata);
- }
-
- }
-
- // Current page tokens.
- if ($type == 'current-page') {
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'title':
- $request = \Drupal::request();
- $route = $request->attributes->get(RouteObjectInterface::ROUTE_OBJECT);
- if ($route) {
- $title = \Drupal::service('title_resolver')->getTitle($request, $route);
- $replacements[$original] = token_render_array_value($title);
- }
- break;
- case 'url':
- $replacements[$original] = Url::fromRoute('', [], $url_options)->toString();
- break;
- case 'page-number':
- if ($page = \Drupal::request()->query->get('page')) {
- // @see PagerDefault::execute()
- $pager_page_array = explode(',', $page);
- $page = $pager_page_array[0];
- }
- $replacements[$original] = (int) $page + 1;
- break;
- }
- }
-
- // @deprecated
- // [current-page:arg] dynamic tokens.
- if ($arg_tokens = \Drupal::token()->findWithPrefix($tokens, 'arg')) {
- $path = ltrim(\Drupal::service('path.current')->getPath(), '/');
- // Make sure its a system path.
- $path = \Drupal::service('path.alias_manager')->getPathByAlias($path);
- foreach ($arg_tokens as $name => $original) {
- $parts = explode('/', $path);
- if (is_numeric($name) && isset($parts[$name])) {
- $replacements[$original] = $parts[$name];
- }
- }
- }
-
- // [current-page:query] dynamic tokens.
- if ($query_tokens = \Drupal::token()->findWithPrefix($tokens, 'query')) {
- foreach ($query_tokens as $name => $original) {
- if (\Drupal::request()->query->has($name)) {
- $value = \Drupal::request()->query->get($name);
- $replacements[$original] = $value;
- }
- }
- }
-
- // Chained token relationships.
- if ($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) {
- $url = Url::fromRoute('');
- $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $url), $options, $bubbleable_metadata);
- }
- }
-
- // URL tokens.
- if ($type == 'url' && !empty($data['url'])) {
- /** @var \Drupal\Core\Url $url */
- $url = $data['url'];
- // To retrieve the correct path, modify a copy of the Url object.
- $path_url = clone $url;
- $path = '/' . $path_url->setAbsolute(FALSE)->setOption('fragment', NULL)->getInternalPath();
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'path':
- $value = !($url->getOption('alias')) ? \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode) : $path;
- $replacements[$original] = $value;
- break;
- case 'alias':
- // @deprecated
- $alias = \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode);
- $replacements[$original] = $alias;
- break;
- case 'absolute':
- $replacements[$original] = $url->setAbsolute()->toString();
- break;
- case 'relative':
- $replacements[$original] = $url->setAbsolute(FALSE)->toString();
- break;
- case 'brief':
- $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', $url->setAbsolute()->toString());
- break;
- case 'unaliased':
- $unaliased = clone $url;
- $replacements[$original] = $unaliased->setAbsolute()->setOption('alias', TRUE)->toString();
- break;
- case 'args':
- $value = !($url->getOption('alias')) ? \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode) : $path;
- $replacements[$original] = token_render_array(explode('/', $value), $options);
- break;
-
- }
- }
-
- // [url:args:*] chained tokens.
- if ($arg_tokens = \Drupal::token()->findWithPrefix($tokens, 'args')) {
- $value = !($url->getOption('alias')) ? \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode) : $path;
- $replacements += \Drupal::token()->generate('array', $arg_tokens, array('array' => explode('/', ltrim($value, '/'))), $options, $bubbleable_metadata);
- }
-
- // [url:unaliased:*] chained tokens.
- if ($unaliased_tokens = \Drupal::token()->findWithPrefix($tokens, 'unaliased')) {
- $url->setOption('alias', TRUE);
- $replacements += \Drupal::token()->generate('url', $unaliased_tokens, array('url' => $url), $options, $bubbleable_metadata);
- }
- }
-
- // Entity tokens.
- if (!empty($data[$type]) && $entity_type = \Drupal::service('token.entity_mapper')->getEntityTypeForTokenType($type)) {
- /* @var \Drupal\Core\Entity\EntityInterface $entity */
- $entity = $data[$type];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'url':
- if (_token_module($type, 'url') == 'token' && $url = $entity->url()) {
- $replacements[$original] = $url;
- }
- break;
-
- case 'original':
- if (_token_module($type, 'original') == 'token' && !empty($entity->original)) {
- $label = $entity->original->label();
- $replacements[$original] = $label;
- }
- break;
- }
- }
-
- // [entity:url:*] chained tokens.
- if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) && _token_module($type, 'url') == 'token') {
- $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $entity->toUrl()), $options, $bubbleable_metadata);
- }
-
- // [entity:original:*] chained tokens.
- if (($original_tokens = \Drupal::token()->findWithPrefix($tokens, 'original')) && _token_module($type, 'original') == 'token' && !empty($entity->original)) {
- $replacements += \Drupal::token()->generate($type, $original_tokens, array($type => $entity->original), $options, $bubbleable_metadata);
- }
-
- // Pass through to an generic 'entity' token type generation.
- $entity_data = array(
- 'entity_type' => $entity_type,
- 'entity' => $entity,
- 'token_type' => $type,
- );
- // @todo Investigate passing through more data like everything from entity_extract_ids().
- $replacements += \Drupal::token()->generate('entity', $tokens, $entity_data, $options, $bubbleable_metadata);
- }
-
- // Array tokens.
- if ($type == 'array' && !empty($data['array']) && is_array($data['array'])) {
- $array = $data['array'];
-
- $sort = isset($options['array sort']) ? $options['array sort'] : TRUE;
- $keys = token_element_children($array, $sort);
-
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = \Drupal::service('renderer');
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'first':
- $value = $array[$keys[0]];
- $value = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
- $replacements[$original] = $value;
- break;
- case 'last':
- $value = $array[$keys[count($keys) - 1]];
- $value = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
- $replacements[$original] =$value;
- break;
- case 'count':
- $replacements[$original] = count($keys);
- break;
- case 'keys':
- $replacements[$original] = token_render_array($keys, $options);
- break;
- case 'reversed':
- $reversed = array_reverse($array, TRUE);
- $replacements[$original] = token_render_array($reversed, $options);
- break;
- case 'join':
- $replacements[$original] = token_render_array($array, array('join' => '') + $options);
- break;
- }
- }
-
- // [array:value:*] dynamic tokens.
- if ($value_tokens = \Drupal::token()->findWithPrefix($tokens, 'value')) {
- foreach ($value_tokens as $key => $original) {
- if ($key[0] !== '#' && isset($array[$key])) {
- $replacements[$original] = token_render_array_value($array[$key], $options);
- }
- }
- }
-
- // [array:join:*] dynamic tokens.
- if ($join_tokens = \Drupal::token()->findWithPrefix($tokens, 'join')) {
- foreach ($join_tokens as $join => $original) {
- $replacements[$original] = token_render_array($array, array('join' => $join) + $options);
- }
- }
-
- // [array:keys:*] chained tokens.
- if ($key_tokens = \Drupal::token()->findWithPrefix($tokens, 'keys')) {
- $replacements += \Drupal::token()->generate('array', $key_tokens, array('array' => $keys), $options, $bubbleable_metadata);
- }
-
- // [array:reversed:*] chained tokens.
- if ($reversed_tokens = \Drupal::token()->findWithPrefix($tokens, 'reversed')) {
- $replacements += \Drupal::token()->generate('array', $reversed_tokens, array('array' => array_reverse($array, TRUE)), array('array sort' => FALSE) + $options, $bubbleable_metadata);
- }
-
- // @todo Handle if the array values are not strings and could be chained.
- }
-
- // Random tokens.
- if ($type == 'random') {
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'number':
- $replacements[$original] = mt_rand();
- break;
- }
- }
-
- // [custom:hash:*] dynamic token.
- if ($hash_tokens = \Drupal::token()->findWithPrefix($tokens, 'hash')) {
- $algos = hash_algos();
- foreach ($hash_tokens as $name => $original) {
- if (in_array($name, $algos)) {
- $replacements[$original] = hash($name, Crypt::randomBytes(55));
- }
- }
- }
- }
-
- // If $type is a token type, $data[$type] is empty but $data[$entity_type] is
- // not, re-run token replacements.
- if (empty($data[$type]) && ($entity_type = \Drupal::service('token.entity_mapper')->getEntityTypeForTokenType($type)) && $entity_type != $type && !empty($data[$entity_type]) && empty($options['recursive'])) {
- $data[$type] = $data[$entity_type];
- $options['recursive'] = TRUE;
- $replacements += \Drupal::moduleHandler()->invokeAll('tokens', array($type, $tokens, $data, $options, $bubbleable_metadata));
- }
-
- // If the token type specifics a 'needs-data' value, and the value is not
- // present in $data, then throw an error.
- if (!empty($GLOBALS['drupal_test_info']['test_run_id'])) {
- // Only check when tests are running.
- $type_info = \Drupal::token()->getTypeInfo($type);
- if (!empty($type_info['needs-data']) && !isset($data[$type_info['needs-data']])) {
- trigger_error(t('Attempting to perform token replacement for token type %type without required data', array('%type' => $type)), E_USER_WARNING);
- }
- }
-
- return $replacements;
-}
-
-/**
- * Implements hook_token_info() on behalf of book.module.
- */
-function book_token_info() {
- $info['types']['book'] = array(
- 'name' => t('Book'),
- 'description' => t('Tokens related to books.'),
- 'needs-data' => 'book',
- );
-
- $info['tokens']['book']['title'] = array(
- 'name' => t('Title'),
- 'description' => t('Title of the book.'),
- );
- $info['tokens']['book']['author'] = array(
- 'name' => t('Author'),
- 'description' => t('The author of the book.'),
- 'type' => 'user',
- );
- $info['tokens']['book']['root'] = array(
- 'name' => t('Root'),
- 'description' => t('Top level of the book.'),
- 'type' => 'node',
- );
- $info['tokens']['book']['parent'] = array(
- 'name' => t('Parent'),
- 'description' => t('Parent of the current page.'),
- 'type' => 'node',
- );
- $info['tokens']['book']['parents'] = array(
- 'name' => t('Parents'),
- 'description' => t("An array of all the node's parents, starting with the root."),
- 'type' => 'array',
- );
-
- $info['tokens']['node']['book'] = array(
- 'name' => t('Book'),
- 'description' => t('The book page associated with the node.'),
- 'type' => 'book',
- );
- return $info;
-}
-
-/**
- * Implements hook_tokens() on behalf of book.module.
- */
-function book_tokens($type, $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
- $replacements = array();
-
- // Node tokens.
- if ($type == 'node' && !empty($data['node'])) {
- $book = $data['node']->book;
-
- if (!empty($book['bid'])) {
- if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'book')) {
- $child_node = Node::load($book['nid']);
- $replacements += \Drupal::token()->generate('book', $book_tokens, array('book' => $child_node), $options, $bubbleable_metadata);
- }
- }
- }
- // Book tokens.
- else if ($type == 'book' && !empty($data['book'])) {
- $book = $data['book']->book;
-
- if (!empty($book['bid'])) {
- $book_node = Node::load($book['bid']);
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'root':
- case 'title':
- $replacements[$original] = $book_node->getTitle();
- break;
- case 'parent':
- if (!empty($book['pid'])) {
- $parent_node = Node::load($book['pid']);
- $replacements[$original] = $parent_node->getTitle();
- }
- break;
- case 'parents':
- if ($parents = token_book_load_all_parents($book)) {
- $replacements[$original] = token_render_array($parents, $options);
- }
- break;
- }
- }
-
- if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'author')) {
- $replacements += \Drupal::token()->generate('user', $book_tokens, array('user' => $book_node->getOwner()), $options, $bubbleable_metadata);
- }
- if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'root')) {
- $replacements += \Drupal::token()->generate('node', $book_tokens, array('node' => $book_node), $options, $bubbleable_metadata);
- }
- if (!empty($book['pid']) && $book_tokens = \Drupal::token()->findWithPrefix($tokens, 'parent')) {
- $parent_node = Node::load($book['pid']);
- $replacements += \Drupal::token()->generate('node', $book_tokens, array('node' => $parent_node), $options, $bubbleable_metadata);
- }
- if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'parents')) {
- $parents = token_book_load_all_parents($book);
- $replacements += \Drupal::token()->generate('array', $book_tokens, array('array' => $parents), $options, $bubbleable_metadata);
- }
- }
- }
-
- return $replacements;
-}
-
-/**
- * Implements hook_token_info() on behalf of menu_ui.module.
- */
-function menu_ui_token_info() {
- // Menu tokens.
- $info['types']['menu'] = array(
- 'name' => t('Menus'),
- 'description' => t('Tokens related to menus.'),
- 'needs-data' => 'menu',
- );
- $info['tokens']['menu']['name'] = array(
- 'name' => t('Name'),
- 'description' => t("The name of the menu."),
- );
- $info['tokens']['menu']['machine-name'] = array(
- 'name' => t('Machine-readable name'),
- 'description' => t("The unique machine-readable name of the menu."),
- );
- $info['tokens']['menu']['description'] = array(
- 'name' => t('Description'),
- 'description' => t('The optional description of the menu.'),
- );
- $info['tokens']['menu']['menu-link-count'] = array(
- 'name' => t('Menu link count'),
- 'description' => t('The number of menu links belonging to the menu.'),
- );
- $info['tokens']['menu']['edit-url'] = array(
- 'name' => t('Edit URL'),
- 'description' => t("The URL of the menu's edit page."),
- );
-
- $info['tokens']['menu-link']['menu'] = array(
- 'name' => t('Menu'),
- 'description' => t('The menu of the menu link.'),
- 'type' => 'menu',
- );
- $info['tokens']['menu-link']['edit-url'] = array(
- 'name' => t('Edit URL'),
- 'description' => t("The URL of the menu link's edit page."),
- );
- $info['tokens']['node']['menu-link'] = array(
- 'name' => t('Menu link'),
- 'description' => t("The menu link for this node."),
- 'type' => 'menu-link',
- );
-
- return $info;
-}
-
-/**
- * Implements hook_tokens() on behalf of menu_ui.module.
- */
-function menu_ui_tokens($type, $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
- $replacements = array();
-
- /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
- $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-
- $url_options = array('absolute' => TRUE);
- if (isset($options['langcode'])) {
- $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
- $langcode = $options['langcode'];
- }
- else {
- $langcode = NULL;
- }
-
- // Node tokens.
- if ($type == 'node' && !empty($data['node'])) {
- /** @var \Drupal\node\NodeInterface $node */
- $node = $data['node'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'menu-link':
- // On node-form save we populate a calculated field with a menu_link
- // references.
- // @see token_node_menu_link_submit()
- if ($node->getFieldDefinition('menu_link') && $menu_link = $node->menu_link->entity) {
- /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */
- $replacements[$original] = $menu_link->getTitle();
- }
- else {
- $url = $node->toUrl();
- if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) {
- $link = _token_menu_link_best_match($node, $links);
- $replacements[$original] = token_menu_link_translated_title($link, $langcode);
- }
- }
- break;
- }
-
- // Chained token relationships.
- if ($menu_tokens = \Drupal::token()->findWithPrefix($tokens, 'menu-link')) {
- if ($node->getFieldDefinition('menu_link') && $menu_link = $node->menu_link->entity) {
- /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */
- $replacements += \Drupal::token()->generate('menu-link', $menu_tokens, array('menu-link' => $menu_link), $options, $bubbleable_metadata);
- }
- else {
- $url = $node->urlInfo();
- if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) {
- $link = _token_menu_link_best_match($node, $links);
- $replacements += \Drupal::token()->generate('menu-link', $menu_tokens, array('menu-link' => $link), $options, $bubbleable_metadata);
- }
- }
- }
- }
- }
-
- // Menu link tokens.
- if ($type == 'menu-link' && !empty($data['menu-link'])) {
- /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
- $link = $data['menu-link'];
-
- if ($link instanceof MenuLinkContentInterface) {
- $link = $menu_link_manager->createInstance($link->getPluginId());
- }
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'menu':
- if ($menu = Menu::load($link->getMenuName())) {
- $replacements[$original] = $menu->label();
- }
- break;
-
- case 'edit-url':
- $replacements[$original] = $link->getEditRoute()->setOptions($url_options)->toString();
- break;
- }
- }
-
- // Chained token relationships.
- if (($menu_tokens = \Drupal::token()->findWithPrefix($tokens, 'menu')) && $menu = Menu::load($link->getMenuName())) {
- $replacements += \Drupal::token()->generate('menu', $menu_tokens, array('menu' => $menu), $options, $bubbleable_metadata);
- }
- }
-
- // Menu tokens.
- if ($type == 'menu' && !empty($data['menu'])) {
- /** @var \Drupal\system\MenuInterface $menu */
- $menu = $data['menu'];
-
- foreach ($tokens as $name => $original) {
- switch ($name) {
- case 'name':
- $replacements[$original] = $menu->label();
- break;
-
- case 'machine-name':
- $replacements[$original] = $menu->id();
- break;
-
- case 'description':
- $replacements[$original] = $menu->getDescription();
- break;
-
- case 'menu-link-count':
- $replacements[$original] = $menu_link_manager->countMenuLinks($menu->id());
- break;
-
- case 'edit-url':
- $replacements[$original] = Url::fromRoute('entity.menu.edit_form', ['menu' => $menu->id()], $url_options)->toString();
- break;
- }
- }
- }
-
- return $replacements;
-}
-
-/**
- * Returns a best matched link for a given node.
- *
- * If the url exists in multiple menus, default to the one set on the node
- * itself.
- *
- * @param \Drupal\node\NodeInterface $node
- * The node to look up the default menu settings from.
- * @param array $links
- * An array of instances keyed by plugin ID.
- *
- * @return \Drupal\Core\Menu\MenuLinkInterface
- * A Link instance.
- */
-function _token_menu_link_best_match(NodeInterface $node, array $links) {
- // Get the menu ui defaults so we can determine what menu was
- // selected for this node. This ensures that if the node was added
- // to the menu via the node UI, we use that as a default. If it
- // was not added via the node UI then grab the first in the
- // retrieved array.
- $defaults = menu_ui_get_menu_link_defaults($node);
- if (isset($defaults['id']) && isset($links[$defaults['id']])) {
- $link = $links[$defaults['id']];
- }
- else {
- $link = reset($links);
- }
- return $link;
-}
-
-/**
- * Implements hook_token_info_alter() on behalf of field.module.
- *
- * We use hook_token_info_alter() rather than hook_token_info() as other
- * modules may already have defined some field tokens.
- */
-function field_token_info_alter(&$info) {
- $type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
-
- // Attach field tokens to their respecitve entity tokens.
- foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) {
- if (!$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface')) {
- continue;
- }
-
- // Make sure a token type exists for this entity.
- $token_type = \Drupal::service('token.entity_mapper')->getTokenTypeForEntityType($entity_type_id);
- if (empty($token_type)) {
- continue;
- }
-
- $fields = \Drupal::service('entity_field.manager')->getFieldStorageDefinitions($entity_type_id);
- foreach ($fields as $field_name => $field) {
- /** @var \Drupal\field\FieldStorageConfigInterface $field */
- // Ensure the token type exists.
- if (!isset($info['types'][$token_type])) {
- continue;
- }
-
- // Ensure the token implements FieldStorageConfigInterface or is defined
- // in token module.
- $provider = '';
- if (isset($info['types'][$token_type]['module'])) {
- $provider = $info['types'][$token_type]['module'];
- }
- if (!($field instanceof FieldStorageConfigInterface) && $provider != 'token') {
- continue;
- }
-
- // If a token already exists for this field, then don't add it.
- if (isset($info['tokens'][$token_type][$field_name])) {
- continue;
- }
-
- if ($token_type == 'comment' && $field_name == 'comment_body') {
- // Core provides the comment field as [comment:body].
- continue;
- }
-
- // Do not define the token type if the field has no properties.
- if (!$field->getPropertyDefinitions()) {
- continue;
- }
-
- // Generate a description for the token.
- $labels = _token_field_label($entity_type_id, $field_name);
- $label = array_shift($labels);
- $params['@type'] = $type_info[$field->getType()]['label'];
- if (!empty($labels)) {
- $params['%labels'] = implode(', ', $labels);
- $description = t('@type field. Also known as %labels.', $params);
- }
- else {
- $description = t('@type field.', $params);
- }
-
- $cardinality = $field->getCardinality();
- $cardinality = ($cardinality == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED || $cardinality > 3) ? 3 : $cardinality;
- $field_token_name = $token_type . '-' . $field_name;
- $info['tokens'][$token_type][$field_name] = array(
- 'name' => Html::escape($label),
- 'description' => $description,
- 'module' => 'token',
- // For multivalue fields the field token is a list type.
- 'type' => $cardinality > 1 ? "list<$field_token_name>" : $field_token_name,
- );
-
- // Field token type.
- $info['types'][$field_token_name] = [
- 'name' => Html::escape($label),
- 'description' => t('@label tokens.', ['@label' => Html::escape($label)]),
- 'needs-data' => $field_token_name,
- 'nested' => TRUE,
- ];
- // Field list token type.
- if ($cardinality > 1) {
- $info['types']["list<$field_token_name>"] = array(
- 'name' => t('List of @type values', array('@type' => Html::escape($label))),
- 'description' => t('Tokens for lists of @type values.', array('@type' => Html::escape($label))),
- 'needs-data' => "list<$field_token_name>",
- 'nested' => TRUE,
- );
- }
-
- // Show a different token for each field delta.
- if ($cardinality > 1) {
- for ($delta = 0; $delta < $cardinality; $delta++) {
- $info['tokens']["list<$field_token_name>"][$delta] = [
- 'name' => t('@type type with delta @delta', ['@type' => Html::escape($label), '@delta' => $delta]),
- 'module' => 'token',
- 'type' => $field_token_name,
- ];
- }
- }
-
- // Property tokens.
- foreach ($field->getPropertyDefinitions() as $property => $property_definition) {
- if (is_subclass_of($property_definition->getClass(), 'Drupal\Core\TypedData\PrimitiveInterface')) {
- $info['tokens'][$field_token_name][$property] = [
- 'name' => $property_definition->getLabel(),
- 'description' => $property_definition->getDescription(),
- 'module' => 'token',
- ];
- }
- elseif (($property_definition instanceof DataReferenceDefinitionInterface) && ($property_definition->getTargetDefinition() instanceof EntityDataDefinitionInterface)) {
- $referenced_entity_type = $property_definition->getTargetDefinition()->getEntityTypeId();
- $referenced_token_type = \Drupal::service('token.entity_mapper')->getTokenTypeForEntityType($referenced_entity_type);
- $info['tokens'][$field_token_name][$property] = [
- 'name' => $property_definition->getLabel(),
- 'description' => $property_definition->getDescription(),
- 'module' => 'token',
- 'type' => $referenced_token_type,
- ];
- }
- }
- // Provide image_with_image_style tokens for image fields.
- if ($field->getType() == 'image') {
- $image_styles = image_style_options(FALSE);
- foreach ($image_styles as $style => $description) {
- $info['tokens'][$field_token_name][$style] = [
- 'name' => $description,
- 'description' => t('Represents the image in the given image style.'),
- 'type' => 'image_with_image_style',
- ];
- }
- }
- // Provide format token for datetime fields.
- if ($field->getType() == 'datetime') {
- $info['tokens'][$field_token_name]['date'] = $info['tokens'][$field_token_name]['value'];
- $info['tokens'][$field_token_name]['date']['name'] .= ' ' . t('format');
- $info['tokens'][$field_token_name]['date']['type'] = 'date';
- }
- if ($field->getType() == 'daterange') {
- $info['tokens'][$field_token_name]['start_date'] = $info['tokens'][$field_token_name]['value'];
- $info['tokens'][$field_token_name]['start_date']['name'] .= ' ' . t('format');
- $info['tokens'][$field_token_name]['start_date']['type'] = 'date';
- $info['tokens'][$field_token_name]['end_date'] = $info['tokens'][$field_token_name]['end_value'];
- $info['tokens'][$field_token_name]['end_date']['name'] .= ' ' . t('format');
- $info['tokens'][$field_token_name]['end_date']['type'] = 'date';
- }
- }
- }
-}
-
-/**
- * Returns the label of a certain field.
- *
- * Therefore it looks up in all bundles to find the most used instance.
- *
- * Based on views_entity_field_label().
- *
- * @todo Resync this method with views_entity_field_label().
- */
-function _token_field_label($entity_type, $field_name) {
- $labels = [];
- // Count the amount of instances per label per field.
- foreach (array_keys(\Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type)) as $bundle) {
- $bundle_instances = \Drupal::service('entity_field.manager')->getFieldDefinitions($entity_type, $bundle);
- if (isset($bundle_instances[$field_name])) {
- $instance = $bundle_instances[$field_name];
- $label = (string) $instance->getLabel();
- $labels[$label] = isset($labels[$label]) ? ++$labels[$label] : 1;
- }
- }
-
- if (empty($labels)) {
- return [$field_name];
- }
-
- // Sort the field labels by it most used label and return the labels.
- arsort($labels);
- return array_keys($labels);
-}
-
-/**
- * Implements hook_tokens() on behalf of field.module.
- */
-function field_tokens($type, $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
- $replacements = array();
- $langcode = isset($options['langcode']) ? $options['langcode'] : NULL;
- // Entity tokens.
- if ($type == 'entity' && !empty($data['entity_type']) && !empty($data['entity']) && !empty($data['token_type'])) {
- /* @var \Drupal\Core\Entity\ContentEntityInterface $entity */
- $entity = $data['entity'];
- if (!($entity instanceof ContentEntityInterface)) {
- return $replacements;
- }
-
- if (!isset($options['langcode'])) {
- // Set the active language in $options, so that it is passed along.
- $langcode = $options['langcode'] = $entity->language()->getId();
- }
- // Obtain the entity with the correct language.
- $entity = \Drupal::service('entity.repository')->getTranslationFromContext($entity, $langcode);
-
- $view_mode_name = $entity->getEntityTypeId() . '.' . $entity->bundle() . '.token';
- $view_display = \Drupal::entityTypeManager()->getStorage('entity_view_display')->load($view_mode_name);
- $token_view_display = (!empty($view_display) && $view_display->status());
- foreach ($tokens as $name => $original) {
- // For the [entity:field_name] token.
- if (strpos($name, ':') === FALSE) {
- $field_name = $name;
- $token_name = $name;
- }
- // For [entity:field_name:0], [entity:field_name:0:value] and
- // [entity:field_name:value] tokens.
- else {
- list($field_name, $delta) = explode(':', $name, 2);
- if (!is_numeric($delta)) {
- unset($delta);
- }
- $token_name = $field_name;
- }
- // Ensure the entity has the requested field and that the token for it is
- // defined by token.module.
- if (!$entity->hasField($field_name) || _token_module($data['token_type'], $token_name) != 'token') {
- continue;
- }
-
- $display_options = 'token';
- // Do not continue if the field is empty.
- if ($entity->get($field_name)->isEmpty()) {
- continue;
- }
- // Handle [entity:field_name] and [entity:field_name:0] tokens.
- if ($field_name === $name || isset($delta)) {
- if (!$token_view_display) {
- // We don't have the token view display and should fall back on
- // default formatters. If the field has specified a specific formatter
- // to be used by default with tokens, use that, otherwise use the
- // default formatter.
- /** @var \Drupal\Core\Field\FieldTypePluginManager $field_type_manager */
- $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
- $field_type_definition = $field_type_manager->getDefinition($entity->getFieldDefinition($field_name)->getType());
- $display_options = [
- 'type' => !empty($field_type_definition['default_token_formatter']) ? $field_type_definition['default_token_formatter'] : $field_type_definition['default_formatter'],
- 'label' => 'hidden',
- ];
- }
-
- // Render only one delta.
- if (isset($delta)) {
- if ($field_delta = $entity->{$field_name}[$delta]) {
- $field_output = $field_delta->view($display_options);
- }
- // If no such delta exists, let's not replace the token.
- else {
- continue;
- }
- }
- // Render the whole field (with all deltas).
- else {
- $field_output = $entity->$field_name->view($display_options);
- // If we are displaying all field items we need this #pre_render
- // callback.
- $field_output['#pre_render'][] = 'token_pre_render_field_token';
- }
- $field_output['#token_options'] = $options;
- $replacements[$original] = \Drupal::service('renderer')->renderPlain($field_output);
- }
- // Handle [entity:field_name:value] and [entity:field_name:0:value]
- // tokens.
- else if ($field_tokens = \Drupal::token()->findWithPrefix($tokens, $field_name)) {
- $property_token_data = [
- 'field_property' => TRUE,
- $data['entity_type'] . '-' . $field_name => $entity->$field_name,
- 'field_name' => $data['entity_type'] . '-' . $field_name,
- ];
- $replacements += \Drupal::token()->generate($field_name, $field_tokens, $property_token_data, $options, $bubbleable_metadata);
- }
- }
-
- // Remove the cloned object from memory.
- unset($entity);
- }
- elseif (!empty($data['field_property'])) {
- foreach ($tokens as $token => $original) {
- $filtered_tokens = $tokens;
- $delta = 0;
- $parts = explode(':', $token);
- if (is_numeric($parts[0])) {
- if (count($parts) > 1) {
- $delta = $parts[0];
- $property_name = $parts[1];
- // Pre-filter the tokens to select those with the correct delta.
- $filtered_tokens = \Drupal::token()->findWithPrefix($tokens, $delta);
- // Remove the delta to unify between having and not having one.
- array_shift($parts);
- }
- else {
- // Token is fieldname:delta, which is invalid.
- continue;
- }
- }
- else {
- $property_name = $parts[0];
- }
-
- if (isset($data[$data['field_name']][$delta])) {
- $field_item = $data[$data['field_name']][$delta];
- }
- else {
- // The field has no such delta, abort replacement.
- continue;
- }
-
- if (isset($field_item->$property_name) && ($field_item->$property_name instanceof FieldableEntityInterface)) {
- // Entity reference field.
- $entity = $field_item->$property_name;
- // Obtain the referenced entity with the correct language.
- $entity = \Drupal::service('entity.repository')->getTranslationFromContext($entity, $langcode);
-
- if (count($parts) > 1) {
- $field_tokens = \Drupal::token()->findWithPrefix($filtered_tokens, $property_name);
- $token_type = \Drupal::service('token.entity_mapper')->getTokenTypeForEntityType($entity->getEntityTypeId(), TRUE);
- $replacements += \Drupal::token()->generate($token_type, $field_tokens, [$token_type => $entity], $options, $bubbleable_metadata);
- }
- else {
- $replacements[$original] = $entity->label();
- }
- }
- elseif (($field_item->getFieldDefinition()->getType() == 'image') && ($style = ImageStyle::load($property_name))) {
- // Handle [node:field_name:image_style:property] tokens and multivalued
- // [node:field_name:delta:image_style:property] tokens. If the token is
- // of the form [node:field_name:image_style], provide the URL as a
- // replacement.
- $property_name = isset($parts[1]) ? $parts[1] : 'url';
- $entity = $field_item->entity;
- $original_uri = $entity->getFileUri();
-
- // Only generate the image derivative if needed.
- if ($property_name === 'width' || $property_name === 'height') {
- $dimensions = [
- 'width' => $field_item->width,
- 'height' => $field_item->height,
- ];
- $style->transformDimensions($dimensions, $original_uri);
- $replacements[$original] = $dimensions[$property_name];
- }
- elseif ($property_name === 'uri') {
- $replacements[$original] = $style->buildUri($original_uri);
- }
- elseif ($property_name === 'url') {
- $replacements[$original] = $style->buildUrl($original_uri);
- }
- else {
- // Generate the image derivative, if it doesn't already exist.
- $derivative_uri = $style->buildUri($original_uri);
- $derivative_exists = TRUE;
- if (!file_exists($derivative_uri)) {
- $derivative_exists = $style->createDerivative($original_uri, $derivative_uri);
- }
- if ($derivative_exists) {
- $image = \Drupal::service('image.factory')->get($derivative_uri);
- // Provide the replacement.
- switch ($property_name) {
- case 'mimetype':
- $replacements[$original] = $image->getMimeType();
- break;
- case 'filesize' :
- $replacements[$original] = $image->getFileSize();
- break;
- }
- }
- }
- }
- elseif (in_array($field_item->getFieldDefinition()->getType(), ['datetime', 'daterange']) && in_array($property_name, ['date', 'start_date', 'end_date'])) {
- $datetime = $field_item->$property_name->getTimestamp();
- if($property_name == $token) {
- $replacements[$original] = $datetime;
- }
- else {
- $field_tokens = \Drupal::token()->findWithPrefix($tokens, $property_name);
- $replacements += \Drupal::token()->generate('date', $field_tokens, ['date' => $datetime], $options, $bubbleable_metadata);
- }
- }
- else {
- $replacements[$original] = $field_item->$property_name;
- }
- }
- }
- return $replacements;
-}
-
-/**
- * Pre-render callback for field output used with tokens.
- */
-function token_pre_render_field_token($elements) {
- // Remove the field theme hook, attachments, and JavaScript states.
- unset($elements['#theme']);
- unset($elements['#states']);
- unset($elements['#attached']);
-
- // Prevent multi-value fields from appearing smooshed together by appending
- // a join suffix to all but the last value.
- $deltas = Element::getVisibleChildren($elements);
- $count = count($deltas);
- if ($count > 1) {
- $join = isset($elements['#token_options']['join']) ? $elements['#token_options']['join'] : ", ";
- foreach ($deltas as $index => $delta) {
- // Do not add a suffix to the last item.
- if ($index < ($count - 1)) {
- $elements[$delta] += array('#suffix' => $join);
- }
- }
- }
- return $elements;
-}
diff --git a/modules/tour_ui/LICENSE.txt b/modules/tour_ui/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/tour_ui/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/tour_ui/README.txt b/modules/tour_ui/README.txt
deleted file mode 100644
index 0f01590..0000000
--- a/modules/tour_ui/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is the UI for core module Tour
diff --git a/modules/tour_ui/src/Controller/TourTipController.php b/modules/tour_ui/src/Controller/TourTipController.php
deleted file mode 100644
index 23c5f4d..0000000
--- a/modules/tour_ui/src/Controller/TourTipController.php
+++ /dev/null
@@ -1,127 +0,0 @@
-tipPluginManager = $tipPluginManager;
- $this->formBuilder = $form_builder;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('plugin.manager.tour.tip'),
- $container->get('form_builder')
- );
- }
-
- /**
- * Provides a creation form for a new tip to be added to a tour entity.
- *
- * @param $tour
- * The tour in which the tip needs to be added to.
- *
- * @param $type
- * The type of tip that will be added to the tour.
- *
- * @return array
- * A renderable form array.
- */
- public function add(Tour $tour, $type = '') {
- // We need a type to build this form.
- if (!$type) {
- throw new NotFoundHttpException();
- }
-
- // Default values.
- $request = \Drupal::service('request_stack');
- $defaults = array(
- 'plugin' => Html::escape($type),
- 'weight' => $request->getCurrentRequest()->query->get('weight'),
- );
-
- // Build a new stub tip.
- $manager = \Drupal::service('plugin.manager.tour.tip');
- $stub = $manager->createInstance($type, $defaults);
-
- // Attach the tour, tip and if it's new to the form.
- $form_state = new FormState();
- $form_state->setFormState([
- '#tour' => $tour,
- '#tip' => $stub,
- '#new' => TRUE,
- ]);
- return $this->formBuilder->buildForm('\Drupal\tour_ui\Form\TourTipForm', $form_state);
- }
-
- /**
- * Provides an edit form for tip to be updated against a tour entity.
- *
- * @param $tour
- * The tour in which the tip is being edited against.
- *
- * @param $tip
- * The identifier of tip that will be edited against the tour.
- *
- * @return array
- * A renderable form array.
- */
- public function edit(Tour $tour, $tip = '') {
- // We need a tip to build this form.
- if (!$tip && !$tour) {
- throw new NotFoundHttpException();
- }
-
- // If the tip doesn't exist return.
- $tips = array_keys($tour->getTips());
- if (!in_array($tip, $tips)) {
- throw new NotFoundHttpException();
- }
-
- // Attach the tour and tip.
- $form_state = new FormState();
- $form_state->setFormState([
- '#tour' => $tour,
- '#tip' => $tour->getTip($tip),
- ]);
- return $this->formBuilder->buildForm('\Drupal\tour_ui\Form\TourTipForm', $form_state);
- }
-
-}
diff --git a/modules/tour_ui/src/Form/TourDeleteForm.php b/modules/tour_ui/src/Form/TourDeleteForm.php
deleted file mode 100644
index cdec37f..0000000
--- a/modules/tour_ui/src/Form/TourDeleteForm.php
+++ /dev/null
@@ -1,19 +0,0 @@
-get('entity_type.manager')
- );
- }
-
- /**
- * Constructs a TourForm object.
- *
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
- * The entity manager service.
- * @param \Psr\Log\LoggerInterface $logger
- * A logger instance.
- * @param \Drupal\comment\CommentManagerInterface $comment_manager
- * The comment manager.
- */
- public function __construct(EntityTypeManagerInterface $entity_type_manager) {
- $this->entityTypeManager = $entity_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- $tour = $this->entity;
- $form = parent::form($form, $form_state);
- $form['label'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Tour name'),
- '#required' => TRUE,
- '#default_value' => $tour->label(),
- ];
- $form['id'] = [
- '#type' => 'machine_name',
- '#machine_name' => [
- 'exists' => '\Drupal\tour\Entity\Tour::load',
- 'replace_pattern' => '[^a-z0-9-]+',
- 'replace' => '-',
- ],
- '#default_value' => $tour->id(),
- '#disabled' => !$tour->isNew(),
- ];
-
- $form['langcode'] = [
- '#type' => 'language_select',
- '#title' => $this->t('Language'),
- '#languages' => LanguageInterface::STATE_ALL,
- // Default to the content language opposed to und (language not specified).
- '#default_value' => empty($tour->langcode) ? \Drupal::languageManager()->getCurrentLanguage()->getId() : $tour->langcode,
- ];
- $form['module'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Module name'),
- '#description' => $this->t('Each tour needs a module.'),
- '#required' => TRUE,
- '#default_value' => $tour->get('module'),
- ];
-
- $default_routes = [];
- if ($routes = $tour->getRoutes()) {
- foreach ($routes as $route) {
- $default_routes[] = $route['route_name'];
- }
- }
- $form['routes'] = [
- '#type' => 'textarea',
- '#title' => $this->t('Routes'),
- '#default_value' => implode("\n", $default_routes),
- '#rows' => 5,
- '#description' => $this->t('Provide a list of routes that this tour will be displayed on. Add one route by line.'),
- ];
-
- // Don't show the tips on the inital add.
- if ($tour->isNew()) {
- return $form;
- }
-
- // Start building the list of tips assigned to this tour.
- $form['tips'] = [
- '#type' => 'table',
- '#header' => [
- $this->t('Label'),
- $this->t('Weight'),
- $this->t('Operations'),
- ],
- '#caption' => [['#markup' => $this->t('Tips provided by this tour. By clicking on Operations buttons, every changes which are not saved will be lost.')]],
- '#tabledrag' => [
- [
- 'action' => 'order',
- 'relationship' => 'sibling',
- 'group' => 'tip-order-weight'
- ],
- ],
- '#weight' => 40,
- ];
-
- // Populate the table with the assigned tips.
- $tips = $tour->getTips();
- if (!empty($tips)) {
- foreach ($tips as $key => $tip) {
- $tip_id = $tip->get('id');
- try {
- $form['#data'][$tip_id] = $tip->getConfiguration();
- }
- catch (\Error $e) {
- drupal_set_message($this->t('Tip %tip is not configurable. You cannot save this tour.', ['%tip' => $tip->getLabel()]), 'warning');
- }
- $form['tips'][$tip_id]['#attributes']['class'][] = 'draggable';
- $form['tips'][$tip_id]['label'] = [
- '#plain_text' => $tip->get('label'),
- ];
-
- $form['tips'][$tip_id]['weight'] = [
- '#type' => 'weight',
- '#title' => $this->t('Weight for @title', ['@title' => $tip->get('label')]),
- '#delta' => 100,
- '#title_display' => 'invisible',
- '#default_value' => $tip->get('weight'),
- '#attributes' => [
- 'class' => ['tip-order-weight'],
- ],
- ];
-
- // Provide operations links for the tip.
- $links = [];
- if (method_exists($tip, 'buildConfigurationForm')) {
- $links['edit'] = [
- 'title' => $this->t('Edit'),
- 'url' => Url::fromRoute('tour_ui.tip.edit', ['tour' => $tour->id(), 'tip' => $tip_id]),
- ];
- }
- $links['delete'] = [
- 'title' => $this->t('Delete'),
- 'url' => Url::fromRoute('tour_ui.tip.delete', ['tour' => $tour->id(), 'tip' => $tip_id]),
- ];
- $form['tips'][$tip_id]['operations'] = [
- '#type' => 'operations',
- '#links' => $links,
- ];
- }
- }
-
- // Build the new tour tip addition form and add it to the tips list.
- $tip_definitions = \Drupal::service('plugin.manager.tour.tip')->getDefinitions();
- $tip_definition_options = [];
- foreach ($tip_definitions as $tip => $definition) {
- if (method_exists($definition['class'], 'buildConfigurationForm')) {
- $tip_definition_options[$tip] = $definition['title'];
- }
- }
-
- $user_input = $form_state->getUserInput();
- $form['tips']['new'] = [
- '#tree' => FALSE,
- '#weight' => isset($user_input['weight']) ? $user_input['weight'] : 0,
- '#attributes' => [
- 'class' => ['draggable'],
- ],
- ];
- $form['tips']['new']['new'] = [
- '#type' => 'select',
- '#title' => $this->t('Tip'),
- '#title_display' => 'invisible',
- '#options' => $tip_definition_options,
- '#empty_option' => $this->t('Select a new tip'),
- ];
- $form['tips']['new']['weight'] = [
- '#type' => 'weight',
- '#title' => $this->t('Weight for new tip'),
- '#title_display' => 'invisible',
- '#default_value' => count($form['tips']) - 1,
- '#attributes' => [
- 'class' => ['tip-order-weight'],
- ],
- ];
- $form['tips']['new']['add'] = [
- '#type' => 'submit',
- '#value' => $this->t('Add'),
- '#validate' => [[$this, 'tipValidate']],
- '#submit' => [[$this, 'tipAdd']],
- ];
-
- return $form;
- }
-
- /**
- * Validate handler.
- */
- public function tipValidate($form, FormStateInterface $form_state) {
- if (!$form_state->getValue('new')) {
- $form_state->setError($form['tips']['new']['new'], $this->t('Select a new tip.'));
- }
- }
-
- /**
- * Submit handler.
- */
- public function tipAdd($form, FormStateInterface $form_state) {
- $tour = $this->getEntity($form_state);
-
- $this::submitForm($form, $form_state, FALSE);
-
- $weight = 0;
- if (!$form_state->isValueEmpty('tips')) {
- // Get last weight.
- foreach ($form_state->getValue('tips') as $tip) {
- if ($tip['weight'] > $weight) {
- $weight = $tip['weight'] + 1;
- }
- }
- }
-
- $manager = \Drupal::service('plugin.manager.tour.tip');
- $stub = $manager->createInstance($form_state->getValue('new'), []);
-
- // If a form is available for this tip then redirect to a add page.
- $stub_form = $stub->buildConfigurationForm([], new FormState());
- if (isset($stub_form)) {
- // Redirect to the appropriate page to add this new tip.
- $form_state->setRedirect('tour_ui.tip.add', ['tour' => $tour->id(), 'type' => $form_state->getValue('new')], ['query' => ['weight' => $weight]]);
- }
-
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state, $redirect = TRUE) {
- // Form cannot be validated if a tip has no #data, so no way to export
- // configuration.
- if (!$form_state->isValueEmpty('tips')) {
- foreach ($form_state->getValue('tips') as $key => $values) {
- if (!isset($form['#data'][$key])) {
- $form_state->setError($form['tips'][$key], $this->t('You cannot save the tour while %tip tip cannot be exported.', ['%tip' => $this->getEntity()->getTip($key)->getLabel()]));
- }
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state, $redirect = TRUE) {
- // Filter out invalid characters and convert to an array.
- $routes = [];
- $values_routes = preg_replace("/(\r\n?|\n)/", "\n", $form_state->getValue('routes'));
- $values_routes = explode("\n", $values_routes);
- $values_routes = array_map('trim', $values_routes);
- if (!empty($values_routes)) {
- foreach (array_filter($values_routes) as $route) {
- $routes[]['route_name'] = $route;
- }
- }
-
- $form_state->setValue('routes', array_filter($routes));
-
- // Merge the form values in with the current configuration.
- if (!$form_state->isValueEmpty('tips')) {
- $tips = [];
- foreach ($form_state->getValue('tips') as $key => $values) {
- $data = $form['#data'][$key];
- $tips[$key] = array_merge($data, $values);
- }
- $form_state->setValue('tips', $tips);
- }
- else {
- $form_state->setValue('tips', []);
- }
-
- parent::submitForm($form, $form_state);
-
- // Redirect to Entity edition.
- if ($redirect) {
- $form_state->setRedirect('entity.tour.edit_form', ['tour' => $this->entity->id()]);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete(array $form, FormStateInterface $form_state) {
- $entity = $this->getEntity($form_state);
- $form_state->setRedirect('entity.tour.delete_form', ['tour' => $entity->id()]);
- }
-
-}
diff --git a/modules/tour_ui/src/Form/TourTipDeleteForm.php b/modules/tour_ui/src/Form/TourTipDeleteForm.php
deleted file mode 100644
index 28d84d5..0000000
--- a/modules/tour_ui/src/Form/TourTipDeleteForm.php
+++ /dev/null
@@ -1,116 +0,0 @@
-entityTypeManager = $entity_type_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('entity_type.manager')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormID() {
- return 'tour_ui_tip_confirm_delete';
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return Url::fromRoute('entity.tour.edit_form', ['tour' => $this->entity->id()]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getQuestion() {
- return $this->t('Are you sure you want to delete the %tour tour %tip tip?', ['%tour' => $this->entity->label(), '%tip' => $this->tip->get('label')]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $tour = '', $tip = '') {
- $this->entity = $this->entityTypeManager->getStorage('tour')->load($tour);
- $tour = $this->entity;
- $this->tip = $tour->getTip($tip);
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- // Rebuild the tips and remove the irrelevant one.
- $candidate = $this->tip->get('id');
- $tips = array();
- foreach ($this->entity->getTips() as $tip) {
- $tip_id = $tip->get('id');
- if ($tip_id == $candidate) {
- continue;
- }
- $tips[$tip_id] = $tip->export();
- }
- $this->entity->set('tips', $tips);
- $this->entity->save();
-
- $form_state->setRedirect('entity.tour.edit_form', ['tour' => $this->entity->id()]);
- drupal_set_message($this->t('Deleted the %tour tour %tip tip.', ['%tour' => $this->entity->label(), '%tip' => $this->tip->get('label')]));
- }
-
-}
diff --git a/modules/tour_ui/src/Form/TourTipForm.php b/modules/tour_ui/src/Form/TourTipForm.php
deleted file mode 100644
index a7c8c16..0000000
--- a/modules/tour_ui/src/Form/TourTipForm.php
+++ /dev/null
@@ -1,186 +0,0 @@
-pluginManager = $plugin_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('plugin.manager.tour.tip')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'tour_ui_tip_test_form';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $storage = $form_state->getStorage();
- $tip = $storage['#tip'];
-
- $form += $tip->buildConfigurationForm($form, $form_state);
-
- // Retrieve and add the form actions array.
- $actions = $this->actionsElement($form, $form_state);
- if (!empty($actions)) {
- $form['actions'] = $actions;
- }
-
- return $form;
- }
-
- /**
- * Returns the action form element for the current entity form.
- */
- protected function actionsElement(array $form, FormStateInterface $form_state) {
- $element = $this->actions($form, $form_state);
-
- if (isset($element['delete'])) {
- // Move the delete action as last one, unless weights are explicitly
- // provided.
- $delete = $element['delete'];
- unset($element['delete']);
- $element['delete'] = $delete;
- $element['delete']['#button_type'] = 'danger';
- }
-
- if (isset($element['submit'])) {
- // Give the primary submit button a #button_type of primary.
- $element['submit']['#button_type'] = 'primary';
- }
-
- $count = 0;
- foreach (Element::children($element) as $action) {
- $element[$action] += array(
- '#weight' => ++$count * 5,
- );
- }
-
- if (!empty($element)) {
- $element['#type'] = 'actions';
- }
-
- return $element;
- }
-
- /**
- * Returns an array of supported actions for the current entity form.
- */
- protected function actions(array $form, FormStateInterface $form_state) {
- $actions['submit'] = array(
- '#type' => 'submit',
- '#value' => $this->t('Save'),
- '#submit' => array('::submitForm'),
- );
-
- $actions['delete'] = array(
- '#type' => 'link',
- '#title' => $this->t('Delete'),
- '#attributes' => array(
- 'class' => array('button', 'button--danger'),
- ),
- );
-
- return $actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- // Determine if one of our tips already exist.
- $storage = $form_state->getStorage();
- $tour = $storage['#tour'];
- $tips = $tour->getTips();
- // If there are no initial tips then we don't need to check.
- if (empty($tips)) {
- return;
- }
-
- $tip_ids = array_map(function($data) {
- return $data->id();
- }, $tips);
-
- if (in_array($form_state->getValue('id'), $tip_ids) && isset($storage['#new'])) {
- $form_state->setError($form['label'], $this->t('A tip with the same identifier exists.'));
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $storage = $form_state->getStorage();
- $tour = $storage['#tour'];
- $tip = $storage['#tip'];
- // Get available fields from current tip plugin.
- $configuration = $tip->getConfiguration();
-
- // Build a new tip.
- $new_tip = $tip->getConfiguration();
- foreach ($configuration as $name => $configuration_value) {
- $value = $form_state->getValue($name);
- $new_tip[$name] = is_array($value) ? array_filter($value) : $value;
- }
-
- // Rebuild the tips.
- $new_tip_list = $tour->getTips();
- $new_tips = array();
- if (!empty($new_tip_list)) {
- foreach ($new_tip_list as $tip) {
- $new_tips[$tip->id()] = $tip->getConfiguration();
- }
- }
-
- // Add our tip and save.
- $new_tips[$new_tip['id']] = $new_tip;
- $tour->set('tips', $new_tips);
- $tour->save();
-
- if (isset($storage['#new'])) {
- drupal_set_message($this->t('The %tip tip has been created.', array('%tip' => $new_tip['label'])));
- }
- else {
- drupal_set_message($this->t('Updated the %tip tip.', array('%tip' => $new_tip['label'])));
- }
-
- $form_state->setRedirect('entity.tour.edit_form', ['tour' => $tour->id()]);
- return $tour;
- }
-
-}
diff --git a/modules/tour_ui/src/Plugin/tour_ui/tip/TipPluginTextExtended.php b/modules/tour_ui/src/Plugin/tour_ui/tip/TipPluginTextExtended.php
deleted file mode 100644
index 9b7f076..0000000
--- a/modules/tour_ui/src/Plugin/tour_ui/tip/TipPluginTextExtended.php
+++ /dev/null
@@ -1,210 +0,0 @@
-get($name);
- }
- return $properties;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $id = $this->get('id');
- $form['label'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Label'),
- '#required' => TRUE,
- '#default_value' => $this->get('label'),
- ];
- $form['id'] = [
- '#type' => 'machine_name',
- '#machine_name' => [
- 'exists' => '\Drupal\tour\Entity\Tour::load',
- 'replace_pattern' => '[^a-z0-9-]+',
- 'replace' => '-',
- ],
- '#default_value' => $id,
- '#disabled' => !empty($id),
- ];
- $form['plugin'] = [
- '#type' => 'value',
- '#value' => $this->get('plugin'),
- ];
- $form['weight'] = [
- '#type' => 'weight',
- '#title' => $this->t('Weight'),
- '#default_value' => $this->get('weight'),
- '#attributes' => [
- 'class' => ['tip-order-weight'],
- ],
- '#delta' => 100,
- ];
-
- $attributes = $this->getAttributes();
- $form['attributes'] = [
- '#type' => 'fieldset',
- '#title' => $this->t('Attributes'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- '#tree' => TRUE,
- ];
-
- // Determine the type identifier of the tip.
- if (!empty($attributes['data-id'])) {
- $tip_type = 'data-id';
- }
- else if (!empty($attributes['data-class'])) {
- $tip_type = 'data-class';
- }
- else {
- $tip_type = 'modal';
- }
- $form['attributes']['selector_type'] = [
- '#type' => 'select',
- '#title' => $this->t('Selector type'),
- '#description' => $this->t('The type of selector that this tip will target.'),
- '#options' => [
- 'data-id' => $this->t('Data ID'),
- 'data-class' => $this->t('Data Class'),
- 'modal' => $this->t('Modal'),
- ],
- '#default_value' => $tip_type,
- '#element_validate' => [[$this, 'optionsFormValidate']],
- ];
- $form['attributes']['data-id'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Data id'),
- '#description' => $this->t('Provide the ID of the page element.'),
- '#field_prefix' => '#',
- '#default_value' => !empty($attributes['data-id']) ? $attributes['data-id'] : '',
- '#states' => [
- 'visible' => [
- 'select[name="attributes[selector_type]"]' => ['value' => 'data-id'],
- ],
- 'enabled' => [
- 'select[name="attributes[selector_type]"]' => ['value' => 'data-id'],
- ],
- ],
- ];
- $form['attributes']['data-class'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Data class'),
- '#description' => $this->t('Provide the Class of the page element. You can provide more complexe jquery selection like action-links a[href="/admin/structure/forum/add/forum"] '),
- '#field_prefix' => '.',
- '#default_value' => !empty($attributes['data-class']) ? $attributes['data-class'] : '',
- '#states' => [
- 'visible' => [
- 'select[name="attributes[selector_type]"]' => ['value' => 'data-class'],
- ],
- 'enabled' => [
- 'select[name="attributes[selector_type]"]' => ['value' => 'data-class'],
- ],
- ],
- ];
-
- $form['location'] = [
- '#type' => 'select',
- '#title' => $this->t('Location'),
- '#options' => [
- 'top' => $this->t('Top'),
- 'bottom' => $this->t('Bottom'),
- 'left' => $this->t('Left'),
- 'right' => $this->t('Right'),
- ],
- '#default_value' => $this->get('location'),
- ];
- $form['body'] = [
- '#type' => 'textarea',
- '#title' => $this->t('Body'),
- '#required' => TRUE,
- '#default_value' => $this->get('body'),
- ];
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- }
-
- /**
- * Validates the selector_type tip optionsForm().
- *
- * @param $element
- * The form element that has the validate attached.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The state of the form after submission.
- * @param $form
- * The form array.
- */
- public function optionsFormValidate($element, FormStateInterface $form_state, $form) {
- $selector_type = $form_state->get(['attributes', 'selector_type']);
- $form_state->unsetValue(['attributes', 'selector_type']);
-
- // If modal we need to ensure that there is no data-id or data-class specified.
- if ($selector_type == 'modal') {
- $form_state->unsetValue(['attributes', 'data-id']);
- $form_state->unsetValue(['attributes', 'data-class']);
- }
-
- // If data-id was selected and no id provided.
- if ($selector_type == 'data-id' && $form_state->isValueEmpty(['attributes', 'data-id'])) {
- $form_state->setError($form['attributes']['data-id'], $this->t('Please provide a data id.'));
- }
-
- // If data-class was selected and no class provided.
- if ($selector_type == 'data-class' && $form_state->isValueEmpty(['attributes', 'data-class'])) {
- $form_state->setError($form['attributes']['data-class'], $this->t('Please provide a data class.'));
- }
-
- // Remove the data-class value if data-id is provided.
- if ($selector_type == 'data-id') {
- $form_state->unsetValue(['attributes', 'data-class']);
- }
-
- // Remove the data-id value is data-class is provided.
- if ($selector_type == 'data-class') {
- $form_state->unsetValue(['attributes', 'data-id']);
- }
- }
-}
diff --git a/modules/tour_ui/src/Tests/TourUITest.php b/modules/tour_ui/src/Tests/TourUITest.php
deleted file mode 100644
index 9e9da15..0000000
--- a/modules/tour_ui/src/Tests/TourUITest.php
+++ /dev/null
@@ -1,189 +0,0 @@
- 'Tour UI',
- 'description' => 'Tests the Tour UI.',
- 'group' => 'Tour',
- );
- }
-
- /**
- * Tests the listing and editing of a tour.
- */
- public function testUI() {
- $this->drupalLogin($this->root_user);
- $this->listTest();
- $this->editTest();
- $this->tipTest();
- }
-
- /**
- * Tests the listing of a tour.
- */
- protected function listTest() {
- // Assert that two test tours are shown.
- $this->drupalGet('admin/config/user-interface/tour');
- $elements = $this->xpath('//table/tbody/tr');
- $this->assertEqual(count($elements), 2);
-
- // The first column contains the id.
- $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[1]', array(':class' => 'tour-test'));
- $this->assertIdentical((string) $elements[0], 'tour-test-2');
- // The second column contains the title.
- $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[2]', array(':class' => 'tour-test'));
- $this->assertIdentical((string) $elements[0], t('Tour test english'));
- // The third column contains the paths.
- $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td/a[contains(@href, :href)]', array(':class' => 'tour-test', ':href' => 'tour-test-1'));
- $this->assertIdentical((string) $elements[0], '/tour-test-1');
- // The fourth column contains the number of tips.
- $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[4]', array(':class' => 'tour-test'));
- $this->assertIdentical((string) $elements[0], '1', 'Core tour_test/config/tour-test-2 has 1 tip');
- $this->assertIdentical((string) $elements[1], '3', 'Core tour_test/config/tour-test-1 has 3 tips');
- }
-
- /**
- * Tests the editing of a tour.
- */
- protected function editTest() {
- // Create a new tour. Ensure that it comes before the test tours.
- $edit = array(
- 'label' => 'a' . $this->randomString(),
- 'id' => strtolower($this->randomName()),
- 'module' => strtolower($this->randomName()),
- );
- $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
- $this->assertRaw(t('The %tour tour has been created.', array('%tour' => $edit['label'])));
- $elements = $this->xpath('//table/tbody/tr');
- $this->assertEqual(count($elements), 1);
-
- // Edit and re-save an existing tour.
- $this->assertTitle(t('Edit tour | @site-name', array('@site-name' => config('system.site')->get('name'))));
- $this->drupalPost(NULL, array(), t('Save'));
- $this->assertRaw(t('Updated the %tour tour', array('%tour' => $edit['label'])));
-
- // Reorder the tour tips.
- $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
- $weights = array(
- 'tips[tour-test-1][weight]' => '2',
- 'tips[tour-test-3][weight]' => '1',
- );
- $this->drupalPost(NULL, $weights, t('Save'));
- $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
- $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
- ':class' => 'draggable odd',
- ':text' => 'The awesome image',
- ));
- $this->assertEqual(count($elements), 1, 'Found odd tip "The awesome image".');
- $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
- ':class' => 'draggable even',
- ':text' => 'The first tip',
- ));
- $this->assertEqual(count($elements), 1, 'Found even tip "The first tip".');
- $weights = array(
- 'tips[tour-test-1][weight]' => '1',
- 'tips[tour-test-3][weight]' => '2',
- );
- $this->drupalPost(NULL, $weights, t('Save'));
- $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
- $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
- ':class' => 'draggable odd',
- ':text' => 'The first tip',
- ));
- $this->assertEqual(count($elements), 1, 'Found odd tip "The first tip".');
- $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
- ':class' => 'draggable even',
- ':text' => 'The awesome image',
- ));
- $this->assertEqual(count($elements), 1, 'Found even tip "The awesome image".');
-
- // Attempt to create a duplicate tour.
- $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
- $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
-
- // Delete a tour.
- $this->drupalGet('admin/config/user-interface/tour/manage/' . $edit['id']);
- $this->drupalPost(NULL, NULL, t('Delete'));
- $this->assertRaw(t('Are you sure you want to delete the %tour tour?', array('%tour' => $edit['label'])));
- $this->clickLink(t('Cancel'));
- $this->clickLink(t('Delete'));
- $this->drupalPost(NULL, NULL, t('Delete'));
- $elements = $this->xpath('//table/tbody/tr');
- $this->assertEqual(count($elements), 2);
- $this->assertRaw(t('Deleted the %tour tour.', array('%tour' => $edit['label'])));
- }
-
- /**
- * Tests the add/edit/delete of a tour tip.
- */
- protected function tipTest() {
- // Create a new tour for tips to be added to.
- $edit = array(
- 'label' => 'a' . $this->randomString(),
- 'id' => strtolower($this->randomName()),
- 'module' => $this->randomString(),
- 'paths' => '',
- );
- $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
- $this->assertRaw(t('The %tour tour has been created.', array('%tour' => $edit['label'])));
-
- // Add a new tip.
- $tip = array(
- 'new' => 'image',
- );
- $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'], $tip, t('Add'));
- $tip = array(
- 'label' => 'a' . $this->randomString(),
- 'id' => 'tour-ui-test-image-tip',
- 'url' => 'http://testimage.png',
- 'alt' => 'Testing a new image tip through Tour UI.',
- );
- $this->drupalPost(NULL, $tip, t('Save'));
- $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
- ':class' => 'draggable odd',
- ':text' => $tip['label'],
- ));
- $this->assertEqual(count($elements), 1, 'Found tip "' . $tip['label']. '".');
-
- // Edit the tip.
- $tip_id = $tip['id'];
- unset($tip['id']);
- $tip['label'] = 'a' . $this->randomString();
- $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'] . '/tip/edit/' . $tip_id, $tip, t('Save'));
- $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
- ':class' => 'draggable odd',
- ':text' => $tip['label'],
- ));
- $this->assertEqual(count($elements), 1, 'Found tip "' . $tip['label']. '".');
-
- // Delete the tip.
- $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'] .'/tip/delete/' . $tip_id, array(), t('Delete'));
- $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
- ':class' => 'draggable odd',
- ':text' => $tip['label'],
- ));
- $this->assertNotEqual(count($elements), 1, 'Did not find tip "' . $tip['label']. '".');
- }
-
-}
diff --git a/modules/tour_ui/src/TourAccessControlHandler.php b/modules/tour_ui/src/TourAccessControlHandler.php
deleted file mode 100644
index c82e926..0000000
--- a/modules/tour_ui/src/TourAccessControlHandler.php
+++ /dev/null
@@ -1,25 +0,0 @@
-get('entity.manager')->getStorage($entity_type->id())
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildHeader() {
- $row['id'] = t('Id');
- $row['label'] = t('Label');
- $row['routes'] = t('routes');
- $row['tips'] = t('Number of tips');
- $row['operations'] = t('Operations');
- return $row;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- $row['title'] = [
- 'data' => $entity->label(),
- 'class' => ['menu-label'],
- ];
-
- $row = parent::buildRow($entity);
-
- $data['id'] = Html::escape($entity->id());
- $data['label'] = Html::escape($entity->label());
- // Include the routes this tour is used on.
- $routes_name = [];
- if ($routes = $entity->getRoutes()) {
- foreach ($routes as $route) {
- $routes_name[] = $route['route_name'];
- }
- }
- $data['routes'] = [
- 'data' => [
- '#type' => 'inline_template',
- '#template' => '{{ routes|safe_join("
',
- '#context' => array('routes' => $routes_name),
- ],
- ];
-
- // Count the number of tips.
- $data['tips'] = count($entity->getTips());
- $data['operations'] = $row['operations'];
- // Wrap the whole row so that the entity ID is used as a class.
- return [
- 'data' => $data,
- 'class' => [
- $entity->id(),
- ],
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getOperations(EntityInterface $entity) {
- $operations = parent::getOperations($entity);
-
- $operations['edit'] = [
- 'title' => t('Edit'),
- 'url' => $entity->toUrl('edit-form'),
- 'weight' => 1,
- ];
- $operations['delete'] = [
- 'title' => t('Delete'),
- 'url' => $entity->toUrl('delete-form'),
- 'weight' => 2,
- ];
-
- return $operations;
- }
-
- /**
- * {@inheritdoc}
- */
- public function render() {
- $build = parent::render();
- $build['#empty'] = $this->t('No tours available. Add tour .', [
- '@link' => 'tour_ui.tour.add',
- ]);
- return $build;
- }
-
-}
diff --git a/modules/tour_ui/tour_ui.info.yml b/modules/tour_ui/tour_ui.info.yml
deleted file mode 100644
index ddf7eed..0000000
--- a/modules/tour_ui/tour_ui.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Tour UI
-type: module
-description : 'Provides a UI to manage guided tours.'
-package: Development
-configure: admin/config/user-interface/tour
-# core: 8.x
-dependencies:
- - tour
-
-# Information added by Drupal.org packaging script on 2017-06-06
-version: '8.x-1.0-alpha1'
-core: '8.x'
-project: 'tour_ui'
-datestamp: 1496774344
diff --git a/modules/tour_ui/tour_ui.links.action.yml b/modules/tour_ui/tour_ui.links.action.yml
deleted file mode 100644
index 02ee757..0000000
--- a/modules/tour_ui/tour_ui.links.action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-tour_ui_tour_add_action:
- route_name: tour_ui.tour.add
- title: 'Add tour'
- appears_on:
- - entity.tour.collection
diff --git a/modules/tour_ui/tour_ui.links.menu.yml b/modules/tour_ui/tour_ui.links.menu.yml
deleted file mode 100644
index 7a92740..0000000
--- a/modules/tour_ui/tour_ui.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-entity.tour.collection:
- title: Tours
- description: 'Add and modify tours.'
- route_name: entity.tour.collection
- parent: system.admin_config_ui
diff --git a/modules/tour_ui/tour_ui.module b/modules/tour_ui/tour_ui.module
deleted file mode 100644
index 997c9e2..0000000
--- a/modules/tour_ui/tour_ui.module
+++ /dev/null
@@ -1,34 +0,0 @@
-setAccessClass('Drupal\tour_ui\TourAccessControlHandler');
- $entity_types['tour']->setFormClass('default', 'Drupal\tour_ui\Form\TourForm');
- $entity_types['tour']->setFormClass('add', 'Drupal\tour_ui\Form\TourForm');
- $entity_types['tour']->setFormClass('edit', 'Drupal\tour_ui\Form\TourForm');
- $entity_types['tour']->setFormClass('delete', 'Drupal\tour_ui\Form\TourDeleteForm');
- $entity_types['tour']->setListBuilderClass('Drupal\tour_ui\TourListBuilder');
- $entity_types['tour']->setLinkTemplate('add-form', '/admin/config/user-interface/tour/add');
- $entity_types['tour']->setLinkTemplate('edit-form', '/admin/config/user-interface/tour/manage/{tour}');
- $entity_types['tour']->setLinkTemplate('delete-form', '/admin/config/user-interface/tour/manage/{tour}/delete');
-}
-
-/**
- * Implements hook_tour_tips_info_alter().
- */
-function tour_ui_tour_tips_info_alter(&$info) {
- // Override the core text plugin.
- if (isset($info['text'])) {
- $info['text']['class'] = 'Drupal\tour_ui\Plugin\tour_ui\tip\TipPluginTextExtended';
- }
-}
diff --git a/modules/tour_ui/tour_ui.permissions.yml b/modules/tour_ui/tour_ui.permissions.yml
deleted file mode 100644
index 7e7b661..0000000
--- a/modules/tour_ui/tour_ui.permissions.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-administer tour:
- title: 'Administer tour'
- restrict access: true
diff --git a/modules/tour_ui/tour_ui.routing.yml b/modules/tour_ui/tour_ui.routing.yml
deleted file mode 100644
index 3c94657..0000000
--- a/modules/tour_ui/tour_ui.routing.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-entity.tour.collection:
- path: '/admin/config/user-interface/tour'
- defaults:
- _entity_list: 'tour'
- _title: 'Tours'
- requirements:
- _permission: 'administer tour'
-
-tour_ui.tour.add:
- path: '/admin/config/user-interface/tour/add'
- defaults:
- _entity_form: tour.default
- _title: 'Add tour'
- requirements:
- _permission: 'administer tour'
-
-entity.tour.edit_form:
- path: '/admin/config/user-interface/tour/manage/{tour}'
- defaults:
- _entity_form: tour.default
- _title: 'Edit tour'
- requirements:
- _permission: 'administer tour'
-
-entity.tour.delete_form:
- path: '/admin/config/user-interface/tour/manage/{tour}/delete'
- defaults:
- _entity_form: tour.delete
- requirements:
- _permission: 'administer tour'
-
-tour_ui.tip.add:
- path: '/admin/config/user-interface/tour/manage/{tour}/tip/add/{type}'
- defaults:
- _controller: '\Drupal\tour_ui\Controller\TourTipController:add'
- _title: 'Add tip'
- requirements:
- _permission: 'administer tour'
-
-tour_ui.tip.edit:
- path: '/admin/config/user-interface/tour/manage/{tour}/tip/edit/{tip}'
- defaults:
- _controller: '\Drupal\tour_ui\Controller\TourTipController:edit'
- _title: 'Edit tip'
- requirements:
- _permission: 'administer tour'
-
-tour_ui.tip.delete:
- path: '/admin/config/user-interface/tour/manage/{tour}/tip/delete/{tip}'
- defaults:
- _form: '\Drupal\tour_ui\Form\TourTipDeleteForm'
- _title: 'Delete tip'
- requirements:
- _permission: 'administer tour'
diff --git a/modules/typed_data/.gitignore b/modules/typed_data/.gitignore
deleted file mode 100644
index 61ead86..0000000
--- a/modules/typed_data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/vendor
diff --git a/modules/typed_data/.travis.yml b/modules/typed_data/.travis.yml
deleted file mode 100644
index 8793f0d..0000000
--- a/modules/typed_data/.travis.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-language: php
-# The Travis CI container mode has random functional test fails, so we must use
-# sudo here.
-sudo: true
-
-php:
- - 5.5
- - 5.6
- - 7
-
-env:
- global:
- # Make the script re-usable for other modules.
- - MODULE=typed_data
- matrix:
- - DRUPAL_CORE=8.3.x
- - DRUPAL_CORE=8.4.x
- - DRUPAL_CORE=8.5.x
-
-matrix:
- fast_finish: true
-
-mysql:
- database: $MODULE
- username: root
- encoding: utf8
-
-# Be sure to cache composer downloads.
-cache:
- directories:
- - $HOME/.composer
-
-before_script:
- - echo $MODULE
-
- # Remove Xdebug as we don't need it and it causes
- # PHP Fatal error: Maximum function nesting level of '256' reached.
- # We also don't care if that file exists or not on PHP 7.
- - phpenv config-rm xdebug.ini || true
-
- # Remember the current $MODULE test directory for later use in the Drupal
- # installation.
- - TESTDIR=$(pwd)
- # Navigate out of module directory to prevent blown stack by recursive module
- # lookup.
- - cd ..
-
- # Create database.
- - mysql -e "create database $MODULE"
- # Export database variable for kernel tests.
- - export SIMPLETEST_DB=mysql://root:@127.0.0.1/$MODULE
- # Download Drupal 8 core from the Github mirror because it is faster.
- - travis_retry git clone --branch $DRUPAL_CORE --depth 1 https://github.com/drupal/drupal.git
- - cd drupal
-
- # Reference $MODULE in build site.
- - ln -s $TESTDIR modules/$MODULE
-
- # Run composer install for Drupal 8.1 and up. We need an up-to-date composer
- # when installing Drupal 8.1.
- - travis_retry composer self-update && travis_retry composer install
- # Run composer install in the module directory in order to fetch dev
- # dependencies there. This includes phpcs & coder for checking coding style.
- - travis_retry composer -d=$TESTDIR install
-
- # Start a web server on port 8888, run in the background.
- - php -S localhost:8888 &
-
- # Export web server URL for browser tests.
- - export SIMPLETEST_BASE_URL=http://localhost:8888
-
-script:
- # Run the PHPUnit tests which also include the kernel tests.
- - ./vendor/bin/phpunit -c ./core/phpunit.xml.dist ./modules/$MODULE/tests/
- # Check for coding standards.
- - cd modules/$MODULE && ./vendor/bin/phpcs --colors --report-width=130
diff --git a/modules/typed_data/LICENSE.txt b/modules/typed_data/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/typed_data/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/typed_data/README.md b/modules/typed_data/README.md
deleted file mode 100644
index f6d1fce..0000000
--- a/modules/typed_data/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Typed Data API module
-
-[](https://travis-ci.org/fago/typed_data)
-
-Extends the core Typed Data API with new APIs and features.
-
-* Project homepage: https://www.drupal.org/project/typed_data
-* For example usage, see the Rules module: https://www.drupal.org/project/rules
-
-## Contributing
-
-Always use the [Typed Data module issue queue](https://www.drupal.org/project/issues/typed_data).
-
-Development happens on GitHub using the pull request model:
-in case you are not familiar with that, please take a few minutes to read the
-[GitHub article](https://help.github.com/articles/using-pull-requests) on using
-pull requests.
-
-There are a few conventions that should be followed when contributing:
-
-* Always create an issue in the [drupal.org Typed Data issue queue](https://www.drupal.org/project/issues/typed_data)
- for every pull request you are working on.
-* Always cross-reference the Issue in the Pull Request and the Pull Request in
- the issue.
-* Always create a new branch for every pull request: its name should contain a
- brief summary of the ticket and its issue id, e.g **readme-2276369**.
-* Try to keep the history of your pull request as clean as possible by squashing
- your commits: you can look at the [Symfony documentation](http://symfony.com/doc/current/cmf/contributing/commits.html)
- or at the [Git book](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
- for more information on how to do that.
-
-For further information on how to contribute please refer to
-[our documentation](https://thefubhy.gitbooks.io/typed_data/content/).
-
-## Checking coding style
-
-The module comes with a phpcs setup that is verifying a correct coding style.
-To run the check just execute the following command from the rules module
-directory:
-
- # Install phpcs as local dev dependency, then run it:
- composer install
- ./vendor/bin/phpcs
-
- # If there are some coding style violations that can be fixed
- # automatically, use the code beautifier:
- ./vendor/bin/phpcbf
-
-## Executing the automated tests
-
-This module comes with PHPUnit tests. You need a working Drupal 8 installation
-and a checkout of the Rules module in the modules folder.
-
-
-Make sure to use your DB connection details for the SIMPLETEST_DB and the URL to
-your local Drupal installation for SIMPLETEST_BASE_URL.
-
- cd /path/to/drupal-8/core
- export SIMPLETEST_DB=mysql://drupal-8:password@localhost/drupal-8
- export SIMPLETEST_BASE_URL=http://drupal-8.localhost
- ../vendor/bin/phpunit ../modules/typed_data
diff --git a/modules/typed_data/composer.json b/modules/typed_data/composer.json
deleted file mode 100644
index 3ab2925..0000000
--- a/modules/typed_data/composer.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "name": "drupal/typed_data",
- "description": "Extends the core Typed Data API with new APIS and features.",
- "type": "drupal-module",
- "license": "GPL-2.0+",
- "minimum-stability": "dev",
- "prefer-stable": true,
- "require": {
- },
- "require-dev" : {
- "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
- "drupal/coder": "8.2.*",
- "squizlabs/php_codesniffer": "2.9.*",
- "symfony/yaml": "3.*"
- }
-}
diff --git a/modules/typed_data/composer.lock b/modules/typed_data/composer.lock
deleted file mode 100644
index d817a3b..0000000
--- a/modules/typed_data/composer.lock
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "_readme": [
- "This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
- "This file is @generated automatically"
- ],
- "content-hash": "247b0db5635aea9acb1243e9fe4f7e73",
- "packages": [],
- "packages-dev": [
- {
- "name": "dealerdirect/phpcodesniffer-composer-installer",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/DealerDirect/phpcodesniffer-composer-installer.git",
- "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/DealerDirect/phpcodesniffer-composer-installer/zipball/63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
- "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.0",
- "php": "^5.3|^7",
- "squizlabs/php_codesniffer": "*"
- },
- "require-dev": {
- "composer/composer": "*",
- "wimg/php-compatibility": "^8.0"
- },
- "suggest": {
- "dealerdirect/qa-tools": "All the PHP QA tools you'll need"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
- },
- "autoload": {
- "psr-4": {
- "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Franck Nijhof",
- "email": "f.nijhof@dealerdirect.nl",
- "homepage": "http://workingatdealerdirect.eu",
- "role": "Developer"
- }
- ],
- "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
- "homepage": "http://workingatdealerdirect.eu",
- "keywords": [
- "PHPCodeSniffer",
- "PHP_CodeSniffer",
- "code quality",
- "codesniffer",
- "composer",
- "installer",
- "phpcs",
- "plugin",
- "qa",
- "quality",
- "standard",
- "standards",
- "style guide",
- "stylecheck",
- "tests"
- ],
- "time": "2017-09-18T07:49:36+00:00"
- },
- {
- "name": "drupal/coder",
- "version": "8.2.12",
- "source": {
- "type": "git",
- "url": "https://github.com/klausi/coder.git",
- "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/klausi/coder/zipball/984c54a7b1e8f27ff1c32348df69712afd86b17f",
- "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "php": ">=5.4.0",
- "squizlabs/php_codesniffer": ">=2.8.1 <3.0",
- "symfony/yaml": ">=2.0.0"
- },
- "require-dev": {
- "phpunit/phpunit": ">=3.7 <6"
- },
- "type": "phpcodesniffer-standard",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0+"
- ],
- "description": "Coder is a library to review Drupal code.",
- "homepage": "https://www.drupal.org/project/coder",
- "keywords": [
- "code review",
- "phpcs",
- "standards"
- ],
- "time": "2017-03-18T10:28:49+00:00"
- },
- {
- "name": "squizlabs/php_codesniffer",
- "version": "2.9.x-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "68fb8e5c76da4a220275ecce7179f25c9ecc2b13"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/68fb8e5c76da4a220275ecce7179f25c9ecc2b13",
- "reference": "68fb8e5c76da4a220275ecce7179f25c9ecc2b13",
- "shasum": ""
- },
- "require": {
- "ext-simplexml": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": ">=5.1.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0"
- },
- "bin": [
- "scripts/phpcs",
- "scripts/phpcbf"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "CodeSniffer.php",
- "CodeSniffer/CLI.php",
- "CodeSniffer/Exception.php",
- "CodeSniffer/File.php",
- "CodeSniffer/Fixer.php",
- "CodeSniffer/Report.php",
- "CodeSniffer/Reporting.php",
- "CodeSniffer/Sniff.php",
- "CodeSniffer/Tokens.php",
- "CodeSniffer/Reports/",
- "CodeSniffer/Tokenizers/",
- "CodeSniffer/DocGenerators/",
- "CodeSniffer/Standards/AbstractPatternSniff.php",
- "CodeSniffer/Standards/AbstractScopeSniff.php",
- "CodeSniffer/Standards/AbstractVariableSniff.php",
- "CodeSniffer/Standards/IncorrectPatternException.php",
- "CodeSniffer/Standards/Generic/Sniffs/",
- "CodeSniffer/Standards/MySource/Sniffs/",
- "CodeSniffer/Standards/PEAR/Sniffs/",
- "CodeSniffer/Standards/PSR1/Sniffs/",
- "CodeSniffer/Standards/PSR2/Sniffs/",
- "CodeSniffer/Standards/Squiz/Sniffs/",
- "CodeSniffer/Standards/Zend/Sniffs/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Greg Sherwood",
- "role": "lead"
- }
- ],
- "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "http://www.squizlabs.com/php-codesniffer",
- "keywords": [
- "phpcs",
- "standards"
- ],
- "time": "2017-07-13T01:37:12+00:00"
- },
- {
- "name": "symfony/yaml",
- "version": "v3.3.10",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/yaml.git",
- "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
- "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
- "shasum": ""
- },
- "require": {
- "php": "^5.5.9|>=7.0.8"
- },
- "require-dev": {
- "symfony/console": "~2.8|~3.0"
- },
- "suggest": {
- "symfony/console": "For validating YAML files using the lint command"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Yaml\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Yaml Component",
- "homepage": "https://symfony.com",
- "time": "2017-10-05T14:43:42+00:00"
- }
- ],
- "aliases": [],
- "minimum-stability": "dev",
- "stability-flags": {
- "dealerdirect/phpcodesniffer-composer-installer": 20
- },
- "prefer-stable": true,
- "prefer-lowest": false,
- "platform": [],
- "platform-dev": []
-}
diff --git a/modules/typed_data/phpcs.xml.dist b/modules/typed_data/phpcs.xml.dist
deleted file mode 100644
index 2db1c42..0000000
--- a/modules/typed_data/phpcs.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Default PHP CodeSniffer configuration for Rules.
- .
-
- ./vendor/
- ./config/
-
-
-
- src/Annotation
-
-
-
-
-
-
-
-
-
-
-
-
- README.md
-
-
diff --git a/modules/typed_data/src/Annotation/DataFilter.php b/modules/typed_data/src/Annotation/DataFilter.php
deleted file mode 100644
index d27f51b..0000000
--- a/modules/typed_data/src/Annotation/DataFilter.php
+++ /dev/null
@@ -1,30 +0,0 @@
-annotationReader)) {
- // Do not call out the parent, but re-configure the simple annotation
- // reader on our own, so we can control the order of namespaces.
- $this->annotationReader = new SimpleAnnotationReader();
-
- // Make sure to add our namespace first, so our ContextDefinition and
- // Condition annotations gets picked.
- $this->annotationReader->addNamespace('Drupal\typed_data\Context\Annotation');
- // Add the namespaces from the main plugin annotation, like @EntityType.
- $namespace = substr($this->pluginDefinitionAnnotationName, 0, strrpos($this->pluginDefinitionAnnotationName, '\\'));
- $this->annotationReader->addNamespace($namespace);
- // Add general core annotations like @Translation.
- $this->annotationReader->addNamespace('Drupal\Core\Annotation');
- }
- return $this->annotationReader;
- }
-
-}
diff --git a/modules/typed_data/src/Context/Annotation/ContextDefinition.php b/modules/typed_data/src/Context/Annotation/ContextDefinition.php
deleted file mode 100644
index 578c900..0000000
--- a/modules/typed_data/src/Context/Annotation/ContextDefinition.php
+++ /dev/null
@@ -1,51 +0,0 @@
- $value) {
- if ($value instanceof Translation) {
- $values[$key] = $value->get();
- }
- }
- $this->definition = TypedDataContextDefinition::createFromArray($values);
- }
-
- /**
- * Returns the value of an annotation.
- *
- * @return \Drupal\typed_data\Context\ContextDefinitionInterface
- * Return the Typed data version of the ContextDefinitionInterface.
- */
- public function get() {
- return $this->definition;
- }
-
-}
diff --git a/modules/typed_data/src/Context/ContextDefinition.php b/modules/typed_data/src/Context/ContextDefinition.php
deleted file mode 100644
index 34f90d0..0000000
--- a/modules/typed_data/src/Context/ContextDefinition.php
+++ /dev/null
@@ -1,120 +0,0 @@
- 'dataType',
- 'label' => 'label',
- 'description' => 'description',
- 'multiple' => 'isMultiple',
- 'required' => 'isRequired',
- 'default_value' => 'defaultValue',
- 'constraints' => 'constraints',
- 'allow_null' => 'allowNull',
- 'assignment_restriction' => 'assignmentRestriction',
- ];
-
- /**
- * Whether the context value is allowed to be NULL or not.
- *
- * @var bool
- */
- protected $allowNull = FALSE;
-
- /**
- * The assignment restriction of this context.
- *
- * @var string|null
- *
- * @see \Drupal\typed_data\Context\ContextDefinitionInterface::getAssignmentRestriction()
- */
- protected $assignmentRestriction = NULL;
-
- /**
- * {@inheritdoc}
- */
- public function toArray() {
- $values = [];
- $defaults = get_class_vars(__CLASS__);
- foreach (static::$nameMap as $key => $property_name) {
- // Only export values for non-default properties.
- if ($this->$property_name !== $defaults[$property_name]) {
- $values[$key] = $this->$property_name;
- }
- }
- return $values;
- }
-
- /**
- * Creates a definition object from an exported array of values.
- *
- * @param array $values
- * The array of values, as returned by toArray().
- *
- * @return static
- * The created definition.
- *
- * @throws \Drupal\Component\Plugin\Exception\ContextException
- * If the required classes are not implemented.
- */
- public static function createFromArray(array $values) {
- if (isset($values['class']) && !in_array(ContextDefinitionInterface::class, class_implements($values['class']))) {
- throw new ContextException('ContextDefinition class must implement ' . ContextDefinitionInterface::class . '.');
- }
- // Default to Typed data context definition class.
- $values['class'] = isset($values['class']) ? $values['class'] : ContextDefinition::class;
- if (!isset($values['value'])) {
- $values['value'] = 'any';
- }
-
- $definition = $values['class']::create($values['value']);
- foreach (array_intersect_key(static::$nameMap, $values) as $key => $name) {
- $definition->$name = $values[$key];
- }
- return $definition;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isAllowedNull() {
- return $this->allowNull;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setAllowNull($null_allowed) {
- $this->allowNull = $null_allowed;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAssignmentRestriction() {
- return $this->assignmentRestriction;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setAssignmentRestriction($restriction) {
- $this->assignmentRestriction = $restriction;
- return $this;
- }
-
-}
diff --git a/modules/typed_data/src/Context/ContextDefinitionInterface.php b/modules/typed_data/src/Context/ContextDefinitionInterface.php
deleted file mode 100644
index 19963e3..0000000
--- a/modules/typed_data/src/Context/ContextDefinitionInterface.php
+++ /dev/null
@@ -1,71 +0,0 @@
-fetchDataBySubPaths($typed_data, $sub_paths, $bubbleable_metadata, $langcode);
- }
-
- /**
- * {@inheritdoc}
- */
- public function fetchDataBySubPaths(TypedDataInterface $typed_data, array $sub_paths, BubbleableMetadata $bubbleable_metadata = NULL, $langcode = NULL) {
- $current_selector = [];
- $bubbleable_metadata = $bubbleable_metadata ?: new BubbleableMetadata();
-
- try {
- foreach ($sub_paths as $name) {
- $current_selector[] = $name;
-
- // If the current data is just a reference then directly dereference the
- // target.
- if ($typed_data instanceof DataReferenceInterface) {
- $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
- $typed_data = $typed_data->getTarget();
- if ($typed_data === NULL) {
- throw new MissingDataException("The specified reference is NULL.");
- }
- }
-
- // Make sure we are using the right language.
- if (isset($langcode) && $typed_data instanceof TranslatableInterface) {
- if ($typed_data->hasTranslation($langcode)) {
- $typed_data = $typed_data->getTranslation($langcode);
- }
- // @todo What if the requested translation does not exist? Currently
- // we just ignore that and continue with the current object.
- }
-
- // If this is a list but the selector is not an integer, we forward the
- // selection to the first element in the list.
- if ($typed_data instanceof ListInterface && !ctype_digit($name)) {
- $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
- $typed_data = $typed_data->get(0);
- }
-
- // Drill down to the next step in the data selector.
- if ($typed_data instanceof ListInterface || $typed_data instanceof ComplexDataInterface) {
- $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
- $typed_data = $typed_data->get($name);
- }
- else {
- $current_selector_string = implode('.', $current_selector);
- throw new InvalidArgumentException("The parent property is not a list or a complex structure at '$current_selector_string'.");
- }
-
- // If an accessed list item is not existing, $typed_data will be NULL.
- if (!isset($typed_data)) {
- $selector_string = implode('.', $sub_paths);
- $current_selector_string = implode('.', $current_selector);
- throw new MissingDataException("Unable to apply data selector '$selector_string' at '$current_selector_string'");
- }
- }
- $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
- return $typed_data;
- }
- catch (MissingDataException $e) {
- $selector = implode('.', $sub_paths);
- $current_selector = implode('.', $current_selector);
- throw new MissingDataException("Unable to apply data selector '$selector' at '$current_selector': " . $e->getMessage());
- }
- catch (\InvalidArgumentException $e) {
- $selector = implode('.', $sub_paths);
- $current_selector = implode('.', $current_selector);
- throw new InvalidArgumentException("Unable to apply data selector '$selector' at '$current_selector': " . $e->getMessage());
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function fetchDefinitionByPropertyPath(DataDefinitionInterface $data_definition, $property_path, $langcode = NULL) {
- $sub_paths = explode('.', $property_path);
- return $this->fetchDefinitionBySubPaths($data_definition, $sub_paths, $langcode);
- }
-
- /**
- * {@inheritdoc}
- */
- public function fetchDefinitionBySubPaths(DataDefinitionInterface $data_definition, array $sub_paths, $langcode = NULL) {
- $current_selector = [];
-
- foreach ($sub_paths as $name) {
- $current_selector[] = $name;
-
- // If the current data is just a reference then directly dereference the
- // target.
- if ($data_definition instanceof DataReferenceDefinitionInterface) {
- $data_definition = $data_definition->getTargetDefinition();
- }
-
- // If this is a list but the selector is not an integer, we forward the
- // selection to the first element in the list.
- if ($data_definition instanceof ListDataDefinitionInterface && !ctype_digit($name)) {
- $data_definition = $data_definition->getItemDefinition();
- }
-
- // Drill down to the next step in the data selector.
- if ($data_definition instanceof ComplexDataDefinitionInterface) {
- $data_definition = $data_definition->getPropertyDefinition($name);
- }
- elseif ($data_definition instanceof ListDataDefinitionInterface) {
- $data_definition = $data_definition->getItemDefinition();
- }
- else {
- $current_selector_string = implode('.', $current_selector);
- if (count($current_selector) > 1) {
- $parent_property = $current_selector[count($current_selector) - 2];
- throw new InvalidArgumentException("The data selector '$current_selector_string' cannot be applied because the parent property '$parent_property' is not a list or a complex structure");
- }
- else {
- $type = $data_definition->getDataType();
- throw new InvalidArgumentException("The data selector '$current_selector_string' cannot be applied because the definition of type '$type' is not a list or a complex structure");
- }
- }
-
- // If an accessed property is not existing, $data_definition will be
- // NULL.
- if (!isset($data_definition)) {
- $selector_string = implode('.', $sub_paths);
- $current_selector_string = implode('.', $current_selector);
- throw new InvalidArgumentException("Unable to apply data selector '$selector_string' at '$current_selector_string'");
- }
- }
- return $data_definition;
- }
-
- /**
- * {@inheritdoc}
- */
- public function autocompletePropertyPath(array $data_definitions, $partial_property_path) {
- // For the empty string we suggest the names of the data definitions.
- if ($partial_property_path == '') {
- return array_keys($data_definitions);
- }
- $results = [];
- // If the supplied path is part of the top level variable names then suggest
- // them directly.
- foreach ($data_definitions as $variable_name => $data_definition) {
- if (stripos($variable_name, $partial_property_path) === 0) {
- $results = array_merge($results, $this->getAutocompleteSuggestion($data_definition, $variable_name));
- }
- }
- if (!empty($results)) {
- return $results;
- }
-
- $parts = explode('.', $partial_property_path);
- $first_part = array_shift($parts);
-
- if (!isset($data_definitions[$first_part])) {
- return [];
- }
-
- $last_part = array_pop($parts);
- $middle_path = implode('.', $parts);
-
- if ($middle_path === '') {
- $variable_definition = $data_definitions[$first_part];
- }
- else {
- try {
- $variable_definition = $this->fetchDefinitionByPropertyPath($data_definitions[$first_part], $middle_path);
- }
- catch (InvalidArgumentException $e) {
- // Invalid property path, so no suggestions available.
- return [];
- }
- }
-
- // If the current data is just a reference then directly dereference the
- // target.
- if ($variable_definition instanceof DataReferenceDefinitionInterface) {
- $variable_definition = $variable_definition->getTargetDefinition();
- }
-
- if ($variable_definition instanceof ListDataDefinitionInterface) {
- // Suggest a couple of example indices of a list if there is nothing
- // selected on it yet. Special case for fields: only make the suggestion
- // if this is a multi-valued field.
- if ($last_part === '' && !($variable_definition instanceof FieldDefinitionInterface
- && $variable_definition->getFieldStorageDefinition()->getCardinality() === 1)
- ) {
- if ($middle_path === '') {
- $property_path = $first_part;
- }
- else {
- $property_path = "$first_part.$middle_path";
- }
- $item_definition = $variable_definition->getItemDefinition();
- for ($i = 0; $i < 3; $i++) {
- $results = array_merge($results, $this->getAutocompleteSuggestion($item_definition, "$property_path.$i"));
- }
- }
-
- // If this is a list but the selector is not an integer, we forward the
- // selection to the first element in the list.
- if (!ctype_digit($last_part)) {
- $variable_definition = $variable_definition->getItemDefinition();
- }
- }
-
- if ($variable_definition instanceof ComplexDataDefinitionInterface) {
- foreach ($variable_definition->getPropertyDefinitions() as $property_name => $property_definition) {
- // If the property starts with the part then we have a suggestion. If
- // the part after the dot is the empty string we include all properties.
- if (stripos($property_name, $last_part) === 0 || $last_part === '') {
-
- if ($middle_path === '') {
- $property_path = "$first_part.$property_name";
- }
- else {
- $property_path = "$first_part.$middle_path.$property_name";
- }
- $results = array_merge($results, $this->getAutocompleteSuggestion($property_definition, $property_path));
- }
- }
- }
-
- usort($results, function ($a, $b) {
- return strnatcasecmp($a['value'], $b['value']);
- });
- return $results;
- }
-
- /**
- * Generates autocomplete suggestions for a matched data definition.
- *
- * @param \Drupal\Core\TypedData\DataDefinitionInterface $data_definition
- * The data definition to inspect.
- * @param string $variable_name
- * The variable name or property path.
- *
- * @return array[]
- * A list of autocomplete suggestions - valid property paths for the
- * provided data definition. Each entry is an array with the following keys:
- * - value: the data selecor property path.
- * - label: the human readable label suggestion.
- */
- protected function getAutocompleteSuggestion(DataDefinitionInterface $data_definition, $variable_name) {
- $label = $variable_name;
- if ($data_label = $data_definition->getLabel()) {
- $label .= " ($data_label)";
- }
- $results[] = ['value' => $variable_name, 'label' => $label];
-
- // If the data definition is just a reference then directly dereference the
- // target.
- if ($data_definition instanceof DataReferenceDefinitionInterface) {
- $data_definition = $data_definition->getTargetDefinition();
- }
-
- if ($data_definition instanceof ListDataDefinitionInterface
- || $data_definition instanceof ComplexDataDefinitionInterface
- ) {
- $label = "$variable_name...";
- if ($data_label) {
- $label .= " ($data_label)";
- }
- $results[] = ['value' => "$variable_name.", 'label' => $label];
- }
-
- return $results;
- }
-
- /**
- * Adds the bubbleable metadata of the given data.
- *
- * @param \Drupal\Core\TypedData\TypedDataInterface $data
- * The data of which to add the metadata.
- * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
- * The bubbleable metadata to which to add the data.
- */
- protected function addBubbleableMetadata(TypedDataInterface $data, BubbleableMetadata $bubbleable_metadata) {
- if ($data instanceof PrimitiveInterface) {
- // Primitives do not have any metadata attached.
- return;
- }
- $value = $data->getValue();
- if ($value instanceof CacheableDependencyInterface || $value instanceof AttachmentsInterface) {
- $bubbleable_metadata->addCacheableDependency($value);
- }
- }
-
-}
diff --git a/modules/typed_data/src/DataFetcherInterface.php b/modules/typed_data/src/DataFetcherInterface.php
deleted file mode 100644
index 6626e64..0000000
--- a/modules/typed_data/src/DataFetcherInterface.php
+++ /dev/null
@@ -1,122 +0,0 @@
-dataFetcher = $data_fetcher;
- return $this;
- }
-
- /**
- * Gets the data fetcher.
- *
- * @return \Drupal\typed_data\DataFetcherInterface
- * The data fetcher.
- */
- public function getDataFetcher() {
- if (empty($this->dataFetcher)) {
- $this->dataFetcher = \Drupal::service('typed_data.data_fetcher');
- }
-
- return $this->dataFetcher;
- }
-
-}
diff --git a/modules/typed_data/src/DataFilterBase.php b/modules/typed_data/src/DataFilterBase.php
deleted file mode 100644
index 8635362..0000000
--- a/modules/typed_data/src/DataFilterBase.php
+++ /dev/null
@@ -1,71 +0,0 @@
-filterId = $plugin_id;
- $this->pluginDefinition = $plugin_definition;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getNumberOfRequiredArguments() {
- return 0;
- }
-
- /**
- * {@inheritdoc}
- */
- public function allowsNullValues() {
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function suggestArgument(DataDefinitionInterface $definition, array $arguments, $input = '') {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateArguments(DataDefinitionInterface $definition, array $arguments) {
- $errors = [];
- if (count($arguments) < $this->getNumberOfRequiredArguments()) {
- $errors[] = $this->t('Missing arguments for filter %filter_id', ['%filter_id' => $this->filterId]);
- }
- return $errors;
- }
-
-}
diff --git a/modules/typed_data/src/DataFilterInterface.php b/modules/typed_data/src/DataFilterInterface.php
deleted file mode 100644
index ee02b12..0000000
--- a/modules/typed_data/src/DataFilterInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-alterInfo('typed_data_filter');
- parent::__construct('Plugin/TypedDataFilter', $namespaces, $module_handler, DataFilterInterface::class, $plugin_definition_annotation_name);
- }
-
-}
diff --git a/modules/typed_data/src/DataFilterManagerInterface.php b/modules/typed_data/src/DataFilterManagerInterface.php
deleted file mode 100644
index 2b090c7..0000000
--- a/modules/typed_data/src/DataFilterManagerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-arrayParents = $arrayParents;
- return $instance;
- }
-
- /**
- * Gets a new sub-form array.
- *
- * Sub-forms must have #tree set to TRUE, so this is set as default.
- *
- * @return mixed[]
- * The new sub-form.
- */
- public static function getNewSubForm() {
- return [
- '#tree' => TRUE,
- ];
- }
-
-}
diff --git a/modules/typed_data/src/PlaceholderResolver.php b/modules/typed_data/src/PlaceholderResolver.php
deleted file mode 100644
index d039d1a..0000000
--- a/modules/typed_data/src/PlaceholderResolver.php
+++ /dev/null
@@ -1,205 +0,0 @@
-dataFetcher = $data_fetcher;
- $this->dataFilterManager = $data_filter_manager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function resolvePlaceholders($text, array $data = [], BubbleableMetadata $bubbleable_metadata = NULL, array $options = []) {
- $options += [
- 'langcode' => NULL,
- 'clear' => FALSE,
- ];
- $placeholder_by_data = $this->scan($text);
- if (empty($placeholder_by_data)) {
- return [];
- }
-
- $replacements = [];
- foreach ($placeholder_by_data as $data_name => $placeholders) {
- foreach ($placeholders as $placeholder_main_part => $placeholder) {
- try {
- if (!isset($data[$data_name])) {
- throw new MissingDataException("There is no data with the name '$data_name' available.");
- }
- list ($property_sub_paths, $filters) = $this->parseMainPlaceholderPart($placeholder_main_part, $placeholder);
- $fetched_data = $this->dataFetcher->fetchDataBySubPaths($data[$data_name], $property_sub_paths, $bubbleable_metadata, $options['langcode']);
-
- // Apply filters.
- if ($filters) {
- $value = $fetched_data->getValue();
- $definition = $fetched_data->getDataDefinition();
- foreach ($filters as $data) {
- list($filter_id, $arguments) = $data;
- $filter = $this->dataFilterManager->createInstance($filter_id);
- if (!$filter->allowsNullValues() && !isset($value)) {
- throw new MissingDataException("There is no data value for filter '$filter_id' to work on.");
- }
- $value = $filter->filter($definition, $value, $arguments, $bubbleable_metadata);
- $definition = $filter->filtersTo($definition, $arguments);
- }
- }
- else {
- $value = $fetched_data->getString();
- }
-
- // Escape the tokens, unless they are explicitly markup.
- $replacements[$placeholder] = $value instanceof MarkupInterface ? $value : new HtmlEscapedText($value);
- }
- catch (InvalidArgumentException $e) {
- // Should we log warnings if there are problems other than missing
- // data, like syntactically invalid placeholders?
- if (!empty($options['clear'])) {
- $replacements[$placeholder] = '';
- }
- }
- catch (MissingDataException $e) {
- if (!empty($options['clear'])) {
- $replacements[$placeholder] = '';
- }
- }
- }
- }
- return $replacements;
- }
-
- /**
- * Parses the main placeholder part.
- *
- * Main placeholder parts look like 'property.property|filter(arg)|filter'.
- *
- * @param string $main_part
- * The main placeholder part.
- * @param string $placeholder
- * The full placeholer string.
- *
- * @return array[]
- * An numerically indexed arrays containing:
- * - The numerically indexed array of property sub-paths.
- * - The numerically indexed array of parsed filter expressions, where each
- * entry is another numerically indexed array containing two items: the
- * the filter id and the array of filter arguments.
- *
- * @throws \Drupal\typed_data\Exception\InvalidArgumentException
- * Thrown if in invalid placeholders are to be parsed.
- */
- protected function parseMainPlaceholderPart($main_part, $placeholder) {
- if (!$main_part) {
- return [[], []];
- }
- $properties = explode('.', $main_part);
- $last_part = array_pop($properties);
- $filter_expressions = array_filter(explode('|', $last_part));
- // If there is a property, the first part, before the first |, is it.
- // Also be sure to remove potential whitespace after the last property.
- if ($main_part[0] != '|') {
- $properties[] = rtrim(array_shift($filter_expressions));
- }
- $filters = [];
-
- foreach ($filter_expressions as $expression) {
- // Look for filter arguments.
- $matches = [];
- preg_match_all('/
- ([^\(]+)
- \( # ( - pattern start
- (.+)
- \) # ) - pattern end
- /x', $expression, $matches);
-
- $filter_id = isset($matches[1][0]) ? $matches[1][0] : $expression;
- // Be sure to remove all whitespaces.
- $filter_id = str_replace(' ', '', $filter_id);
- $args = array_map(function ($arg) {
- // Remove surrounding whitespaces and then quotes.
- return trim(trim($arg), "'");
- }, explode(',', isset($matches[2][0]) ? $matches[2][0] : ''));
-
- $filters[] = [$filter_id, $args];
- }
- return [$properties, $filters];
- }
-
- /**
- * {@inheritdoc}
- */
- public function replacePlaceHolders($text, array $data = [], BubbleableMetadata $bubbleable_metadata = NULL, array $options = []) {
- $replacements = $this->resolvePlaceholders($text, $data, $bubbleable_metadata, $options);
-
- $placeholders = array_keys($replacements);
- $values = array_values($replacements);
-
- return str_replace($placeholders, $values, $text);
- }
-
- /**
- * {@inheritdoc}
- */
- public function scan($text) {
- // Matches tokens with the following pattern: {{ $name.$property_path }}
- // $name and $property_path may not contain {{ }} characters.
- // $name may not contain : or whitespace characters, but $property_path may.
- preg_match_all('/
- \{\{ # {{ - pattern start
- ([^\{\}.|]+) # match $type not containing whitespace . { or }
- ((.|\|) # . - separator
- ([^\{\}]+))? # match $name not containing { or }
- \}\} # }} - pattern end
- /x', $text, $matches);
-
- $names = $matches[1];
- $tokens = $matches[2];
-
- // Iterate through the matches, building an associative array containing
- // $tokens grouped by $types, pointing to the version of the token found in
- // the source text. For example,
- // $results['node']['title'] = '[node.title]';.
- $results = [];
- for ($i = 0; $i < count($tokens); $i++) {
- // Remove leading whitespaces and ".", but not the | denoting a filter.
- $main_part = trim($tokens[$i], ". \t\n\r\0\x0B");
- $results[trim($names[$i])][$main_part] = $matches[0][$i];
- }
-
- return $results;
- }
-
-}
diff --git a/modules/typed_data/src/PlaceholderResolverInterface.php b/modules/typed_data/src/PlaceholderResolverInterface.php
deleted file mode 100644
index 7c8c301..0000000
--- a/modules/typed_data/src/PlaceholderResolverInterface.php
+++ /dev/null
@@ -1,108 +0,0 @@
-replacePlaceHolders('Tokens: [node:nid] [current-user:uid]', ['node' => $node->getTypedData()], [], $bubbleable_metadata);
- * $bubbleable_metadata->applyTo($build);
- * @endcode
- *
- * @param string $text
- * The text containing the placeholders.
- * @param \Drupal\Core\TypedData\TypedDataInterface[] $data
- * The data to use for generating values for the placeholder, keyed by
- * name.
- * @param \Drupal\Core\Render\BubbleableMetadata|null $bubbleable_metadata
- * (optional) An object to which required bubbleable metadata will be added.
- * @param array $options
- * (optional) A keyed array of settings and flags to control the token
- * replacement process. Supported options are:
- * - langcode: A language code to be used when generating locale-sensitive
- * tokens.
- * - clear: A boolean flag indicating that tokens should be removed from the
- * final text if no replacement value can be generated. Defaults to
- * FALSE.
- *
- * @return string
- * The result is the entered HTML text with tokens replaced. The
- * caller is responsible for choosing the right escaping / sanitization. If
- * the result is intended to be used as plain text, using
- * PlainTextOutput::renderFromHtml() is recommended. If the result is just
- * printed as part of a template relying on Twig autoescaping is possible,
- * otherwise for example the result can be put into #markup, in which case
- * it would be sanitized by Xss::filterAdmin().
- */
- public function replacePlaceHolders($text, array $data = [], BubbleableMetadata $bubbleable_metadata = NULL, array $options = []);
-
- /**
- * Builds a list of all placeholder tokens that appear in the text.
- *
- * @param string $text
- * The text to be scanned for possible tokens.
- *
- * @return array
- * An associative array of discovered placeholder tokens, grouped by data
- * name. For each data name, the value is another associative array
- * containing the completed, discovered placeholder and the main placeholder
- * part as key; i.e. the placeholder without brackets and data name. For
- * example, for the placeholder {{ data.property.property|filter }} the
- * main placeholder part is 'property.property|filter'.
- */
- public function scan($text);
-
-}
diff --git a/modules/typed_data/src/PlaceholderResolverTrait.php b/modules/typed_data/src/PlaceholderResolverTrait.php
deleted file mode 100644
index 0c7726b..0000000
--- a/modules/typed_data/src/PlaceholderResolverTrait.php
+++ /dev/null
@@ -1,44 +0,0 @@
-placeholderResolver = $placeholder_resolver;
- return $this;
- }
-
- /**
- * Gets the placeholder resolver.
- *
- * @return \Drupal\typed_data\PlaceholderResolverInterface
- * The placeholder resolver.
- */
- public function getPlaceholderResolver() {
- if (empty($this->placeholderResolver)) {
- $this->placeholderResolver = \Drupal::service('typed_data.placeholder_resolver');
- }
-
- return $this->placeholderResolver;
- }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/DefaultFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/DefaultFilter.php
deleted file mode 100644
index 2b89c0c..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/DefaultFilter.php
+++ /dev/null
@@ -1,72 +0,0 @@
-getClass(), StringInterface::class);
- }
-
- /**
- * {@inheritdoc}
- */
- public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
- return $definition;
- }
-
- /**
- * {@inheritdoc}
- */
- public function allowsNullValues() {
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getNumberOfRequiredArguments() {
- return 1;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateArguments(DataDefinitionInterface $definition, array $arguments) {
- $errors = parent::validateArguments($definition, $arguments);
- if (isset($arguments[0])) {
- // Ensure the provided value is given for this data.
- $violations = $this->getTypedDataManager()
- ->create($definition, $arguments[0])
- ->validate();
- foreach ($violations as $violation) {
- $errors[] = $violation->getMessage();
- }
- }
- return $errors;
- }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/EntityUrlFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/EntityUrlFilter.php
deleted file mode 100644
index f1fe3bd..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/EntityUrlFilter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-url('canonical', ['absolute' => TRUE]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function canFilter(DataDefinitionInterface $definition) {
- return $definition instanceof EntityDataDefinitionInterface;
- }
-
- /**
- * {@inheritdoc}
- */
- public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
- return 'uri';
- }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/FormatDateFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/FormatDateFilter.php
deleted file mode 100644
index 53d3cf6..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/FormatDateFilter.php
+++ /dev/null
@@ -1,127 +0,0 @@
-dateFormatter = $date_formatter;
- $this->dateFormatStorage = $date_format_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('date.formatter'),
- $container->get('entity.manager')->getStorage('date_format')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function filter(DataDefinitionInterface $definition, $value, array $arguments, BubbleableMetadata $bubbleable_metadata = NULL) {
- if ($definition->getDataType() != 'timestamp') {
- // Convert the date to an timestamp.
- $value = $this->getTypedDataManager()->create($definition, $value)
- ->getDateTime()
- ->getTimestamp();
- }
- $arguments += [0 => 'medium', 1 => '', 2 => NULL, 3 => NULL];
- if ($arguments[0] != 'custom' && $bubbleable_metadata) {
- $config = $this->dateFormatStorage->load($arguments[0]);
- if (!$config) {
- throw new InvalidArgumentException("Unknown date format $arguments[0] given.");
- }
- $bubbleable_metadata->addCacheableDependency($config);
- }
- return $this->dateFormatter->format($value, $arguments[0], $arguments[1], $arguments[2], $arguments[3]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function canFilter(DataDefinitionInterface $definition) {
- return is_subclass_of($definition->getClass(), DateTimeInterface::class);
- }
-
- /**
- * {@inheritdoc}
- */
- public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
- return DataDefinition::create('string');
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateArguments(DataDefinitionInterface $definition, array $arguments) {
- $fails = parent::validateArguments($definition, $arguments);
- $arguments += [0 => 'medium', 1 => '', 2 => NULL, 3 => NULL];
- if ($arguments[0] != 'custom' && $this->dateFormatStorage->load($arguments[0]) === NULL) {
- $fails[] = $this->t('Unkown date format %format given.', ['%format' => $arguments[0]]);
- }
- if ($arguments[0] != 'custom' && $arguments[1]) {
- $fails[] = $this->t("If a custom date format is supplied, 'custom' must be passed as date format.");
- }
- elseif ($arguments[0] == 'custom' && !$arguments[1]) {
- $fails[] = $this->t("If 'custom' is given as date type, a custom date formatting string must be provided; e.g., 'Y-m-d H:i:s'.");
- }
- return $fails;
- // @todo: Should we validate timezones and langcodes also?
- }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/LowerFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/LowerFilter.php
deleted file mode 100644
index fa6a4e7..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/LowerFilter.php
+++ /dev/null
@@ -1,42 +0,0 @@
-getClass(), StringInterface::class);
- }
-
- /**
- * {@inheritdoc}
- */
- public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
- return DataDefinition::create('string');
- }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/StripTagsFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/StripTagsFilter.php
deleted file mode 100644
index 8baeb7d..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/StripTagsFilter.php
+++ /dev/null
@@ -1,41 +0,0 @@
-getClass(), StringInterface::class);
- }
-
- /**
- * {@inheritdoc}
- */
- public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
- return 'string';
- }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFormWidget/SelectWidget.php b/modules/typed_data/src/Plugin/TypedDataFormWidget/SelectWidget.php
deleted file mode 100644
index 77330ff..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFormWidget/SelectWidget.php
+++ /dev/null
@@ -1,102 +0,0 @@
- NULL,
- 'description' => NULL,
- 'empty_option' => NULL,
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function isApplicable(DataDefinitionInterface $definition) {
- return is_subclass_of($definition->getClass(), OptionsProviderInterface::class);
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(TypedDataInterface $data, SubformStateInterface $form_state) {
- assert($data instanceof OptionsProviderInterface);
- $form = SubformState::getNewSubForm();
- $form['value'] = [
- '#type' => 'select',
- '#title' => $this->configuration['label'] ?: $data->getDataDefinition()->getLabel(),
- '#description' => $this->configuration['description'] ?: $data->getDataDefinition()->getDescription(),
- '#default_value' => $data->getValue(),
- '#multiple' => $data instanceof ListInterface,
- '#empty_option' => $this->configuration['empty_option'],
- '#empty_value' => '',
- '#required' => $data->getDataDefinition()->isRequired(),
- '#disabled' => $data->getDataDefinition()->isReadOnly(),
- '#options' => $data->getSettableOptions(),
- ];
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function extractFormValues(TypedDataInterface $data, SubformStateInterface $form_state) {
- // Ensure empty values correctly end up as NULL value.
- $value = $form_state->getValue('value');
- if ($value === '') {
- $value = NULL;
- }
- $data->setValue($value);
- }
-
- /**
- * {@inheritdoc}
- */
- public function flagViolations(TypedDataInterface $data, ConstraintViolationListInterface $violations, SubformStateInterface $formState) {
- foreach ($violations as $violation) {
- /** @var ConstraintViolationInterface $violation */
- $formState->setErrorByName('value', $violation->getMessage());
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfigurationDefinitions(DataDefinitionInterface $definition) {
- return [
- 'label' => ContextDefinition::create('string')
- ->setLabel($this->t('Label')),
- 'description' => ContextDefinition::create('string')
- ->setLabel($this->t('Description')),
- 'empty_option' => ContextDefinition::create('string')
- ->setLabel($this->t('Empty option label'))
- ->setDescription($this->t('Allows overriding the label of the empty option')),
- ];
- }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFormWidget/TextInputWidget.php b/modules/typed_data/src/Plugin/TypedDataFormWidget/TextInputWidget.php
deleted file mode 100644
index a48d6ef..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFormWidget/TextInputWidget.php
+++ /dev/null
@@ -1,108 +0,0 @@
- NULL,
- 'description' => NULL,
- 'placeholder' => NULL,
- 'size' => 60,
- 'maxlength' => 255,
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function isApplicable(DataDefinitionInterface $definition) {
- return is_subclass_of($definition->getClass(), StringInterface::class) ||
- is_subclass_of($definition->getClass(), IntegerInterface::class) ||
- is_subclass_of($definition->getClass(), FloatInterface::class);
- }
-
- /**
- * {@inheritdoc}
- */
- public function form(TypedDataInterface $data, SubformStateInterface $form_state) {
- $form = SubformState::getNewSubForm();
- $form['value'] = [
- '#type' => 'textfield',
- '#title' => $this->configuration['label'] ?: $data->getDataDefinition()->getLabel(),
- '#description' => $this->configuration['description'] ?: $data->getDataDefinition()->getDescription(),
- '#default_value' => $data->getValue(),
- '#placeholder' => $this->configuration['placeholder'],
- '#size' => $this->configuration['size'],
- '#maxlength' => $this->configuration['maxlength'],
- '#required' => $data->getDataDefinition()->isRequired(),
- '#disabled' => $data->getDataDefinition()->isReadOnly(),
- ];
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function extractFormValues(TypedDataInterface $data, SubformStateInterface $form_state) {
- // Ensure empty values correctly end up as NULL value.
- $value = $form_state->getValue('value');
- if ($value === '') {
- $value = NULL;
- }
- $data->setValue($value);
- }
-
- /**
- * {@inheritdoc}
- */
- public function flagViolations(TypedDataInterface $data, ConstraintViolationListInterface $violations, SubformStateInterface $formState) {
- foreach ($violations as $violation) {
- /** @var ConstraintViolationInterface $violation */
- $formState->setErrorByName('value', $violation->getMessage());
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfigurationDefinitions(DataDefinitionInterface $definition) {
- return [
- 'label' => DataDefinition::create('string')
- ->setLabel($this->t('Label')),
- 'description' => DataDefinition::create('string')
- ->setLabel($this->t('Description')),
- 'placeholder' => DataDefinition::create('string')
- ->setLabel($this->t('Placeholder value')),
- 'size' => DataDefinition::create('integer')
- ->setLabel($this->t('Input field size')),
- 'maxlength' => DataDefinition::create('integer')
- ->setLabel($this->t('Maximum text length')),
- ];
- }
-
-}
diff --git a/modules/typed_data/src/Util/StateTrait.php b/modules/typed_data/src/Util/StateTrait.php
deleted file mode 100644
index 9cc88d3..0000000
--- a/modules/typed_data/src/Util/StateTrait.php
+++ /dev/null
@@ -1,46 +0,0 @@
-state = $state;
- return $this;
- }
-
- /**
- * Gets the state storage.
- *
- * @return \Drupal\Core\State\StateInterface
- * The state storage.
- */
- public function getState() {
- if (empty($this->state)) {
- $this->state = \Drupal::state();
- }
-
- return $this->state;
- }
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetBase.php b/modules/typed_data/src/Widget/FormWidgetBase.php
deleted file mode 100644
index 9a7e74c..0000000
--- a/modules/typed_data/src/Widget/FormWidgetBase.php
+++ /dev/null
@@ -1,69 +0,0 @@
-get('typed_data_manager'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function __construct(array $configuration, $plugin_id, $plugin_definition, TypedDataManagerInterface $typedDataManager) {
- parent::__construct($configuration + $this->defaultConfiguration(), $plugin_id, $plugin_definition);
- $this->typedDataManager = $typedDataManager;
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfiguration() {
- return $this->configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setConfiguration(array $configuration) {
- $this->configuration = NestedArray::mergeDeep(
- $this->defaultConfiguration(),
- $configuration
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- return [];
- }
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetInterface.php b/modules/typed_data/src/Widget/FormWidgetInterface.php
deleted file mode 100644
index d86f516..0000000
--- a/modules/typed_data/src/Widget/FormWidgetInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-alterInfo('typed_data_form_widget');
- parent::__construct('Plugin/TypedDataFormWidget', $namespaces, $module_handler, FormWidgetInterface::class, $plugin_definition_annotation_name);
- }
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetManagerInterface.php b/modules/typed_data/src/Widget/FormWidgetManagerInterface.php
deleted file mode 100644
index a98dca7..0000000
--- a/modules/typed_data/src/Widget/FormWidgetManagerInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-widgetManager = $widgetManager;
- return $this;
- }
-
- /**
- * Gets the widget manager.
- *
- * @return \Drupal\typed_data\Widget\FormWidgetManagerInterface
- * The widget manager.
- */
- public function getFormWidgetManager() {
- if (empty($this->widgetManager)) {
- $this->widgetManager = \Drupal::service('plugin.manager.typed_data_form_widget');
- }
-
- return $this->widgetManager;
- }
-
-}
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleController.php b/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleController.php
deleted file mode 100644
index f548843..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleController.php
+++ /dev/null
@@ -1,36 +0,0 @@
- 'item_list',
- '#title' => 'Widgets',
- '#items' => [],
- ];
-
- foreach ($this->getFormWidgetManager()->getDefinitions() as $id => $definition) {
- $build['#items'][$id] = [
- '#title' => $definition['label'],
- '#type' => 'link',
- '#url' => Url::fromRoute('typed_data_widget_test.examples.form', ['widget_id' => $id]),
- ];
- }
- return $build;
- }
-
-}
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleForm.php b/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleForm.php
deleted file mode 100644
index c213921..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleForm.php
+++ /dev/null
@@ -1,124 +0,0 @@
-setLabel('Example string')
- ->setDescription('Some example string with max. 8 characters.')
- ->setDefaultValue('default')
- ->addConstraint('Length', ['max' => 8]);
- case 'select':
- return ContextDefinition::create('filter_format')
- ->setLabel('Filter format')
- ->setDescription('Some example selection.');
- }
-
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $widget_id = NULL) {
- $widget = $this->getFormWidgetManager()->createInstance($widget_id);
-
- // Read and write widget configuration from the state.
- // Allow tests to define a custom context definition.
- $context_definition = $this->getState()->get('typed_data_widgets.definition');
- $context_definition = $context_definition ?: $this->getExampleContextDefinition($widget_id);
- $form_state->set('widget_id', $widget_id);
- $form_state->set('context_definition', $context_definition);
-
- // Create a typed data object.
- $data = $this->getTypedDataManager()
- ->create($context_definition->getDataDefinition());
- $value = $this->getState()->get('typed_data_widgets.' . $widget_id);
- $value = isset($value) ? $value : $context_definition->getDefaultValue();
- $data->setValue($value);
-
- $subform_state = SubformState::createWithParents(['data'], $form, $form_state);
- $form['data'] = $widget->form($data, $subform_state);
-
- $form['actions']['#type'] = 'actions';
- $form['actions']['submit'] = [
- '#type' => 'submit',
- '#value' => 'Submit',
- ];
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- parent::validateForm($form, $form_state);
-
- $context_definition = $form_state->get('context_definition');
- $widget_id = $form_state->get('widget_id');
- $widget = $this->getFormWidgetManager()->createInstance($widget_id);
-
- $subform_state = SubformState::createWithParents(['data'], $form, $form_state);
- $data = $this->getTypedDataManager()
- ->create($context_definition->getDataDefinition());
- $widget->extractFormValues($data, $subform_state);
-
- // Validate the data and flag possible violations.
- $violations = $data->validate();
- $widget->flagViolations($data, $violations, $subform_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $context_definition = $form_state->get('context_definition');
- $widget_id = $form_state->get('widget_id');
- $widget = $this->getFormWidgetManager()->createInstance($widget_id);
-
- $subform_state = SubformState::createWithParents(['data'], $form, $form_state);
- $data = $this->getTypedDataManager()
- ->create($context_definition->getDataDefinition());
- $widget->extractFormValues($data, $subform_state);
-
- // Read and write widget configuration via the state.
- $this->getState()->set('typed_data_widgets.' . $widget_id, $data->getValue());
- drupal_set_message($this->t('Value saved'));
- }
-
-}
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.info.yml b/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.info.yml
deleted file mode 100644
index 44103f4..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Typed Data Widgets Test
-type: module
-description: 'Implements example forms using typed data widgets.'
-# core: 8.x
-dependencies:
- - drupal:typed_data
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-1.0-alpha1+34-dev'
-core: '8.x'
-project: 'typed_data'
-datestamp: 1508419447
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.links.menu.yml b/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.links.menu.yml
deleted file mode 100644
index d6b0024..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.links.menu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-typed_data_widget_test.examples:
- title: 'Typed Data Widgets'
- parent: system.admin_config_ui
- description: 'Shows examples for typed data widgets.'
- route_name: typed_data_widget_test.examples
- weight: 10
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.routing.yml b/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.routing.yml
deleted file mode 100644
index 6c91299..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.routing.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-typed_data_widget_test.examples:
- path: '/admin/config/user-interface/typed-data-widgets'
- defaults:
- _controller: 'Drupal\typed_data_widget_test\FormWidgetExampleController:listWidgetExamples'
- _title: 'Widget examples'
- requirements:
- _permission: 'administer site configuration'
-typed_data_widget_test.examples.form:
- path: '/admin/config/user-interface/typed-data-widgets/{widget_id}'
- defaults:
- _form: 'Drupal\typed_data_widget_test\FormWidgetExampleForm'
- _title: 'Widget examples'
- requirements:
- _permission: 'administer site configuration'
diff --git a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/SelectWidgetTest.php b/modules/typed_data/tests/src/Functional/TypedDataFormWidget/SelectWidgetTest.php
deleted file mode 100644
index 972ee7d..0000000
--- a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/SelectWidgetTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-widget = $this->getFormWidgetManager()->createInstance('select');
- }
-
- /**
- * @covers ::isApplicable
- */
- public function testIsApplicable() {
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('any')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('binary')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('boolean')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('datetime_iso8601')));;
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('duration_iso8601')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('email')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('float')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('integer')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('string')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('timespan')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('timestamp')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('uri')));
- $this->assertFalse($this->widget->isApplicable(ListDataDefinition::create('string')));
- $this->assertFalse($this->widget->isApplicable(MapDataDefinition::create()));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('filter_format')));
- }
-
- /**
- * @covers ::form
- * @covers ::extractFormValues
- */
- public function testFormEditing() {
- $context_definition = ContextDefinition::create('filter_format')
- ->setLabel('Filter format')
- ->setDescription('Some example selection.');
- $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
- $this->drupalLogin($this->createUser([], NULL, TRUE));
- $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
- $this->drupalGet($path);
-
- $this->assertSession()->elementTextContains('css', 'label[for=edit-data-value]', $context_definition->getLabel());
- $this->assertSession()->elementTextContains('css', 'div[id=edit-data-value--description]', $context_definition->getDescription());
- $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
-
- $this->getSession()->getPage()->selectFieldOption('data[value]', 'plain_text');
- $this->pressButton('Submit');
-
- $this->drupalGet($path);
- $this->assertSession()->fieldValueEquals('data[value]', 'plain_text');
- }
-
- /**
- * @covers ::form
- * @covers ::flagViolations
- */
- public function testValidation() {
- $context_definition = ContextDefinition::create('filter_format')
- ->setLabel('Filter format')
- ->setDescription('Some example selection.')
- ->setRequired(TRUE);
- $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
- $this->drupalLogin($this->createUser([], NULL, TRUE));
- $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
- $this->drupalGet($path);
-
- // Set the empty option and make sure it results in a violation.
- $this->fillField('data[value]', '');
- $this->pressButton('Submit');
- $this->assertSession()
- ->fieldExists('data[value]')
- ->hasClass('error');
-
- // Make sure the changes have not been saved also.
- $this->drupalGet($path);
- $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
- }
-
-}
diff --git a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/TextInputWidgetTest.php b/modules/typed_data/tests/src/Functional/TypedDataFormWidget/TextInputWidgetTest.php
deleted file mode 100644
index 318776a..0000000
--- a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/TextInputWidgetTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-widget = $this->getFormWidgetManager()->createInstance('text_input');
- }
-
- /**
- * @covers ::isApplicable
- */
- public function testIsApplicable() {
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('any')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('binary')));
- $this->assertFalse($this->widget->isApplicable(DataDefinition::create('boolean')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('datetime_iso8601')));;
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('duration_iso8601')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('email')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('float')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('integer')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('string')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('timespan')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('timestamp')));
- $this->assertTrue($this->widget->isApplicable(DataDefinition::create('uri')));
- $this->assertFalse($this->widget->isApplicable(ListDataDefinition::create('string')));
- $this->assertFalse($this->widget->isApplicable(MapDataDefinition::create()));
- }
-
- /**
- * @covers ::form
- * @covers ::extractFormValues
- */
- public function testFormEditing() {
- $context_definition = ContextDefinition::create('string')
- ->setLabel('Example string')
- ->setDescription('Some example string')
- ->setDefaultValue('default1');
- $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
- $this->drupalLogin($this->createUser([], NULL, TRUE));
- $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
- $this->drupalGet($path);
-
- $this->assertSession()->elementTextContains('css', 'label[for=edit-data-value]', $context_definition->getLabel());
- $this->assertSession()->elementTextContains('css', 'div[id=edit-data-value--description]', $context_definition->getDescription());
- $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
-
- $this->fillField('data[value]', 'jump');
- $this->pressButton('Submit');
-
- $this->drupalGet($path);
- $this->assertSession()->fieldValueEquals('data[value]', 'jump');
- }
-
- /**
- * @covers ::form
- * @covers ::flagViolations
- */
- public function testValidation() {
- $context_definition = ContextDefinition::create('string')
- ->setLabel('Example string')
- ->setDescription('Some example string')
- ->setDefaultValue('default1')
- ->addConstraint('Length', ['max' => 3]);
- $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
- $this->drupalLogin($this->createUser([], NULL, TRUE));
- $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
- $this->drupalGet($path);
-
- $this->fillField('data[value]', 'too-long');
- $this->pressButton('Submit');
- $this->assertSession()
- ->fieldExists('data[value]')
- ->hasClass('error');
-
- // Make sure the changes have not been saved also.
- $this->drupalGet($path);
- $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
- }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/DataDefinitionFetcherTest.php b/modules/typed_data/tests/src/Kernel/DataDefinitionFetcherTest.php
deleted file mode 100644
index 697dc2d..0000000
--- a/modules/typed_data/tests/src/Kernel/DataDefinitionFetcherTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-dataFetcher = $this->container->get('typed_data.data_fetcher');
- $this->typedDataManager = $this->container->get('typed_data_manager');
-
- $entity_type_manager = $this->container->get('entity_type.manager');
- $entity_type_manager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- // Create a multi-value integer field for testing.
- FieldStorageConfig::create([
- 'field_name' => 'field_integer',
- 'type' => 'integer',
- 'entity_type' => 'node',
- 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'field_integer',
- 'entity_type' => 'node',
- 'bundle' => 'page',
- ])->save();
-
- $node = $entity_type_manager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
- $this->nodeDefinition = $node->getTypedData()->getDataDefinition();
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingByBasicPropertyPath() {
- $target_definition = $this->nodeDefinition
- ->getPropertyDefinition('title')
- ->getItemDefinition()
- ->getPropertyDefinition('value');
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'title.0.value'
- );
-
- $this->assertSame($target_definition, $fetched_definition);
- }
-
- /**
- * @covers ::fetchDefinitionBySubPaths
- */
- public function testFetchingByBasicSubPath() {
- $target_definition = $this->nodeDefinition
- ->getPropertyDefinition('title')
- ->getItemDefinition()
- ->getPropertyDefinition('value');
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionBySubPaths(
- $this->nodeDefinition,
- ['title', '0', 'value']
- );
-
- $this->assertSame($target_definition, $fetched_definition);
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingEntityReference() {
- $target_definition = $this->nodeDefinition
- ->getPropertyDefinition('uid')
- ->getItemDefinition()
- ->getPropertyDefinition('entity');
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'uid.entity'
- );
-
- $this->assertSame($target_definition, $fetched_definition);
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingAcrossReferences() {
- $target_definition = $this->nodeDefinition
- ->getPropertyDefinition('uid')
- ->getItemDefinition()
- ->getPropertyDefinition('entity')
- ->getTargetDefinition()
- ->getPropertyDefinition('name')
- ->getItemDefinition()
- ->getPropertyDefinition('value');
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'uid.entity.name.value'
- );
-
- $this->assertSame($target_definition, $fetched_definition);
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingAtValidPositions() {
- $target_definition = $this->nodeDefinition
- ->getPropertyDefinition('field_integer')
- ->getItemDefinition()
- ->getPropertyDefinition('value');
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'field_integer.0.value'
- );
-
- $this->assertSame($target_definition, $fetched_definition);
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'field_integer.1.value'
- );
-
- $this->assertSame($target_definition, $fetched_definition);
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingInvalidProperty() {
- $this->setExpectedException(InvalidArgumentException::class, "Unable to apply data selector 'field_invalid.0.value' at 'field_invalid'");
- // This should trigger an exception.
- $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'field_invalid.0.value'
- );
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingField() {
- $target_definition = $this->nodeDefinition
- ->getPropertyDefinition('field_integer');
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'field_integer'
- );
-
- $this->assertSame($target_definition, $fetched_definition);
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingReferenceField() {
- $target_definition = $this->nodeDefinition
- ->getPropertyDefinition('uid');
-
- $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'uid'
- );
-
- $this->assertSame($target_definition, $fetched_definition);
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingNonComplexType() {
- $this->setExpectedException(InvalidArgumentException::class, "The data selector 'field_integer.0.value.not_existing' cannot be applied because the parent property 'value' is not a list or a complex structure");
- // This should trigger an exception.
- $this->dataFetcher->fetchDefinitionByPropertyPath(
- $this->nodeDefinition,
- 'field_integer.0.value.not_existing'
- );
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingFromPrimitive() {
- $this->setExpectedException(InvalidArgumentException::class, "The data selector 'unknown_property' cannot be applied because the definition of type 'string' is not a list or a complex structure");
- $definition = $this->nodeDefinition
- ->getPropertyDefinition('title')
- ->getItemDefinition()
- ->getPropertyDefinition('value');
-
- // This should trigger an exception.
- $this->dataFetcher->fetchDefinitionByPropertyPath(
- $definition,
- 'unknown_property'
- );
- }
-
- /**
- * @covers ::fetchDefinitionByPropertyPath
- */
- public function testFetchingAtInvalidPosition() {
- $this->setExpectedException(InvalidArgumentException::class, "The data selector 'unknown_property' cannot be applied because the definition of type 'integer' is not a list or a complex structure");
- $list_definition = $this->typedDataManager->createListDataDefinition('integer');
-
- // This should trigger an exception.
- $this->dataFetcher->fetchDefinitionByPropertyPath(
- $list_definition,
- 'unknown_property'
- );
- }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/DataFetcherTest.php b/modules/typed_data/tests/src/Kernel/DataFetcherTest.php
deleted file mode 100644
index 1a6db3a..0000000
--- a/modules/typed_data/tests/src/Kernel/DataFetcherTest.php
+++ /dev/null
@@ -1,284 +0,0 @@
-typedDataManager = $this->container->get('typed_data_manager');
- $this->dataFetcher = $this->container->get('typed_data.data_fetcher');
-
- $this->entityTypeManager = $this->container->get('entity_type.manager');
- $this->entityTypeManager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- // Create a multi-value integer field for testing.
- FieldStorageConfig::create([
- 'field_name' => 'field_integer',
- 'type' => 'integer',
- 'entity_type' => 'node',
- 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'field_integer',
- 'entity_type' => 'node',
- 'bundle' => 'page',
- ])->save();
-
- $this->installSchema('system', ['sequences']);
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
-
- $this->node = $this->entityTypeManager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingByBasicPropertyPath() {
- $this->assertEquals(
- $this->node->title->value,
- $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'title.0.value')
- ->getValue()
- );
- }
-
- /**
- * @covers ::fetchDataBySubPaths
- */
- public function testFetchingByBasicSubPath() {
- $this->assertEquals(
- $this->node->title->value,
- $this->dataFetcher
- ->fetchDataBySubPaths(
- $this->node->getTypedData(),
- ['title', '0', 'value']
- )
- ->getValue()
- );
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingEntityReference() {
- $user = $this->entityTypeManager->getStorage('user')
- ->create([
- 'name' => 'test',
- 'type' => 'user',
- ]);
- $this->node->uid->entity = $user;
-
- $fetched_user = $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.entity')
- ->getValue();
- $this->assertSame($fetched_user, $user);
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingAcrossReferences() {
- $user = $this->entityTypeManager->getStorage('user')
- ->create([
- 'name' => 'test',
- 'type' => 'user',
- ]);
- $this->node->uid->entity = $user;
-
- $fetched_value = $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.entity.name.value')
- ->getValue();
- $this->assertSame($fetched_value, 'test');
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingNonExistingEntityReference() {
- $fetched_user = $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.0.entity')
- ->getValue();
- $this->assertNull($fetched_user);
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingValueAtValidPositions() {
- $this->node->field_integer->setValue(['0' => 1, '1' => 2]);
-
- $fetched_value = $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.0.value')
- ->getValue();
- $this->assertEquals($fetched_value, 1);
-
- $fetched_value = $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.1.value')
- ->getValue();
- $this->assertEquals($fetched_value, 2);
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingValueAtInvalidPosition() {
- $this->setExpectedException(MissingDataException::class, "Unable to apply data selector 'field_integer.0.value' at 'field_integer.0'");
- $this->node->field_integer->setValue([]);
-
- // This should trigger an exception.
- $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.0.value')
- ->getValue();
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingInvalidProperty() {
- $this->setExpectedException(InvalidArgumentException::class, "Unable to apply data selector 'field_invalid.0.value' at 'field_invalid'");
- // This should trigger an exception.
- $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_invalid.0.value')
- ->getValue();
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingEmptyProperty() {
- $this->node->field_integer->setValue([]);
-
- $fetched_value = $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer')
- ->getValue();
- $this->assertEquals($fetched_value, []);
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingNotExistingListItem() {
- $this->setExpectedException(MissingDataException::class);
- $this->node->field_integer->setValue([]);
-
- // This will throw an exception.
- $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.0')
- ->getValue();
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testFetchingFromEmptyData() {
- $this->setExpectedException(MissingDataException::class, "Unable to apply data selector 'field_integer.0.value' at 'field_integer': Unable to get property field_integer as no entity has been provided.");
- $data_empty = $this->typedDataManager->create(EntityDataDefinition::create('node'));
- // This should trigger an exception.
- $this->dataFetcher
- ->fetchDataByPropertyPath($data_empty, 'field_integer.0.value')
- ->getValue();
- }
-
- /**
- * @covers ::fetchDataByPropertyPath
- */
- public function testBubbleableMetadata() {
- $this->node->field_integer->setValue([]);
- // Save the node, so that it gets an ID and it has a cache tag.
- $this->node->save();
- // Also add a user for testing cache tags of references.
- $user = $this->entityTypeManager->getStorage('user')
- ->create([
- 'name' => 'test',
- 'type' => 'user',
- ]);
- $user->save();
- $this->node->uid->entity = $user;
-
- $bubbleable_metadata = new BubbleableMetadata();
- $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'title.value', $bubbleable_metadata)
- ->getValue();
-
- $expected = ['node:' . $this->node->id()];
- $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
-
- // Test cache tags of references are added correctly.
- $this->dataFetcher
- ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.entity.name', $bubbleable_metadata)
- ->getValue();
-
- $expected = ['node:' . $this->node->id(), 'user:' . $user->id()];
- $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
- }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/DataFilterTest.php b/modules/typed_data/tests/src/Kernel/DataFilterTest.php
deleted file mode 100644
index 278f8ed..0000000
--- a/modules/typed_data/tests/src/Kernel/DataFilterTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-typedDataManager = $this->container->get('typed_data_manager');
- $this->dataFilterManager = $this->container->get('plugin.manager.typed_data_filter');
-
- // Make sure default date formats are there for testing the format_date
- // filter.
- $this->installConfig(['system']);
- }
-
- /**
- * @covers \Drupal\typed_data\Plugin\TypedDataFilter\LowerFilter
- */
- public function testLowerFilter() {
- $filter = $this->dataFilterManager->createInstance('lower');
- $data = $this->typedDataManager->create(DataDefinition::create('string'), 'tEsT');
-
- $this->assertTrue($filter->canFilter($data->getDataDefinition()));
- $this->assertFalse($filter->canFilter(DataDefinition::create('any')));
-
- $this->assertEquals('string', $filter->filtersTo($data->getDataDefinition(), [])->getDataType());
-
- $this->assertEquals('test', $filter->filter($data->getDataDefinition(), $data->getValue(), []));
- }
-
- /**
- * @covers \Drupal\typed_data\Plugin\TypedDataFilter\DefaultFilter
- */
- public function testDefaultFilter() {
- $filter = $this->dataFilterManager->createInstance('default');
- $data = $this->typedDataManager->create(DataDefinition::create('string'));
-
- $this->assertTrue($filter->canFilter($data->getDataDefinition()));
- $this->assertFalse($filter->canFilter(DataDefinition::create('any')));
-
- $this->assertSame($data->getDataDefinition(), $filter->filtersTo($data->getDataDefinition(), ['default']));
-
- $fails = $filter->validateArguments($data->getDataDefinition(), []);
- $this->assertEquals(1, count($fails));
- $this->assertContains('Missing arguments', (string) $fails[0]);
- $fails = $filter->validateArguments($data->getDataDefinition(), [new \StdClass()]);
- $this->assertEquals(1, count($fails));
- $this->assertEquals('This value should be of the correct primitive type.', $fails[0]);
-
- $this->assertEquals('default', $filter->filter($data->getDataDefinition(), $data->getValue(), ['default']));
- $data->setValue('non-default');
- $this->assertEquals('non-default', $filter->filter($data->getDataDefinition(), $data->getValue(), ['default']));
- }
-
- /**
- * @covers \Drupal\typed_data\Plugin\TypedDataFilter\FormatDateFilter
- */
- public function testFormatDateFilter() {
- $filter = $this->dataFilterManager->createInstance('format_date');
- $data = $this->typedDataManager->create(DataDefinition::create('timestamp'), 3700);
-
- $this->assertTrue($filter->canFilter($data->getDataDefinition()));
- $this->assertFalse($filter->canFilter(DataDefinition::create('any')));
-
- $this->assertEquals('string', $filter->filtersTo($data->getDataDefinition(), [])->getDataType());
-
- $fails = $filter->validateArguments($data->getDataDefinition(), []);
- $this->assertEquals(0, count($fails));
- $fails = $filter->validateArguments($data->getDataDefinition(), ['medium']);
- $this->assertEquals(0, count($fails));
- $fails = $filter->validateArguments($data->getDataDefinition(), ['invalid-format']);
- $this->assertEquals(1, count($fails));
- $fails = $filter->validateArguments($data->getDataDefinition(), ['custom']);
- $this->assertEquals(1, count($fails));
- $fails = $filter->validateArguments($data->getDataDefinition(), ['custom', 'Y']);
- $this->assertEquals(0, count($fails));
-
- /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
- $date_formatter = $this->container->get('date.formatter');
- $this->assertEquals($date_formatter->format(3700), $filter->filter($data->getDataDefinition(), $data->getValue(), []));
- $this->assertEquals($date_formatter->format(3700, 'short'), $filter->filter($data->getDataDefinition(), $data->getValue(), ['short']));
- $this->assertEquals('1970', $filter->filter($data->getDataDefinition(), $data->getValue(), ['custom', 'Y']));
-
- // Verify the filter works with non-timestamp data as well.
- $data = $this->typedDataManager->create(DataDefinition::create('datetime_iso8601'), "1970-01-01T10:10:10+00:00");
- $this->assertTrue($filter->canFilter($data->getDataDefinition()));
- $this->assertEquals('string', $filter->filtersTo($data->getDataDefinition(), [])->getDataType());
- $this->assertEquals('1970', $filter->filter($data->getDataDefinition(), $data->getValue(), ['custom', 'Y']));
-
- // Test cache dependencies of date format config entities are added in.
- $metadata = new BubbleableMetadata();
- $filter->filter($data->getDataDefinition(), $data->getValue(), ['short'], $metadata);
- $this->assertEquals(DateFormat::load('short')->getCacheTags(), $metadata->getCacheTags());
- $metadata = new BubbleableMetadata();
- $filter->filter($data->getDataDefinition(), $data->getValue(), ['custom', 'Y'], $metadata);
- $this->assertEquals([], $metadata->getCacheTags());
- }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/PlaceholderResolverTest.php b/modules/typed_data/tests/src/Kernel/PlaceholderResolverTest.php
deleted file mode 100644
index dc78102..0000000
--- a/modules/typed_data/tests/src/Kernel/PlaceholderResolverTest.php
+++ /dev/null
@@ -1,272 +0,0 @@
-typedDataManager = $this->container->get('typed_data_manager');
- $this->entityTypeManager = $this->container->get('entity_type.manager');
- $this->placeholderResolver = $this->container->get('typed_data.placeholder_resolver');
-
- $this->entityTypeManager->getStorage('node_type')
- ->create(['type' => 'page'])
- ->save();
-
- // Create a multi-value integer field for testing.
- FieldStorageConfig::create([
- 'field_name' => 'field_integer',
- 'type' => 'integer',
- 'entity_type' => 'node',
- 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
- ])->save();
- FieldConfig::create([
- 'field_name' => 'field_integer',
- 'entity_type' => 'node',
- 'bundle' => 'page',
- ])->save();
-
- $this->installSchema('system', ['sequences']);
- $this->installEntitySchema('user');
- $this->installEntitySchema('node');
-
- $this->node = $this->entityTypeManager->getStorage('node')
- ->create([
- 'title' => 'test',
- 'type' => 'page',
- ]);
-
- // Make sure default date formats are there for testing the format_date
- // filter.
- $this->installConfig(['system']);
- }
-
- /**
- * @covers ::scan
- */
- public function testScanningForPlaceholders() {
- $text = 'token {{example.foo}} and {{example.foo.bar}} just as {{example.foo|default(bar)}} and {{ example.whitespace }}';
- $placeholders = $this->placeholderResolver->scan($text);
- $this->assertEquals([
- 'example' => [
- 'foo' => '{{example.foo}}',
- 'foo.bar' => '{{example.foo.bar}}',
- 'foo|default(bar)' => '{{example.foo|default(bar)}}',
- 'whitespace' => '{{ example.whitespace }}',
- ],
- ], $placeholders);
- // Test a simple placeholder with filters only.
- $text = "text {{ date | filter }} text";
- $placeholders = $this->placeholderResolver->scan($text);
- $this->assertEquals([
- 'date' => [
- '| filter' => '{{ date | filter }}',
- ],
- ], $placeholders);
- }
-
- /**
- * @covers ::resolvePlaceholders
- */
- public function testResolvingPlaceholders() {
- $text = 'test {{node.title}} and {{node.title.value}}';
- $result = $this->placeholderResolver->resolvePlaceholders($text, ['node' => $this->node->getTypedData()]);
- $expected = [
- '{{node.title}}' => 'test',
- '{{node.title.value}}' => 'test',
- ];
- $this->assertEquals($expected, $result);
-
- // Test a placeholder without accessing a property.
- $text = 'test {{string}}';
- $result = $this->placeholderResolver->resolvePlaceholders($text, [
- 'string' => $this->typedDataManager->create(
- DataDefinition::create('string'), 'replacement'
- ),
- ]);
- $expected = [
- '{{string}}' => 'replacement',
- ];
- $this->assertEquals($expected, $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testReplacePlaceholders() {
- $text = 'test {{node.title}} and {{node.title.value}}';
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test test and test', $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testPlaceholdersAcrossReferences() {
- $user = $this->entityTypeManager->getStorage('user')
- ->create([
- 'name' => 'test',
- 'type' => 'user',
- ]);
- $this->node->uid->entity = $user;
- $text = 'test {{node.title}} and {{node.uid.entity.name}}';
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test test and test', $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testPlaceholdersWithMissingData() {
- $text = 'test {{node.title.1.value}}';
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()], NULL, []);
- $this->assertEquals('test {{node.title.1.value}}', $result);
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()], NULL, ['clear' => FALSE]);
- $this->assertEquals('test {{node.title.1.value}}', $result);
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()], NULL, ['clear' => TRUE]);
- $this->assertEquals('test ', $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testStringEncoding() {
- $this->node->title->value = 'XSS ';
- $text = 'test {{node.title}}';
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test ' . new HtmlEscapedText('XSS '), $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testIntegerPlaceholder() {
- $this->node->field_integer->value = 3;
- $text = 'test {{node.field_integer.0.value}}';
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test 3', $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testListPlaceholder() {
- $this->node->field_integer = [1, 2];
- $text = 'test {{node.field_integer}}';
- $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test 1, 2', $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testApplyingFilters() {
- $this->node->field_integer = [1, 2, NULL];
- $this->node->title->value = NULL;
- $result = $this->placeholderResolver->replacePlaceHolders("test {{node.field_integer.2.value|default('0')}}", ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test 0', $result);
- $result = $this->placeholderResolver->replacePlaceHolders("test {{node.title.value|default('tEsT')|lower}}", ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test test', $result);
-
- // Test filter expressions with whitespaces.
- $result = $this->placeholderResolver->replacePlaceHolders("test {{ node.title.value | default('tEsT') | lower }}", ['node' => $this->node->getTypedData()]);
- $this->assertEquals('test test', $result);
-
- // Test a filter expression on data without accessing a property.
- $text = 'test {{string | lower}}';
- $result = $this->placeholderResolver->replacePlaceHolders($text, [
- 'string' => $this->typedDataManager->create(DataDefinition::create('string'), 'Replacement'),
- ]);
- $this->assertEquals('test replacement', $result);
-
- $text = "The year is {{ date | format_date('custom', 'Y') }}.";
- $result = $this->placeholderResolver->replacePlaceHolders($text, [
- 'date' => $this->typedDataManager->create(DataDefinition::create('timestamp'), '3600'),
- ]);
- $this->assertEquals('The year is 1970.', $result);
- }
-
- /**
- * @covers ::replacePlaceHolders
- */
- public function testBubbleableMetadata() {
- // Make sure the bubbleable metadata added by the fetcher is properly passed
- // though.
- $bubbleable_metadata = new BubbleableMetadata();
- // Save the node, so it gets a cache tag.
- $this->node->save();
- $this->placeholderResolver->replacePlaceHolders('test {{node.field_integer}}', ['node' => $this->node->getTypedData()], $bubbleable_metadata);
- $expected = ['node:' . $this->node->id()];
- $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
-
- // Ensure cache tags of filters are added in.
- $bubbleable_metadata = new BubbleableMetadata();
- $this->placeholderResolver->replacePlaceHolders("test {{ node.created.value | format_date('medium') }}", ['node' => $this->node->getTypedData()], $bubbleable_metadata);
- $expected = Cache::mergeTags(['node:' . $this->node->id()], DateFormat::load('medium')->getCacheTags());
- $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
- }
-
-}
diff --git a/modules/typed_data/tests/src/Traits/BrowserTestHelpersTrait.php b/modules/typed_data/tests/src/Traits/BrowserTestHelpersTrait.php
deleted file mode 100644
index 34eb052..0000000
--- a/modules/typed_data/tests/src/Traits/BrowserTestHelpersTrait.php
+++ /dev/null
@@ -1,77 +0,0 @@
-getSession()->getPage()->findLink($locator);
- }
-
- /**
- * Finds field (input, textarea, select) with specified locator.
- *
- * @param string $locator
- * Input id, name or label.
- *
- * @return \Behat\Mink\Element\NodeElement|null
- * The input field element.
- */
- public function findField($locator) {
- return $this->getSession()->getPage()->findField($locator);
- }
-
- /**
- * Finds button with specified locator.
- *
- * @param string $locator
- * Button id, value or alt.
- *
- * @return \Behat\Mink\Element\NodeElement|null
- * The button node element.
- */
- public function findButton($locator) {
- return $this->getSession()->getPage()->findButton($locator);
- }
-
- /**
- * Presses button with specified locator.
- *
- * @param string $locator
- * Button id, value or alt.
- *
- * @throws \Behat\Mink\Exception\ElementNotFoundException
- */
- public function pressButton($locator) {
- $this->getSession()->getPage()->pressButton($locator);
- }
-
- /**
- * Fills in field (input, textarea, select) with specified locator.
- *
- * @param string $locator
- * Input id, name or label.
- * @param string $value
- * Value.
- *
- * @throws \Behat\Mink\Exception\ElementNotFoundException
- *
- * @see \Behat\Mink\Element\NodeElement::setValue
- */
- public function fillField($locator, $value) {
- $this->getSession()->getPage()->fillField($locator, $value);
- }
-
-}
diff --git a/modules/typed_data/typed_data.info.yml b/modules/typed_data/typed_data.info.yml
deleted file mode 100644
index 9f02a2a..0000000
--- a/modules/typed_data/typed_data.info.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Typed Data
-type: module
-description: 'Extends the core Typed Data API with new APIs and features.'
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-1.0-alpha1+34-dev'
-core: '8.x'
-project: 'typed_data'
-datestamp: 1508419447
diff --git a/modules/typed_data/typed_data.services.yml b/modules/typed_data/typed_data.services.yml
deleted file mode 100644
index c520144..0000000
--- a/modules/typed_data/typed_data.services.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-services:
- plugin.manager.typed_data_filter:
- class: Drupal\typed_data\DataFilterManager
- arguments: ['@container.namespaces', '@module_handler']
- plugin.manager.typed_data_form_widget:
- class: Drupal\typed_data\Widget\FormWidgetManager
- arguments: ['@container.namespaces', '@module_handler']
- typed_data.data_fetcher:
- class: Drupal\typed_data\DataFetcher
- typed_data.placeholder_resolver:
- class: Drupal\typed_data\PlaceholderResolver
- arguments: ['@typed_data.data_fetcher', '@plugin.manager.typed_data_filter']
diff --git a/modules/workbench_access-8.x-1.x/.travis.yml b/modules/workbench_access-8.x-1.x/.travis.yml
deleted file mode 100644
index 40f3375..0000000
--- a/modules/workbench_access-8.x-1.x/.travis.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-language: php
-sudo: false
-
-php: [5.5, 5.6, 7.0, hhvm]
-
-matrix:
- fast_finish: true
- allow_failures:
- - php: hhvm
-
-cache:
- directories:
- - $HOME/.composer/cache/files
-
-env:
- - DRUPAL=8.3.x
- - DRUPAL=8.4.x
-
-mysql:
- database: wa
- username: root
- encoding: utf8
-
-notifications:
- email: false
-
-before_install:
- # Add composer's global bin directory to the path
- # see: https://github.com/drush-ops/drush#install---composer
- - export PATH="$HOME/.composer/vendor/bin:$PATH"
-
- # Remove Xdebug. Not an issue for PHP 7.
- - phpenv config-rm xdebug.ini || true
-
- - composer self-update
-
-install:
- # Install Drush. We need to pin this to 8.1.5 because there are compatability
- # issues with symfony/console 2.8/3.0 in later versions.
- - composer global require drush/drush:8.1.5
- - phpenv rehash
-
- # Create database.
- - mysql -e 'create database wa'
-
-before_script:
- # Remember the current rules test directory for later use in the Drupal installation.
- - TESTDIR=$(pwd)
- # Navigate out of module directory to prevent blown stack by recursive module lookup.
- - cd ..
-
- # Download Drupal 8 core.
- - travis_retry drush dl drupal-$DRUPAL --drupal-project-rename=drupal
- - cd drupal
-
- # Make the module appear in the correct place
- - ln -s $TESTDIR modules/workbench_access
-
- # Install drupal default profile
- - /usr/bin/env PHP_OPTIONS="-d sendmail_path=$(which true)" drush --yes --verbose site-install minimal --db-url=mysql://root:@127.0.0.1/wa
- # Install modules
- - drush --yes en simpletest workbench_access taxonomy
- - drush cr
-
- # Start a web server on port 8080 in the background.
- - nohup php -S 0.0.0.0:8080 > /dev/null 2>&1 &
-
- # Wait until the web server is responding.
- - until curl -s localhost:8080; do true; done > /dev/null
-
-script:
- - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "Simpletest" --php `which php` --url http://localhost:8080 "workbench_access"
- - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "PHPUnit-Functional" --php `which php` --url http://localhost:8080 "workbench_access"
- - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "PHPUnit-Kernel" --php `which php` --url http://localhost:8080 "workbench_access"
- - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "PHPUnit-Unit" --php `which php` --url http://localhost:8080 "workbench_access"
diff --git a/modules/workbench_access-8.x-1.x/README.md b/modules/workbench_access-8.x-1.x/README.md
deleted file mode 100644
index 3a5c089..0000000
--- a/modules/workbench_access-8.x-1.x/README.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Workbench Access
-
-The Workbench Access module creates editorial access controls based on hierarchies. It is an extensible system that supports structures created by other Drupal modules.
-
-When creating and editing content, users will be asked to place the content in an editorial section. Other users within that section or its parents will be able to edit the content.
-
-A user may be granted editorial rights to a section specific to his account or by her assigned role on the site. To create, edit and delete content in a section, the user must have the core node module permission (e.g. `Edit all Article content`) and the content must be assigned to the same section.
-
-As of this writing, the module supports the core Taxonomy and Menu modules for the management of access hierarchies. It uses Drupal 8's plugin system to create new hierarchies.
-
-Note that the module only controls access to content editing. It does not provide any content filtering of access restrictions for users trying to view that content.
-
-While Workbench Access is part of a larger module suite, it may be run as a stand-alone module with no dependencies.
-
-## Installation and Configuration
-
-### Install
-To start using the module, install normally and then go to the configuration page at `admin/config/workflow/workbench_access`. From there, select the access control scheme you wish to use (by default, either Menu or Taxonomy) and the corresponding hierarchies that you wish to use for access control.
-
-Tip: It is best if you create your hierarchy (say a Taxonomy Vocabulary called `Editorial section` before configuring the module.
-
-If you want to test how the system works, you can run the drush command `drush wa-test` to install and configure a sample taxonomy hierarchy.
-
-### Configure
-After assigning the access control scheme, you must save the form. After saving, you will be asked to select the fields you wish to use for access control. You may elect not to place a content type under access control, but to use Workbench Access with a content type, you must first create and select a field that contains the data that will be used to assign access.
-
-Note that the Menu access scheme only supports one field type, the default menu selection field.
-
-### Assign
-Once you select the fields, it is time to assign users to editorial sections. For each role that should use Workbench Access, give the role either of the following permissions:
-
-* Bypass Workbench Access permissions
- This permission assigns users in the role to all sections automatically. Give only to trusted administrators.
-* Allow all members of this role to be assigned to Workbench Access sections
- This permission lets users and roles be assigned to specific editorial sections. It is the default permission for most roles.
-
-After permissions are assigned, go to the Sections overview page `admin/config/workflow/workbench_access/sections`. This page shows a list of all sections in your access hierarchy and provides links for adding roles or users to those sections.
-
-Note that when granting access, the hierarchy is enforced such that if you have the following structure:
-
-```
-- Alumni
--- Events
--- Giving
-```
-
-A user or role assigned to `Alumni` will also have access to `Events` and `Giving` and does not need to be assigned to all three.
-
-### User Sections
-Note that user sections are currently stored as a field on the user account. However,
-they are not intended to be edited from the account page. These fields should be hidden
-by the module's installation process.
-
-You can check this configuration by going to `/admin/config/people/accounts/form-display`
-and ensuring that the Workbench Access 'Section' field is disabled.
-
-The user storage will likely change before the stable release to remediate this issue.
-
-## Contributing
-
-If you'd like to contribute, please do. Github forks and pull requests are preferable. If you prefer a patch-based workflow, you can attach patches to GitHub issues or Drupal.org
-issues. If you open a Drupal.org issue, please link to it from the appropriate GitHub issue.
-
-The GitHub issues are grouped under three milestones:
-
-1. Alpha -- items required for a test release. When this is complete, we will roll an alpha1 release on Drupal.org.
-2. Beta -- items considered critical features for a release. When complete, we will roll a beta release on Drupal.org.
-3. Final -- items required for a stable, secure release on Drupal.org.
-
-We would like to tackle issues in that order, but feel free to work on what motivates you.
-
-## Testing
-
-The module does not have solid test coverage, and complete coverage is required for release. Right now, we mostly use SimpleTest, because it is most familiar, but unit tests are welcome.
-
-All pull requests will automatically run tests in TravisCI. Test coverage runs against the following:
-
-1. PHP 5.5, 5.6, and 7.
-2. Drupal 8.0.x and 8.1.x.
-3. Tests also run for the HHVM but are allowed to fail.
-
-[](https://travis-ci.org/agentrickard/workbench_access)
-
-## Developer Notes
-
-### Access controls
-Workbench Access only applies to content (node) editing.
-
-By design, Workbench Access never _allows_ access. It only responds with `neutral` or `deny`. The intention is that normal editing permissions should apply, but only within the sections that a user is assigned to.
-
-Access controls are controlled by the `WorkbenchAccessManager` class but the individual response is delegated to plugins via the `checkEntityAccess` method provided in the `AccessControlHierarchyBase` plugin. So if you want to change access behavior, you can write your own plugin or extend an existing one.
-
-### Data storage
-Access is granted either at the `user` or `role` level. User-level access is stored in the field `user.field_workbench_access`, which installs with the module. Role-level access is stored in the `state` system. We use the state system instead of config because access control hierarchies are typically content entities, which cannot be exported via config.
-
-*This storage is now a service, and swappable. In the future, we will likely replace the current storage with an entity-based system.*
-
-This means that base configuration of Workbench Access is config-exportable, but the actual access control assignments are not. This is a limitation of Drupal 8's design.
-
-Content-level data is stored on individual fields, which must be created and assigned via the Workbench Access configuration page at `admin/config/workflow/workbench_access`.
diff --git a/modules/workbench_access-8.x-1.x/composer.json b/modules/workbench_access-8.x-1.x/composer.json
deleted file mode 100644
index d395ac7..0000000
--- a/modules/workbench_access-8.x-1.x/composer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "name": "drupal/workbench_access",
- "description": "Hierarchical access control for content.",
- "type": "drupal-module",
- "license": "GPL-2.0+",
- "homepage": "https://www.drupal.org/project/workbench_access"
-}
diff --git a/modules/workbench_access-8.x-1.x/config/install/field.storage.user.field_workbench_access.yml b/modules/workbench_access-8.x-1.x/config/install/field.storage.user.field_workbench_access.yml
deleted file mode 100644
index 6819e4a..0000000
--- a/modules/workbench_access-8.x-1.x/config/install/field.storage.user.field_workbench_access.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - workbench_access
- - user
-id: user.field_workbench_access
-field_name: field_workbench_access
-entity_type: user
-type: list_string
-module: workbench_access
-settings: { }
-locked: false
-cardinality: -1
-translatable: true
-indexes: { }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/workbench_access-8.x-1.x/config/install/workbench_access.settings.yml b/modules/workbench_access-8.x-1.x/config/install/workbench_access.settings.yml
deleted file mode 100644
index 687cc5e..0000000
--- a/modules/workbench_access-8.x-1.x/config/install/workbench_access.settings.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-scheme:
-parents: {}
-label: Section
-plural_label: Sections
-fields: {}
-deny_on_empty: false
diff --git a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.schema.yml b/modules/workbench_access-8.x-1.x/config/schema/workbench_access.schema.yml
deleted file mode 100644
index 1036e87..0000000
--- a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.schema.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-workbench_access.settings:
- type: config_object
- label: 'Workbench Access settings'
- mapping:
- scheme:
- type: text
- label: 'Active access scheme.'
- parents:
- type: sequence
- label: 'Active access parents for a scheme.'
- sequence:
- type: string
- label: 'Parent'
- deny_on_empty:
- type: boolean
- label: 'Deny access to unassigned content'
- label:
- type: text
- label: 'Label shown to define a Workbench Access control group.'
- plural_label:
- type: text
- label: 'Label shown to define a set of Workbench Access control groups.'
- fields:
- type: sequence
- label: 'Fields that store access control data.'
- sequence:
- type: sequence
- label: 'Content type'
- sequence:
- type: string
- label: 'Field'
-
-node.type.*.third_party.workbench_access:
- type: mapping
- label: 'Per-content type access control settings'
- mapping:
- workbench_access_status:
- type: boolean
- label: 'Workbench Access status'
-
-entity_reference_selection.workbench_access:
- type: entity_reference_selection.default
- label: 'Default selection handler settings'
-
-entity_reference_selection.workbench_access:*:
- type: entity_reference_selection.default
diff --git a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.views.schema.yml b/modules/workbench_access-8.x-1.x/config/schema/workbench_access.views.schema.yml
deleted file mode 100644
index c6c67ca..0000000
--- a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.views.schema.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Schema for the views plugins of the Workbench Access module.
-
-views.field.workbench_access_section:
- type: views_field
- label: 'Workbench Section'
- mapping:
- separator:
- type: label
- label: 'Separator'
-views.field.workbench_access_user_section:
- type: views_field
- label: 'Workbench Section'
- mapping:
- separator:
- type: label
- label: 'Separator'
-views.filter.workbench_access_section:
- type: views_filter
- label: 'Workbench Section'
- mapping:
- operator:
- type: string
- label: 'Operator'
- value:
- type: sequence
- label: 'Values'
- sequence:
- type: string
- label: 'Value'
- expose:
- type: mapping
- label: 'Expose'
- mapping:
- reduce:
- type: integer
- label: 'Reduce'
- reduce_duplicates:
- type: integer
- label: 'Reduce duplicates'
- section_filter:
- type: mapping
- label: 'Section Filter'
- mapping:
- show_hierarchy:
- type: integer
- label: 'Show Hierarchy'
diff --git a/modules/workbench_access-8.x-1.x/js/workbench_access.js b/modules/workbench_access-8.x-1.x/js/workbench_access.js
deleted file mode 100644
index 666d03c..0000000
--- a/modules/workbench_access-8.x-1.x/js/workbench_access.js
+++ /dev/null
@@ -1,19 +0,0 @@
-
-(function ($) {
-
- 'use strict';
-
- Drupal.behaviors.workbenchAccess = {
- attach: function (context, settings) {
- $('#edit-add', context).once('field-switch').each(function () {
- // We hide mass assign.
- $('.form-item-editors-add-mass').hide();
- $(this).find('.switch').click(function(e) {
- $('.form-item-editors-add').toggle();
- $('.form-item-editors-add-mass').toggle();
- })
- });
- }
- };
-
-})(jQuery, drupalSettings);
diff --git a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyBase.php b/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyBase.php
deleted file mode 100644
index 6aea4ec..0000000
--- a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyBase.php
+++ /dev/null
@@ -1,374 +0,0 @@
-config = $configFactory->get('workbench_access.settings');
- $this->userSectionStorage = $user_section_storage;
- $this->entityTypeManager = $entityTypeManager;
- }
-
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static(
- $configuration,
- $plugin_id,
- $plugin_definition,
- $container->get('workbench_access.user_section_storage'),
- $container->get('config.factory'),
- $container->get('entity_type.manager')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function id() {
- return $this->pluginDefinition['id'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function label() {
- return $this->pluginDefinition['label'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function status() {
- return $this->config->get('scheme') === $this->id();
- }
-
- /**
- * @inheritdoc
- */
- public function options() {
- if ($entity_type = $this->pluginDefinition['base_entity']) {
- return array_map(function (EntityInterface $entity) {
- return $entity->label();
- }, $this->entityTypeManager->getStorage($entity_type)->loadMultiple());
- }
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getTree() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function resetTree() {
- unset($this->tree);
- }
-
- /**
- * {@inheritdoc}
- */
- public function load($id) {
- $tree = $this->getTree();
- foreach ($tree as $parent => $data) {
- if (isset($data[$id])) {
- return $data[$id];
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function configForm($parents = []) {
- $node_types = $this->entityTypeManager->getStorage('node_type')->loadMultiple();
- $form = [];
- /** @var \Drupal\node\NodeTypeInterface $type */
- foreach ($node_types as $id => $type) {
- $form['workbench_access_status_' . $id] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Enable Workbench Access control for @type content.', ['@type' => $type->label()]),
- '#description' => $this->t('If selected, all @type content will be subject to editorial access restrictions.', ['@type' => $type->label()]),
- '#default_value' => $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0),
- ];
- $options = ['' => $this->t('No field set')];
- $options += $this->getFields('node', $type->id(), $parents);
- if (!empty($options)) {
- $form['field_' . $id] = [
- '#type' => 'select',
- '#title' => $this->t('Access control field'),
- '#options' => $options,
- '#default_value' => $this->fields('node', $type->id()),
- ];
- }
- else {
- $form['field_' . $id] = [
- '#type' => 'markup',
- '#markup' => $this->t('There are no eligible fields on this content type.'),
- ];
- }
- }
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function configValidate(array &$form, FormStateInterface $form_state) {
- // Default implementation is empty.
- }
-
- /**
- * {@inheritdoc}
- */
- public function configSubmit(array &$form, FormStateInterface $form_state) {
- $fields = $this->config->get('fields');
-
- $node_types = $this->entityTypeManager->getStorage('node_type')->loadMultiple();
- /** @var \Drupal\node\NodeTypeInterface $type */
- foreach ($node_types as $id => $type) {
- $field = $form_state->getValue('field_' . $id);
- if (!empty($field)) {
- $type->setThirdPartySetting('workbench_access', 'workbench_access_status', $form_state->getValue('workbench_access_status_' . $id));
- $fields['node'][$id] = $field;
- }
- else {
- $type->setThirdPartySetting('workbench_access', 'workbench_access_status', 0);
- $fields['node'][$id] = '';
- }
- $type->save();
- }
- return ['fields' => $fields];
- }
-
- /**
- * {@inheritdoc}
- */
- public function checkEntityAccess(EntityInterface $entity, $op, AccountInterface $account, WorkbenchAccessManagerInterface $manager) {
- // @TODO: Check for super-admin?
- // We don't care about the View operation right now.
- if ($op === 'view' || $op === 'view label' || $account->hasPermission('bypass workbench access')) {
- // Return early.
- return AccessResult::neutral();
- }
-
- // Check that the content type is configured.
- // @TODO: Right now this only handles nodes.
- /** @var \Drupal\node\NodeTypeInterface $type */
- $active = FALSE;
- if ($type = $this->entityTypeManager->getStorage('node_type')->load($entity->bundle())) {
- $active = $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0);
- }
-
- if (!$active) {
- // No such node-type or not-active.
- return AccessResult::neutral();
- }
-
- if ($field = $this->fields('node', $type->id())) {
- // Discover the field and check status.
- $entity_sections = $this->getEntityValues($entity, $field);
- // If no value is set on the entity, ignore.
- // @TODO: Is this the correct logic? It is helpful for new installs.
- $deny_on_empty = $this->config->get('deny_on_empty');
-
- if (!$deny_on_empty && empty($entity_sections)) {
- return AccessResult::neutral();
- }
- $user_sections = $this->userSectionStorage->getUserSections($account->id());
- if (empty($user_sections)) {
- return AccessResult::forbidden();
- }
- // Check the tree status of the $entity against the $user.
- // Return neutral if in tree, forbidden if not.
- if ($manager->checkTree($entity_sections, $user_sections)) {
- return AccessResult::neutral();
- }
- return AccessResult::forbidden();
- }
- // Deny is our default response.
- return AccessResult::forbidden();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getEntityValues(EntityInterface $entity, $field) {
- $values = [];
- foreach ($entity->get($field)->getValue() as $item) {
- if (isset($item['target_id'])) {
- $values[] = $item['target_id'];
- }
- }
- return $values;
- }
-
- /**
- * {inheritdoc}
- */
- public function fields($entity_type, $bundle) {
- $fields = $this->config->get('fields');
- return isset($fields[$entity_type][$bundle]) ? $fields[$entity_type][$bundle] : [];
- }
-
- /**
- * {inheritdoc}
- */
- public function fieldsByEntityType($entity_type) {
- // User/users do not name the data table consistently.
- if ($entity_type == 'user' || $entity_type == 'users') {
- return ['user' => WorkbenchAccessManagerInterface::FIELD_NAME];
- }
- else {
- $fields = $this->config->get('fields');
- return $fields[$entity_type];
- }
- }
-
- /**
- * {inheritdoc}
- */
- public function disallowedOptions($field) {
- $options = [];
- if (isset($field['widget']['#default_value']) && isset($field['widget']['#options'])) {
- $options = array_diff_key(array_flip($field['widget']['#default_value']), $field['widget']['#options']);
- }
- return array_keys($options);
- }
-
- /**
- * {inheritdoc}
- */
- public static function submitEntity(array &$form, FormStateInterface $form_state) {
- $values = $form_state->getValue('workbench_access_disallowed');
- if (!empty($values)) {
- $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- if ($scheme = $manager->getActiveScheme()) {
- $node = $form_state->getFormObject()->getEntity();
- $field = $scheme->fields('node', $node->bundle());
- $entity_values = $form_state->getValue($field);
- }
- foreach ($values as $value) {
- $entity_values[]['target_id'] = $value;
- }
- $form_state->setValue($field, $entity_values);
- }
- }
-
- /**
- * {inheritdoc}
- */
- public function getViewsJoin($table, $key, $alias = NULL) {
- $fields = $this->fieldsByEntityType($table);
- $table_prefix = $table;
- $field_suffix = '_target_id';
- if ($table == 'users') {
- $table_prefix = 'user';
- $field_suffix = '_value';
- }
- foreach ($fields as $field) {
- if (!empty($field)) {
- $configuration[$field] = [
- 'table' => $table_prefix . '__' . $field,
- 'field' => 'entity_id',
- 'left_table' => $table,
- 'left_field' => $key,
- 'operator' => '=',
- 'table_alias' => $field,
- 'real_field' => $field . $field_suffix,
- ];
- }
- }
- return $configuration;
- }
-
- /**
- * {inheritdoc}
- */
- public function addWhere(Section $filter, $values) {
- // The JOIN data tells us if we have multiple tables to deal with.
- $join_data = $this->getViewsJoin($filter->table, $filter->realField);
- if (count($join_data) == 1) {
- $filter->query->addWhere($filter->options['group'], "$filter->tableAlias.$filter->realField", array_values($values), $filter->operator);
- }
- else {
- $or = db_or();
- foreach ($join_data as $field => $data) {
- $alias = $data['table_alias'] . '.' . $data['real_field'];
- $or->condition($alias, array_values($values), $filter->operator);
- }
- $filter->query->addWhere($filter->options['group'], $or);
- }
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyInterface.php b/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyInterface.php
deleted file mode 100644
index 925d629..0000000
--- a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyInterface.php
+++ /dev/null
@@ -1,240 +0,0 @@
- label.
- */
- public function options();
-
- /**
- * Gets the entire hierarchy tree.
- *
- * @return array
- */
- public function getTree();
-
- /**
- * Gets the fields that may be used for a plugin type.
- *
- * This method informs the system what fields are eligible to use for
- * access controls. For instance, with taxonomy, it returns all taxonomy
- * reference fields.
- *
- * @param $entity_type
- * The type of entity access control is being tested for (e.g. 'node').
- * @param $bundle
- * The entity bundle being tested (e.g. 'article').
- * @param $parents
- * The selected parent roots of the hierarchy. e.g. a taxonomy vocabulary.
- * The array contains the ids of the root items (e.g. a vocabulary id).
- *
- * @return array
- * An array of fields in the format id => label, for use in a form.
- */
- public function getFields($entity_type, $bundle, $parents);
-
- /**
- * Retrieves the access control values from an entity.
- *
- * @param EntityInterface $entity
- * A Drupal entity, typically a node or a user.
- * @param $field
- * The field holding the access control data.
- *
- * @return array
- * An array of field data from the entity.
- */
- public function getEntityValues(EntityInterface $entity, $field);
-
- /**
- * Loads a hierarchy definition for a single item in the tree.
- *
- * @param $id
- * The identifier for the item, such as a term id.
- *
- * @return \Drupal\workbench_access\AccessControlHierarchyInterface
- * A plugin implementation.
- */
- public function load($id);
-
- /**
- * Provides configuration options.
- *
- * @param $parents
- * The selected parent roots of the hierarchy. e.g. a taxonomy vocabulary.
- * The array contains the ids of the root items (e.g. a vocabulary id).
- */
- public function configForm($parents = []);
-
- /**
- * Validates configuration options.
- *
- * @param array &$form
- * The submitted form, passed by reference.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The form state object.
- *
- * @return
- * No return value. Interact with the $form_state object.
- */
- public function configValidate(array &$form, FormStateInterface $form_state);
-
- /**
- * Submits configuration options.
- *
- * @param array &$form
- * The submitted form, passed by reference.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The form state object.
- */
- public function configSubmit(array &$form, FormStateInterface $form_state);
-
- /**
- * Responds to request for node access.
- *
- * @param EntityInterface $entity
- * The node being checked. In future this may handle other entity types.
- * @param AccountInterface $account
- * The user requesting access to the node.
- * @param WorkbenchAccessManagerInterface $manager
- * The access control manager.
- *
- * @return \Drupal\Core\Access\AccessResultInterface
- * An access result response. By design, this is either neutral or deny.
- *
- * @see workbench_access_node_access()
- */
- public function checkEntityAccess(EntityInterface $entity, $op, AccountInterface $account, WorkbenchAccessManagerInterface $manager);
-
- /**
- * Alters the selection options provided for an access control field.
- *
- * @param $field
- * The field element from a node form.
- * @param WorkbenchAccessManagerInterface $manager
- * The access manager.
- * @param array $user_sections
- * The user sections.
- *
- * @return $element
- * The field element, after restricting selection options.
- */
- public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []);
-
- /**
- * Gets any options that are set but cannot be changed by the editor.
- *
- * @param $field
- * The field element from a node form, after running through alterOptions().
- *
- * @return array
- * An array of section ids to preserve.
- */
- public function disallowedOptions($field);
-
- /**
- * Responds to the submission of an entity form.
- *
- * If the entity contains section values that the user cannot change, they
- * are passed in the 'workbench_access_disallowed' field on the form. Plugins
- * should examine that value and make modifications to their target field
- * as necessary.
- *
- * Currently only supports nodes. A default implementation is provided.
- *
- * @param array &$form
- * A form array.
- * @param FormStateInterface $form_state
- * The form_state object.
- */
- public static function submitEntity(array &$form, FormStateInterface $form_state);
-
- /**
- * Returns information about how to join this section data to a base view table.
- *
- * @param $table
- * The base table of the view.
- * @param $key
- * The primary key of the base table.
- * @param $alias (optional)
- * The views alias of the base table.
- *
- * @return array
- * The configuration array for adding a views JOIN statement.
- */
- public function getViewsJoin($table, $key, $alias = NULL);
-
- /**
- * Adds a where clause to a view when using a section filter.
- *
- * @param Drupal\workbench_access\Plugin\views\filter\Section $filter
- * The views filter object provided by Workbench Access.
- * @param $values
- * An array of values for the current view.
- */
- public function addWhere(Section $filter, $values);
-
- /**
- * Resets the internal cache of the tree.
- *
- * Right now, this is a per-request cache until we figure out a long-term
- * caching strategy.
- */
- public function resetTree();
-
- /**
- * Returns the access control fields configured for use by the plugin.
- *
- * @param $entity_type
- * The type of entity access control is being tested for (e.g. 'node').
- * @param $bundle
- * The entity bundle being tested (e.g. 'article').
- */
- public function fields($entity_type, $bundle);
-
- /**
- * Returns the access control fields configured for use by the plugin.
- *
- * @param $entity_type
- * The type of entity access control is being tested for (e.g. 'node').
- */
- public function fieldsByEntityType($entity_type);
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Annotation/AccessControlHierarchy.php b/modules/workbench_access-8.x-1.x/src/Annotation/AccessControlHierarchy.php
deleted file mode 100644
index d33887e..0000000
--- a/modules/workbench_access-8.x-1.x/src/Annotation/AccessControlHierarchy.php
+++ /dev/null
@@ -1,75 +0,0 @@
-manager = $manager;
- $this->roleSectionStorage = $role_section_storage;
- $this->userSectionStorage = $user_section_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('plugin.manager.workbench_access.scheme'),
- $container->get('workbench_access.role_section_storage'),
- $container->get('workbench_access.user_section_storage')
- );
- }
-
- /**
- * Returns the section assignment page.
- */
- public function page() {
- $config = $this->config('workbench_access.settings');
- $rows = [];
- if ($scheme_id = $config->get('scheme')) {
- $parents = $config->get('parents');
- $tree = $this->manager->getActiveTree();
- foreach ($parents as $id => $label) {
- // @TODO: Move to a theme function?
- // @TODO: format plural
- foreach ($tree[$id] as $iid => $item) {
- $editor_count = count($this->userSectionStorage->getEditors($iid));
- $role_count = count($this->roleSectionStorage->getRoles($iid));
- $row = [];
- $row[] = str_repeat('-', $item['depth']) . ' ' . $item['label'];
- $row[] = Link::fromTextAndUrl($this->t('@count editors', ['@count' => $editor_count]), Url::fromRoute('workbench_access.by_user', ['id' => $iid]));
- $row[] = Link::fromTextAndUrl($this->t('@count roles', ['@count' => $role_count]), Url::fromRoute('workbench_access.by_role', ['id' => $iid]));
- $rows[] = $row;
- }
- }
- $build = [
- '#type' => 'table',
- '#header' => [$config->get('plural_label'), $this->t('Editors'), $this->t('Roles')],
- '#rows' => $rows,
- ];
- }
- else {
- $build = [
- '#type' => 'markup',
- '#markup' => $this->t('No sections are available.'),
- ];
- }
- return $build;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByRoleForm.php b/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByRoleForm.php
deleted file mode 100644
index 4d3e666..0000000
--- a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByRoleForm.php
+++ /dev/null
@@ -1,131 +0,0 @@
-manager = $manager;
- $this->roleSectionStorage = $role_section_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('plugin.manager.workbench_access.scheme'),
- $container->get('workbench_access.role_section_storage')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'workbench_access_by_role';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $id = NULL) {
- $element = $this->manager->getElement($id);
- $existing_roles = $this->roleSectionStorage->getRoles($id);
- $potential_roles = $this->roleSectionStorage->getPotentialRolesFiltered($id);
-
- $form['existing_roles'] = ['#type' => 'value', '#value' => $existing_roles];
- $form['section_id'] = ['#type' => 'value', '#value' => $id];
- if (!$existing_roles) {
- $text = $this->t('There are no roles assigned to the %label section.', ['%label' => $element['label']]);
- $form['help'] = [
- '#type' => 'markup',
- '#markup' => '' . $text . '
',
- ];
- }
-
- if ($potential_roles) {
- $form['roles'] = [
- '#title' => $this->t('Roles for the %label section.', ['%label' => $element['label']]),
- '#type' => 'checkboxes',
- '#options' => $potential_roles,
- '#default_value' => array_keys($existing_roles),
- ];
- $form['actions'] = ['#type' => 'actions'];
- $form['actions']['submit'] = ['#type' => 'submit', '#value' => $this->t('Submit')];
- }
- if (array_keys($potential_roles) == array_keys($existing_roles)) {
- $form['message'] = [
- '#type' => 'markup',
- '#markup' => '' . $this->t('There are no addtional roles that can be added to the %label section', ['%label' => $element['label']]) . '
',
- ];
- }
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $roles = $form_state->getValue('roles');
- $existing_roles = $form_state->getValue('existing_roles');
- $id = $form_state->getValue('section_id');
- foreach ($roles as $role_id => $value) {
- // Add user to section.
- if ($value && !isset($existing_roles[$role_id])) {
- $this->roleSectionStorage->addRole($role_id, [$id]);
- }
- // Remove user from section.
- if (!$value && isset($existing_roles[$role_id])) {
- $this->roleSectionStorage->removeRole($role_id, [$id]);
- }
- }
- }
-
- /**
- * Returns a dynamic page title for the route.
- *
- * @param string $id
- * The section id.
- *
- * @return string
- * A page title.
- */
- public function pageTitle($id) {
- $element = $this->manager->getElement($id);
- return $this->t('Roles assigned to %label', ['%label' => $element['label']]);
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByUserForm.php b/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByUserForm.php
deleted file mode 100644
index 476a640..0000000
--- a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByUserForm.php
+++ /dev/null
@@ -1,285 +0,0 @@
-manager = $manager;
- $this->userSectionStorage = $user_section_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('plugin.manager.workbench_access.scheme'),
- $container->get('workbench_access.user_section_storage')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'workbench_access_by_user';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $id = NULL) {
- $element = $this->manager->getElement($id);
- $existing_editors = $this->userSectionStorage->getEditors($id);
- $potential_editors = $this->userSectionStorage->getPotentialEditors($id);
-
- $form['existing_editors'] = ['#type' => 'value', '#value' => $existing_editors];
- $form['section_id'] = ['#type' => 'value', '#value' => $id];
-
- $form['add'] = [
- '#type' => 'container',
- ];
- if ($potential_editors) {
- $toggle = 'Switch between textarea/autocomplete ');
- $form['add']['editors_add'] = [
- '#type' => 'entity_autocomplete',
- '#target_type' => 'user',
- '#selection_handler' => 'workbench_access:user',
- '#selection_settings' => [
- 'include_anonymous' => FALSE,
- 'match_operator' => 'STARTS_WITH',
- 'filter' => ['section_id' => $id],
- ],
- '#title' => $this->t('Add editors to the %label section.', ['%label' => $element['label']]),
- '#description' => $this->t('Search editors to add to this section, separate with comma to add multiple editors.' . $this->t('There are no additional users that can be added to the %label section', ['%label' => $element['label']]) . '
',
- ];
- }
-
- $form['remove'] = [
- '#type' => 'details',
- '#open' => TRUE,
- '#title' => $this->t('Existing editors in the %label section.', array('%label' => $element['label'])),
- '#description' => $this->t('Current editors list. Use the checkboxes to remove editors from this section.'),
- ];
- // Prepare editors list for tableselect.
- $editors_data = [];
- if ($existing_editors) {
- foreach ($existing_editors as $uid => $username) {
- $editors_data[$uid] = [$username];
- }
- asort($editors_data);
- }
- $form['remove']['editors_remove'] = [
- '#type' => 'tableselect',
- '#header' => [$this->t('Username')],
- '#options' => $editors_data,
- '#empty' => $this->t('There are no editors assigned to the %label section.', ['%label' => $element['label']]),
- ];
- if ($existing_editors) {
- $form['remove']['actions'] = [
- '#type' => 'actions',
- 'submit' => [
- '#type' => 'submit',
- '#name' => 'remove',
- '#value' => $this->t('Remove'),
- ],
- ];
- }
- $form['#attached']['library'][] = 'workbench_access/admin';
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $trigger = $form_state->getTriggeringElement();
- $existing_editors = $form_state->getValue('existing_editors');
- $section_id = $form_state->getValue('section_id');
-
- // Add new editors.
- if ($trigger['#name'] == 'add') {
- $uids_added = [];
- if ($add_editors = $form_state->getValue('editors_add')) {
- foreach ($add_editors as $target_entity) {
- $user_id = $target_entity['target_id'];
- if (!isset($existing_editors[$user_id])) {
- $uids_added[] = $user_id;
- }
- }
- }
- elseif ($add_editors = $form_state->getValue('editors_add_mass')) {
- $add_editors = preg_split('/[\ \n\,]+/', $add_editors);
- foreach ($add_editors as $uid_or_username) {
- // This is a uid.
- if ((int)$uid_or_username > 0) {
- if (!isset($existing_editors[(int)$uid_or_username])) {
- $uids_added[] = $uid_or_username;
- }
- }
- elseif (strlen($uid_or_username) > 1) {
- $user = user_load_by_name(trim($uid_or_username));
- if ($user) {
- if (!isset($existing_editors[$user->id()])) {
- $uids_added[] = $user->id();
- }
- }
- }
- }
- }
- if (count($uids_added)) {
- $this->addEditors($uids_added, $section_id, $existing_editors);
- }
- else {
- drupal_set_message($this->t('No valid users were selected to add'), 'warning');
- }
- }
-
- // Remove unwanted editors.
- if ($trigger['#name'] == 'remove') {
- if ($remove_editors = array_filter($form_state->getValue('editors_remove'))) {
- $this->removeEditors($remove_editors, $section_id, $existing_editors);
- }
- else {
- drupal_set_message($this->t('No users were selected to remove.'), 'warning');
- }
- }
- }
-
- /**
- * Returns a dynamic page title for the route.
- *
- * @param string $id
- * The section id.
- *
- * @return string
- * A page title.
- */
- public function pageTitle($id) {
- $element = $this->manager->getElement($id);
- return $this->t('Editors assigned to %label', ['%label' => $element['label']]);
- }
-
- /**
- * Add editors to the section.
- *
- * @param array $uids
- * User ids to add.
- *
- * @param integer $section_id
- * Workbench access section id.
- *
- * @param array $existing_editors
- * Existing editors uids.
- */
- protected function addEditors($uids, $section_id, $existing_editors = []) {
- $users = User::loadMultiple($uids);
- $editors_added = [];
- foreach ($users as $uid => $user) {
- // Add user to section.
- if (!isset($existing_editors[$uid])) {
- $this->userSectionStorage->addUser($uid, [$section_id]);
- $editors_added[] = $user->getDisplayName();
- }
- }
- if (count($editors_added)) {
- $text = $this->formatPlural(count($editors_added),
- 'User @user added.',
- 'Users added: @user',
- ['@user' => implode(', ', $editors_added)]
- )->__toString();
- drupal_set_message($text);
- }
- }
-
- /**
- * Remove editors to the section.
- *
- * @param array $uids
- * User ids to add.
- *
- * @param integer $section_id
- * Workbench access section id.
- *
- * @param array $existing_editors
- * Existing editors uids.
- */
- protected function removeEditors($uids, $section_id, $existing_editors = []) {
- $editors_removed = [];
- foreach ($uids as $user_id) {
- if (isset($existing_editors[$user_id])) {
- $this->userSectionStorage->removeUser($user_id, [$section_id]);
- $editors_removed[] = $existing_editors[$user_id];
- }
- }
- if (count($editors_removed)) {
- $text = $this->formatPlural(count($editors_removed),
- 'User @user removed.',
- 'Users removed: @user',
- ['@user' => implode(', ', $editors_removed)]
- )->__toString();
- drupal_set_message($text);
- }
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessConfigForm.php b/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessConfigForm.php
deleted file mode 100644
index 6f42fad..0000000
--- a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessConfigForm.php
+++ /dev/null
@@ -1,239 +0,0 @@
-state = $state;
- $this->manager = $manager;
- $this->userSectionStorage = $user_section_storage;
- $this->roleSectionStorage = $role_section_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config.factory'),
- $container->get('state'),
- $container->get('plugin.manager.workbench_access.scheme'),
- $container->get('workbench_access.user_section_storage'),
- $container->get('workbench_access.role_section_storage')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'workbench_access_settings';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditableConfigNames() {
- return ['workbench_access.settings'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $config = $this->config('workbench_access.settings');
- $schemes = $this->manager->getSchemes();
- if (empty($schemes)) {
- $form['error'] = [
- '#type' => 'item',
- '#title' => $this->t('Error'),
- '#markup' => $this->t('There are no available access schemes to configure.'),
- ];
- }
- else {
- $form['scheme'] = [
- '#type' => 'details',
- '#title' => $this->t('Active access scheme'),
- '#open' => TRUE,
- ];
- $form['scheme']['scheme'] = [
- '#type' => 'radios',
- '#title' => $this->t('Active access scheme'),
- '#options' => $schemes,
- '#default_value' => $config->get('scheme'),
- ];
- $form['scheme']['reset_scheme'] = [
- '#type' => 'checkbox',
- '#default_value' => FALSE,
- '#title' => $this->t('Reset assigned fields, user and role sections'),
- '#states' => [
- 'invisible' => [
- ':input[name=scheme]' => ['value' => $config->get('scheme')],
- ],
- ],
- '#description' => $this->t('When switching access schemes, flush current field settings, user and role permissions. Recommended.'),
- ];
- foreach ($schemes as $id => $label) {
- $scheme = $this->manager->getScheme($id);
- $form['scheme']['parents'][$id] = [
- '#type' => 'checkboxes',
- '#title' => $this->t('@label editorial access options', ['@label' => $label]),
- '#options' => $scheme->options(),
- '#default_value' => $config->get('parents'),
- '#states' => [
- 'visible' => [
- ':input[name=scheme]' => ['value' => $id],
- ],
- ],
- '#description' => $this->t('Select the @label options to be used for access control.', ['@label' => $label]),
- ];
- }
- $form['scheme']['set'] = [
- '#type' => 'submit',
- '#value' => $this->t('Set active scheme'),
- '#submit' => ['::submitActiveScheme'],
- ];
- }
- if ($id = $config->get('scheme')) {
- $scheme = $this->manager->getScheme($id);
- $custom = $this->manager->getActiveScheme()->configForm($config->get('parents'));
- }
- if (!empty($custom)) {
- $form['custom'] = [
- '#type' => 'details',
- '#title' => $this->t('Scheme settings'),
- '#open' => TRUE,
- '#markup' => '' . $this->t('These settings must be confirmed after saving the scheme and options above.') . ' ',
- ];
- $form['custom'] += $custom;
- }
- $form['behavior'] = [
- '#type' => 'details',
- '#title' => $this->t('Advanced behaviors'),
- ];
- $form['behavior']['deny_on_empty'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Deny access to unassigned content'),
- '#default_value' => $config->get('deny_on_empty', 0),
- '#description' => $this->t('For content under access control, deny access for any content not assigned to a section. This setting is off by default so that installing the module does not break existing site behavior.'),
- ];
- $form['labels'] = [
- '#type' => 'details',
- '#title' => $this->t('Labels'),
- ];
- $form['labels']['label'] = [
- '#type' => 'textfield',
- '#size' => 32,
- '#title' => $this->t('Access group label'),
- '#default_value' => $config->get('label'),
- '#description' => $this->t('Label shown to define a Workbench Access control group.'),
- ];
- $form['labels']['plural_label'] = [
- '#type' => 'textfield',
- '#size' => 32,
- '#title' => $this->t('Access group label (plural form)'),
- '#default_value' => $config->get('plural_label'),
- '#description' => $this->t('Label shown to define a set of Workbench Access control groups.'),
- ];
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $config = $this->config('workbench_access.settings');
- $config->set('deny_on_empty', $form_state->getValue('deny_on_empty'))
- ->set('label', $form_state->getValue('label'))
- ->set('plural_label', $form_state->getValue('plural_label'));
- $new_scheme = $form_state->getValue('scheme');
- if ($config->get('scheme') !== $new_scheme) {
- $config->set('scheme', $new_scheme);
- }
- $config->set('parents', array_filter($form_state->getValue($new_scheme)));
- $extra = $this->manager->getScheme($new_scheme)->configSubmit($form, $form_state);
- foreach ($extra as $key => $value) {
- $config->set($key, $value);
- }
- $config->save();
- parent::submitForm($form, $form_state);
- }
-
- /**
- * Custom submit handler for schema changes.
- */
- public function submitActiveScheme(array $form, FormStateInterface $form_state) {
- $scheme = $form_state->getValue('scheme');
- $config = $this->config('workbench_access.settings');
- $config->set('scheme', $scheme)
- ->set('parents', array_filter($form_state->getValue($scheme)));
- $config->save();
-
- $reset_scheme = $form_state->getValue('reset_scheme');
- if (!empty($reset_scheme)) {
- // Flush access data on scheme change.
- $this->roleSectionStorage->flushRoles();
- $this->userSectionStorage->flushUsers();
- $this->manager->flushFields();
- }
- drupal_set_message($this->t('Access scheme updated.'));
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Menu.php b/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Menu.php
deleted file mode 100644
index 5d948da..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Menu.php
+++ /dev/null
@@ -1,183 +0,0 @@
-tree)) {
- $parents = $this->config->get('parents');
- $tree = [];
- $this->menuTree = \Drupal::getContainer()->get('menu.link_tree');
- foreach ($parents as $id => $label) {
- if ($menu = MenuEntity::load($id)) {
- $tree[$id][$id] = [
- 'label' => $menu->label(),
- 'depth' => 0,
- 'parents' => [],
- 'weight' => 0,
- 'description' => $menu->label(),
- ];
- $params = new MenuTreeParameters();
- $data = $this->menuTree->load($id, $params);
- $this->tree = $this->buildTree($id, $data, $tree);
- }
- }
- }
- return $this->tree;
- }
-
- /**
- * Traverses the menu link tree and builds parentage arrays.
- *
- * Note: this method is necessary because Menu does not auto-load parents.
- *
- * @param $id
- * The root id of the section tree.
- * @param array $data
- * An array of menu tree or subtree data.
- * @param array &$tree
- * The computed tree array to return.
- *
- * @return array $tree
- * The compiled tree data.
- */
- protected function buildTree($id, $data, &$tree) {
- foreach ($data as $link_id => $link) {
- $tree[$id][$link_id] = [
- 'id' => $link_id,
- 'label' => $link->link->getTitle(),
- 'depth' => $link->depth,
- 'parents' => [],
- 'weight' => $link->link->getWeight(),
- 'description' => $link->link->getDescription(),
- ];
- // Get the parents.
- if ($parent = $link->link->getParent()) {
- $tree[$id][$link_id]['parents'] = array_unique(array_merge($tree[$id][$link_id]['parents'], [$parent]));
- $tree[$id][$link_id]['parents'] = array_unique(array_merge($tree[$id][$link_id]['parents'], $tree[$id][$parent]['parents']));
- }
- else {
- $tree[$id][$link_id]['parents'] = [$id];
- }
- if (isset($link->subtree)) {
- $this->buildTree($id, $link->subtree, $tree);
- }
- }
- return $tree;
- }
-
- /**
- * @inheritdoc
- */
- public function getFields($entity_type, $bundle, $parents) {
- return ['menu' => 'Menu field'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []) {
- $element = $field;
- $menu_check = [];
- foreach ($element['link']['menu_parent']['#options'] as $id => $data) {
- // The menu value here prepends the menu name. Remove that.
- $parts = explode(':', $id);
- $menu = array_shift($parts);
- $sections = [implode(':', $parts)];
- // Remove unusable elements, except the existing parent.
- if ((!empty($element['link']['menu_parent']['#default_value']) && $id != $element['link']['menu_parent']['#default_value']) && empty($manager->checkTree($sections, $user_sections))) {
- unset($element['link']['menu_parent']['#options'][$id]);
- }
- // Check for the root menu item.
- if (!isset($menu_check[$menu]) && isset($element['link']['menu_parent']['#options'][$menu . ':'])) {
- if (empty($manager->checkTree([$menu], $user_sections))) {
- unset($element['link']['menu_parent']['#options'][$menu . ':']);
- }
- $menu_check[$menu] = TRUE;
- }
- }
- return $element;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getEntityValues(EntityInterface $entity, $field) {
- $values = [];
- $defaults = menu_ui_get_menu_link_defaults($entity);
- if (!empty($defaults['id'])) {
- $values = [$defaults['id']];
- }
- return $values;
- }
-
- /**
- * {inheritdoc}
- */
- public function disallowedOptions($field) {
- // On the menu form, we never remove an existing parent item, so there is
- // no concept of a disallowed option.
- return [];
- }
-
- /**
- * {inheritdoc}
- */
- public function getViewsJoin($table, $key, $alias = NULL) {
- if ($table == 'users') {
- $configuration['menu'] = [
- 'table' => 'user__' . WorkbenchAccessManagerInterface::FIELD_NAME,
- 'field' => 'entity_id',
- 'left_table' => $table,
- 'left_field' => $key,
- 'operator' => '=',
- 'table_alias' => WorkbenchAccessManagerInterface::FIELD_NAME,
- 'real_field' => WorkbenchAccessManagerInterface::FIELD_NAME . '_value',
- ];
- }
- else {
- $configuration['menu'] = [
- 'table' => 'menu_tree',
- 'field' => 'route_param_key',
- 'left_table' => $table,
- 'left_field' => $key,
- 'left_query' => "CONCAT('{$table}=', {$alias}.{$key})",
- 'operator' => '=',
- 'table_alias' => 'menu_tree',
- 'real_field' => 'id',
- ];
- }
- return $configuration;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Taxonomy.php b/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Taxonomy.php
deleted file mode 100644
index 2a0a573..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Taxonomy.php
+++ /dev/null
@@ -1,158 +0,0 @@
-tree)) {
- $parents = $this->config->get('parents');
- $tree = [];
- foreach ($parents as $id => $label) {
- if ($vocabulary = Vocabulary::load($id)) {
- $tree[$id][$id] = [
- 'label' => $vocabulary->label(),
- 'depth' => 0,
- 'parents' => [],
- 'weight' => 0,
- 'description' => $vocabulary->label(),
- ];
- // @TODO: It is possible that this will return a filtered set, if
- // term_access is applied to the query.
- $data = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadTree($id);
- $this->tree = $this->buildTree($id, $data, $tree);
- }
- }
- }
- return $this->tree;
- }
-
- /**
- * Traverses the taxonomy tree and builds parentage arrays.
- *
- * Note: this method is necessary to load all parents to the array.
- *
- * @param $id
- * The root id of the section tree.
- * @param array $data
- * An array of menu tree or subtree data.
- * @param array &$tree
- * The computed tree array to return.
- *
- * @return array $tree
- * The compiled tree data.
- */
- protected function buildTree($id, $data, &$tree) {
- foreach ($data as $term) {
- $tree[$id][$term->tid] = [
- 'id' => $term->tid,
- 'label' => $term->name,
- 'depth' => $term->depth + 1,
- 'parents' => $this->convertParents($term, $id), // @TODO: This doesn't return what we want.
- 'weight' => $term->weight,
- 'description' => $term->description__value, // @TODO: security
- ];
- foreach ($tree[$id][$term->tid]['parents'] as $key) {
- if (!empty($tree[$id][$key]['parents'])) {
- $tree[$id][$term->tid]['parents'] = array_unique(array_merge($tree[$id][$key]['parents'], $tree[$id][$term->tid]['parents']));
- }
- }
- }
- return $tree;
- }
-
- /**
- * Coverts the 0 parent id to a string.
- *
- * @param $term
- * The term to modify.
- * @param $id
- * The root parent id string.
- */
- private function convertParents($term, $id) {
- foreach ($term->parents as $pos => $parent) {
- if ($parent === 0 || $parent === '0') {
- $term->parents[$pos] = $id;
- }
- }
- return $term->parents;
- }
-
- /**
- * @inheritdoc
- */
- public function getFields($entity_type, $bundle, $parents) {
- $list = [];
- $query = \Drupal::entityQuery('field_config')
- ->condition('status', 1)
- ->condition('entity_type', $entity_type)
- ->condition('bundle', $bundle)
- ->condition('field_type', 'entity_reference')
- ->sort('label')
- ->execute();
- $fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadMultiple(array_keys($query));
- foreach ($fields as $id => $field) {
- $handler = $field->getSetting('handler');
- $settings = $field->getSetting('handler_settings');
- if (substr_count($handler, 'taxonomy_term') > 0) {
- foreach ($settings['target_bundles'] as $key => $target) {
- if (isset($parents[$key])) {
- $list[$field->getName()] = $field->label();
- }
- }
- }
- }
- return $list;
- }
-
- /**
- * {@inheritdoc}
- */
- public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []) {
- $element = $field;
- if (isset($element['widget']['#options'])) {
- foreach ($element['widget']['#options'] as $id => $data) {
- $sections = [$id];
- if (empty($manager->checkTree($sections, $user_sections))) {
- unset($element['widget']['#options'][$id]);
- }
- }
- }
- // Check for autocomplete fields. In this case, we replace the selection
- // handler with our own, which likely breaks Views-based handlers, but that
- // can be handled later. We swap out the default handler for our own, since
- // we don't have another way to filter the autocomplete results.
- // @TODO: test this against views-based handlers.
- // @see \Drupal\workbench_access\Plugin\EntityReferenceSelection\TaxonomyHierarchySelection
- else {
- foreach ($element['widget'] as $key => $item) {
- if (is_array($item) && isset($item['target_id']['#type']) && $item['target_id']['#type'] == 'entity_autocomplete') {
- $element['widget'][$key]['target_id']['#selection_handler'] = 'workbench_access:taxonomy_term';
- }
- }
- }
-
- return $element;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/Block/WorkbenchAccessBlock.php b/modules/workbench_access-8.x-1.x/src/Plugin/Block/WorkbenchAccessBlock.php
deleted file mode 100644
index 32ba10c..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/Block/WorkbenchAccessBlock.php
+++ /dev/null
@@ -1,60 +0,0 @@
-getParameter('node')) {
- $manager = \Drupal::service('plugin.manager.workbench_access.scheme');
- if ($scheme = $manager->getActiveScheme()) {
-
- if ($field = $scheme->fields('node', $node->getType())) {
- foreach ($scheme->getEntityValues($node, $field) as $value) {
- if ($element = $manager->getElement($value)) {
- // @TODO: This needs to be tested better.
- $build['#theme'] = 'item_list';
- $build['#items']['#title'] = $this->t('Editorial sections:');
- $build['#items'][] = $element['label'];
- $build['#plain_text'] = TRUE;
- }
- }
- }
- }
- }
- return $build;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function blockAccess(AccountInterface $account) {
- return AccessResult::allowedIfHasPermissions($account, ['administer workbench access', 'view workbench access information'], 'OR');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCacheContexts() {
- return ['url.path'];
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/TaxonomyHierarchySelection.php b/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/TaxonomyHierarchySelection.php
deleted file mode 100644
index ff4a982..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/TaxonomyHierarchySelection.php
+++ /dev/null
@@ -1,77 +0,0 @@
-entityManager->getBundleInfo('taxonomy_term');
- $handler_settings = $this->configuration['handler_settings'];
- $bundle_names = !empty($handler_settings['target_bundles']) ? $handler_settings['target_bundles'] : array_keys($bundles);
-
- foreach ($bundle_names as $bundle) {
- if ($vocabulary = Vocabulary::load($bundle)) {
- if ($terms = $this->entityManager->getStorage('taxonomy_term')->loadTree($vocabulary->id(), 0, NULL, TRUE)) {
- foreach ($terms as $term) {
- $options[$vocabulary->id()][$term->id()] = str_repeat('-', $term->depth) . Html::escape($this->entityManager->getTranslationFromContext($term)->label());
- }
- }
- }
- }
- }
- // Now, filter the options by permission.
- // If assigned to the top level or a superuser, no alteration.
- $account = \Drupal::currentUser();
- if ($account->hasPermission('bypass workbench access')) {
- return $options;
- }
- // Check each section for access.
- $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
- $user_sections = $user_section_storage->getUserSections($account->id());
- foreach ($options as $key => $values) {
- if ($manager->checkTree([$key], $user_sections)) {
- continue;
- }
- else {
- foreach ($values as $id => $value) {
- if (!$manager->checkTree([$id], $user_sections)) {
- unset($options[$key][$id]);
- }
- }
- }
- }
-
- return $options;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/UserFilteredSelection.php b/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/UserFilteredSelection.php
deleted file mode 100644
index 1286acc..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/UserFilteredSelection.php
+++ /dev/null
@@ -1,41 +0,0 @@
-configuration['handler_settings'];
-
- // Filter out the already referenced users.
- if (isset($handler_settings['filter']['section_id'])) {
- $id = $handler_settings['filter']['section_id'];
- $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
- $editors = $user_section_storage->getEditors($id);
- if (count($editors)) {
- $query->condition('uid', array_keys($editors), 'NOT IN');
- }
- }
-
- return $query;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/Section.php b/modules/workbench_access-8.x-1.x/src/Plugin/views/field/Section.php
deleted file mode 100644
index dae5af9..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/Section.php
+++ /dev/null
@@ -1,90 +0,0 @@
-additional_fields['nid'] = 'nid';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildOptionsForm(&$form, FormStateInterface $form_state) {
- parent::buildOptionsForm($form, $form_state);
- $form['separator'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Separator'),
- '#default_value' => $this->options['separator'],
- ];
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function defineOptions() {
- $options = parent::defineOptions();
- $options['separator'] = [
- 'default' => ', '
- ];
-
- return $options;
- }
-
- /**
- * {@inheritdoc}
- */
- public function query() {
- $this->ensureMyTable();
- $this->addAdditionalFields();
- }
-
- /**
- * {@inheritdoc}
- */
- public function render(ResultRow $values) {
- $nid = $this->getValue($values, 'nid');
- $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- if ($scheme = $manager->getActiveScheme()) {
- $node = \Drupal::entityTypeManager()->getStorage('node')->load($nid);
- $fields = $scheme->fields('node', $node->bundle());
- $sections = $scheme->getEntityValues($node, $fields);
- $tree = $manager->getActiveTree();
- foreach ($sections as $id) {
- foreach ($tree as $root => $data) {
- if (isset($data[$id])) {
- $output[] = $this->sanitizeValue($data[$id]['label']);
- }
- }
- }
- if (isset($output)) {
- return trim(implode($this->options['separator'], $output), $this->options['separator']);
- }
- }
- return '';
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/UserSection.php b/modules/workbench_access-8.x-1.x/src/Plugin/views/field/UserSection.php
deleted file mode 100644
index 16504e1..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/UserSection.php
+++ /dev/null
@@ -1,61 +0,0 @@
-additional_fields['uid'] = 'uid';
- }
-
- /**
- * {@inheritdoc}
- */
- public function render(ResultRow $values) {
- $uid = $this->getValue($values, 'uid');
- $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- if ($scheme = $manager->getActiveScheme()) {
- if ($manager->userInAll($uid)) {
- $sections = $manager->getAllSections(TRUE);
- }
- else {
- $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
- $sections = $user_section_storage->getUserSections($uid);
- }
- $output = [];
- $tree = $manager->getActiveTree();
- foreach ($sections as $id) {
- foreach ($tree as $root => $data) {
- if (isset($data[$id])) {
- $output[] = $this->sanitizeValue($data[$id]['label']);
- }
- }
- }
- return trim(implode($this->options['separator'], $output), $this->options['separator']);
- }
- return '';
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/views/filter/Section.php b/modules/workbench_access-8.x-1.x/src/Plugin/views/filter/Section.php
deleted file mode 100644
index 1b189cc..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/views/filter/Section.php
+++ /dev/null
@@ -1,229 +0,0 @@
-manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- $this->userSectionStorage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
- $this->scheme = $this->manager->getActiveScheme();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getValueOptions() {
- if (isset($this->valueOptions)) {
- return $this->valueOptions;
- }
- $this->valueOptions = [];
- if (!empty($this->scheme)) {
- if ($this->manager->userInAll()) {
- $list = $this->manager->getAllSections();
- }
- else {
- $list = $this->userSectionStorage->getUserSections();
- }
- foreach($list as $id) {
- if ($section = $this->manager->getElement($id)) {
- $this->valueOptions[$id] = str_repeat('-', $section['depth']) . ' ' . $section['label'];
- }
- }
- }
- return $this->valueOptions;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function defineOptions() {
- $options = parent::defineOptions();
-
- $options['operator']['default'] = 'in';
- $options['value']['default'] = ['All'];
- $options['expose']['contains']['reduce'] = ['default' => TRUE];
- $options['section_filter']['contains']['show_hierarchy'] = ['default' => TRUE];
-
- return $options;
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultExposeOptions() {
- parent::defaultExposeOptions();
- $this->options['expose']['reduce'] = TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- function operators() {
- $operators = [
- 'in' => [
- 'title' => $this->t('Is one of'),
- 'short' => $this->t('in'),
- 'short_single' => $this->t('='),
- 'method' => 'opSimple',
- 'values' => 1,
- ],
- 'not in' => [
- 'title' => $this->t('Is not one of'),
- 'short' => $this->t('not in'),
- 'short_single' => $this->t('<>'),
- 'method' => 'opSimple',
- 'values' => 1,
- ],
- ];
- return $operators;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildOptionsForm(&$form, FormStateInterface $form_state) {
- parent::buildOptionsForm($form, $form_state);
- $form['section_filter']['show_hierarchy'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('Show children'),
- '#default_value' => !empty($this->options['section_filter']['show_hierarchy']),
- '#description' => $this->t('If checked, the filter will return the selected item and all its children.'),
- ];
- }
-
- /**
- * {@inheritdoc}
- *
- * Check to see if input from the exposed filters should change
- * the behavior of this filter.
- *
- * We change this default behavior, since our "Any" result should be filtered
- * by the user's assignments.
- */
- public function acceptExposedInput($input) {
- if (empty($this->options['exposed'])) {
- return TRUE;
- }
-
- if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']) && isset($input[$this->options['expose']['operator_id']])) {
- $this->operator = $input[$this->options['expose']['operator_id']];
- }
-
- if (!empty($this->options['expose']['identifier'])) {
- $value = $input[$this->options['expose']['identifier']];
-
- // Various ways to check for the absence of non-required input.
- if (empty($this->options['expose']['required'])) {
- if (($this->operator == 'empty' || $this->operator == 'not empty') && $value === '') {
- $value = ' ';
- }
- }
-
- // We removed two clauses here that cause the filter to be ignored.
- if (isset($value)) {
- $this->value = $value;
- if (empty($this->alwaysMultiple) && empty($this->options['expose']['multiple']) && !is_array($value)) {
- $this->value = [$value];
- }
- }
- else {
- return FALSE;
- }
- }
-
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function query() {
- $helper = new ManyToOneHelper($this);
- // The 'All' selection must be filtered by user sections.
- if (empty($this->value) || strtolower(current($this->value)) == 'all') {
- if ($this->manager->userInAll()) {
- return;
- }
- else {
- // This method will get all user sections and children.
- $values = $this->userSectionStorage->getUserSections();
- }
- }
- if (!empty($this->table)) {
- $alias = $this->query->ensureTable($this->table);
- foreach ($this->scheme->getViewsJoin($this->table, $this->realField, $alias) as $configuration) {
- // Allow subquery JOINs, which Menu uses.
- $type = 'standard';
- if (isset($configuration['left_query'])) {
- $type = 'subquery';
- }
- $join = Views::pluginManager('join')->createInstance($type, $configuration);
- $this->tableAlias = $helper->addTable($join, $configuration['table_alias']);
- $this->realField = $configuration['real_field'];
- }
- // If 'All' was not selected, fetch the query values.
- if (!isset($values)) {
- if (!empty($this->options['section_filter']['show_hierarchy'])) {
- $values = $this->getChildren();
- }
- else {
- $values = $this->value;
- }
- }
- // If values, add our standard where clause.
- if (!empty($values)) {
- $this->scheme->addWhere($this, $values);
- }
- // Else add a failing where clause.
- else {
- $this->query->addWhere($this->options['group'], '1 = 0');
- }
- }
- }
-
- /**
- * Gets the child sections of a base section.
- *
- * @return array
- * An array of section ids that this user may see.
- */
- protected function getChildren() {
- $tree = $this->manager->getActiveTree();
- $children = [];
- foreach ($this->value as $id) {
- foreach ($tree as $key => $data) {
- if ($id == $key) {
- $children += array_keys($data);
- }
- else {
- foreach ($data as $iid => $item) {
- if ($iid == $id || in_array($id, $item['parents'])) {
- $children[] = $iid;
- }
- }
- }
- }
- }
- return $children;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/RoleSectionStorage.php b/modules/workbench_access-8.x-1.x/src/RoleSectionStorage.php
deleted file mode 100644
index f292fcc..0000000
--- a/modules/workbench_access-8.x-1.x/src/RoleSectionStorage.php
+++ /dev/null
@@ -1,161 +0,0 @@
-state = $state;
- $this->roleStorage = $entityTypeManager->getStorage('user_role');
- }
-
- /**
- * {@inheritdoc}
- */
- public function addRole($role_id, $sections = []) {
- $settings = $this->loadRoleSections($role_id);
- foreach ($sections as $id) {
- $settings[$id] = 1;
- }
- $this->saveRoleSections($role_id, $settings);
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeRole($role_id, $sections = []) {
- $settings = $this->loadRoleSections($role_id);
- foreach ($sections as $id) {
- if (isset($settings[$id])) {
- unset($settings[$id]);
- }
- }
- $this->saveRoleSections($role_id, $settings);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getRoleSections(AccountInterface $account) {
- $sections = [];
- foreach ($account->getRoles() as $rid) {
- $settings = $this->loadRoleSections($rid);
- $sections = array_merge($sections, array_keys($settings));
- }
- return $sections;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPotentialRoles($id) {
- $list = [];
- $roles = $this->roleStorage->loadMultiple();
- foreach ($roles as $rid => $role) {
- $list[$rid] = $role->label();
- }
- return $list;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPotentialRolesFiltered($id) {
- $list = [];
- $roles = $this->roleStorage->loadMultiple();
- foreach ($roles as $rid => $role) {
- if ($role->hasPermission('use workbench access')) {
- $list[$rid] = $role->label();
- }
- }
- return $list;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getRoles($id) {
- $list = [];
- $roles = $this->roleStorage->loadMultiple();
- foreach ($roles as $rid => $role) {
- $settings = $this->loadRoleSections($rid);
- if (!empty($settings[$id])) {
- $list[$rid] = $role->label();
- }
- }
- return $list;
- }
-
- /**
- * @inheritdoc
- */
- public function flushRoles() {
- $roles = $this->roleStorage->loadMultiple();
- foreach ($roles as $rid => $role) {
- $this->deleteRoleSections($rid);
- }
- // @TODO clear cache?
- }
-
-
- /**
- * Loads the saved role sections for a given role ID.
- *
- * @param string $role_id
- * The role ID.
- *
- * @return array
- * Sections for role.
- */
- protected function loadRoleSections($role_id) {
- return $this->state->get(self::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . $role_id, []);
- }
-
- /**
- * Saves the role sections for a given role ID.
- *
- * @param string $role_id
- * The role ID.
- * @param array $settings
- * Sections for the role.
- */
- protected function saveRoleSections($role_id, array $settings = []) {
- return $this->state->set(self::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . $role_id, $settings);
- }
-
- /**
- * Delete the saved sections for this role.
- *
- * @param string $rid
- * The role ID.
- */
- protected function deleteRoleSections($rid) {
- return $this->state->delete(self::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . $rid);
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/RoleSectionStorageInterface.php b/modules/workbench_access-8.x-1.x/src/RoleSectionStorageInterface.php
deleted file mode 100644
index d6b8fff..0000000
--- a/modules/workbench_access-8.x-1.x/src/RoleSectionStorageInterface.php
+++ /dev/null
@@ -1,89 +0,0 @@
-editor = $this->drupalCreateUser([
- 'access administration pages',
- 'administer content types',
- 'create page content',
- 'edit any page content',
- 'delete any page content',
- ]);
- $this->drupalLogin($this->editor);
- }
-
- /**
- * Test that the Workbench Access setting applies properly.
- */
- public function testWorkbenchAccessNodeTypeForm() {
- // The form text string to find.
- $string = 'Enable Workbench Access control for Basic page content.';
- // The form path.
- $path = 'admin/structure/types/manage/page';
-
- // Get the page content type settings.
- $this->drupalGet($path);
-
- // Workbench Access should not be visible.
- $this->assertNoText($string);
-
- // Set permission to 'administer workbench access'.
- user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, ['administer workbench access']);
-
- // Workbench Access should be visible.
- $this->drupalGet('admin/structure/types/manage/page');
- $this->assertText($string);
-
- // Test the setting on the entity.
- $type = entity_load('node_type', 'page');
- $status = $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0);
- $this->assertTrue($status === 0, 'Access control status is set to zero (off).');
-
- // Save the form.
- $edit['workbench_access_status'] = 1;
- $this->drupalPostForm($path, $edit, 'Save content type');
-
- // Test the setting on the entity.
- $type = entity_load('node_type', 'page');
- $status = $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0);
- $this->assertTrue($status == 1, 'Access control status is set to one (on).');
-
- }
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessTestBase.php b/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessTestBase.php
deleted file mode 100644
index da5a758..0000000
--- a/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessTestBase.php
+++ /dev/null
@@ -1,103 +0,0 @@
-drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
- $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
-
- // Install our base taxonomy.
- $this->installTaxonomy();
-
- // Install our base nodes for testing.
- $this->installNodes();
-
- // Install a base menu.
- $this->installMenu();
-
- // Instantiate the manager.
- $this->manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- $this->assertTrue(count($this->nodes) == 12, '12 nodes created');
- $tree = $this->manager->getActiveTree();
- $this->assertTrue(count($tree['workbench_access']) == 13, 'Access tree has 13 items');
- }
-
- /**
- * Loads and installs the test taxonomy from drush.
- */
- protected function installTaxonomy() {
- // This creates 12 taxonomy terms.
- $file = DRUPAL_ROOT . '/' . drupal_get_path('module', 'workbench_access') . "/workbench_access.drush.inc";
- require_once $file;
- drush_workbench_access_test();
- }
-
- /**
- * Loads and installs the test menu.
- */
- protected function installMenu() {
- // We have 12 nodes. They should mirror the taxonomy tree.
- // @TODO.
- }
-
- protected function installNodes() {
- // Create nine nodes, each assigned to a taxonomy term.
- // Terms 11 and 12 will have no assignees.
- for ($i = 1; $i <= 10; $i++) {
- $this->nodes[] = $this->drupalCreateNode([
- 'type' => 'article',
- WorkbenchAccessManagerInterface::FIELD_NAME => [$i],
- ]);
- }
- // Create two page nodes for testing.
- for ($i = 1; $i <= 2; $i++) {
- $this->nodes[] = $this->drupalCreateNode([
- 'type' => 'page',
- ]);
- }
- }
-
- protected function setTaxonomyScheme() {
- // @TODO: switch to taxonomy scheme.
- }
-
- protected function setMenuScheme() {
- // @TODO: switch to menu scheme.
- }
-
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php b/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php
deleted file mode 100644
index 5e0c5ce..0000000
--- a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php
+++ /dev/null
@@ -1,174 +0,0 @@
-userStorage = $entityTypeManager->getStorage('user');
- $this->currentUser = $currentUser;
- $this->roleSectionStorage = $role_section_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getUserSections($uid = NULL, $add_roles = TRUE) {
- // Get the information from the account.
- if (is_null($uid)) {
- $uid = $this->currentUser->id();
- }
- if (!isset($this->userSectionCache[$uid])) {
- $user_sections = [];
- $user = $this->userStorage->load($uid);
- $sections = $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue();
- foreach ($sections as $data) {
- $user_sections[] = $data['value'];
- }
- // Merge in role data.
- if ($add_roles) {
- $user_sections = array_merge($user_sections, $this->roleSectionStorage->getRoleSections($user));
- }
-
- $this->userSectionCache[$uid] = array_unique($user_sections);
- }
- return $this->userSectionCache[$uid];
-
- }
-
-
- /**
- * {@inheritdoc}
- */
- public function addUser($user_id, $sections = []) {
- $entity = $this->userStorage->load($user_id);
- $values = $this->getUserSections($user_id, FALSE);
- $new = array_merge($values, $sections);
- $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, $new);
- $entity->save();
- $this->userSectionCache[$user_id] = $new;
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeUser($user_id, $sections = []) {
- $entity = $this->userStorage->load($user_id);
- $values = $this->getUserSections($user_id, FALSE);
- $new = array_flip($values);
- foreach ($sections as $id) {
- unset($new[$id]);
- }
- $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, array_keys($new));
- $entity->save();
- $this->userSectionCache[$user_id] = array_keys($new);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getEditors($id) {
- $users = $this->userStorage->getQuery()
- ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, $id)
- ->condition('status', 1)
- ->sort('name')
- ->execute();
- return $this->filterByPermission($users);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPotentialEditors($id) {
- $query = $this->userStorage->getQuery();
- $users = $query
- ->condition('status', 1)
- ->sort('name')
- ->execute();
- return $this->filterByPermission($users);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPotentialEditorsRoles($id) {
- return $this->roleSectionStorage->getPotentialRolesFiltered($id);
- }
-
- /**
- * @inheritdoc
- */
- public function flushUsers() {
- // We might want to use purgeFieldData() or similar for this, but the data
- // is currently not revisioned, so a simple table flush will do. Wrap the
- // statement in a try/catch just in case it isn't portable.
- try {
- $database = \Drupal::getContainer()->get('database');
- $database->truncate('user__' . WorkbenchAccessManagerInterface::FIELD_NAME)->execute();
- }
- catch (\Exception $e) {
- // @todo return FALSE instead here, let UI handle it.
- drupal_set_message($this->t('Failed to delete user assignments.'));
- }
- // @TODO clear cache?
- }
-
- /**
- * {@inheritdoc}
- */
- protected function filterByPermission($users = []) {
- $list = [];
- $entities = $this->userStorage->loadMultiple($users);
- foreach ($entities as $account) {
- if ($account->hasPermission('use workbench access')) {
- $list[$account->id()] = $account->label();
- }
- }
- return $list;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php.orig b/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php.orig
deleted file mode 100644
index 84f32c6..0000000
--- a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php.orig
+++ /dev/null
@@ -1,176 +0,0 @@
-userStorage = $entityTypeManager->getStorage('user');
- $this->currentUser = $currentUser;
- $this->roleSectionStorage = $role_section_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getUserSections($uid = NULL, $add_roles = TRUE) {
- // Get the information from the account.
- if (is_null($uid)) {
- $uid = $this->currentUser->id();
- }
- if (!isset($this->userSectionCache[$uid])) {
- $user_sections = [];
- $user = $this->userStorage->load($uid);
- $sections = $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue();
- foreach ($sections as $data) {
- $user_sections[] = $data['value'];
- }
- // Merge in role data.
- if ($add_roles) {
- $user_sections = array_merge($user_sections, $this->roleSectionStorage->getRoleSections($user));
- }
-
- $this->userSectionCache[$uid] = array_unique($user_sections);
- }
- return $this->userSectionCache[$uid];
-
- }
-
-
- /**
- * {@inheritdoc}
- */
- public function addUser($user_id, $sections = []) {
- $entity = $this->userStorage->load($user_id);
- $values = $this->getUserSections($user_id, FALSE);
- $new = array_merge($values, $sections);
- $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, $new);
- $entity->save();
- $this->userSectionCache[$user_id] = $new;
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeUser($user_id, $sections = []) {
- $entity = $this->userStorage->load($user_id);
- $values = $this->getUserSections($user_id, FALSE);
- $new = array_flip($values);
- foreach ($sections as $id) {
- unset($new[$id]);
- }
- $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, array_keys($new));
- $entity->save();
- $this->userSectionCache[$user_id] = array_keys($new);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getEditors($id) {
- $users = $this->userStorage->getQuery()
- ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, $id)
- ->condition('status', 1)
- ->sort('name')
- ->execute();
- return $this->filterByPermission($users);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPotentialEditors($id) {
- $query = $this->userStorage->getQuery();
- // For right now, we just show all possible users. If we switch to using
- // an autocomplete form, then we may change back to the filtered query.
- /*
- $query->condition($query->orConditionGroup()
- ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, $id, '<>')
- ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, NULL, 'IS NULL'))
- ->condition('status', 1);
- $users = $query->execute();
- */
- $users = $query
- ->condition('status', 1)
- ->sort('name')
- ->execute();
- return $this->filterByPermission($users);
- }
-
- /**
- * @inheritdoc
- */
- public function flushUsers() {
- // We might want to use purgeFieldData() or similar for this, but the data
- // is currently not revisioned, so a simple table flush will do. Wrap the
- // statement in a try/catch just in case it isn't portable.
- try {
- $database = \Drupal::getContainer()->get('database');
- $database->truncate('user__' . WorkbenchAccessManagerInterface::FIELD_NAME)->execute();
- }
- catch (\Exception $e) {
- // @todo return FALSE instead here, let UI handle it.
- drupal_set_message($this->t('Failed to delete user assignments.'));
- }
- // @TODO clear cache?
- }
-
- /**
- * {@inheritdoc}
- */
- protected function filterByPermission($users = []) {
- $list = [];
- $entities = $this->userStorage->loadMultiple($users);
- foreach ($entities as $account) {
- if ($account->hasPermission('use workbench access')) {
- $list[$account->id()] = $account->label();
- }
- }
- return $list;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/UserSectionStorageInterface.php b/modules/workbench_access-8.x-1.x/src/UserSectionStorageInterface.php
deleted file mode 100644
index 79ebaf7..0000000
--- a/modules/workbench_access-8.x-1.x/src/UserSectionStorageInterface.php
+++ /dev/null
@@ -1,88 +0,0 @@
-alterInfo('workbench_access_info');
- $this->setCacheBackend($cache_backend, 'workbench_access_plugins');
- $this->moduleHandler = $module_handler;
- $this->namespaces = $namespaces;
- $this->userSectionStorage = $user_section_storage;
- $this->configFactory = $configFactory;
- $this->currentUser = $currentUser;
- $this->entityTypeManager = $entityTypeManager;
- $this->roleSectionStorage = $role_section_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSchemes() {
- $schemes = [];
- $definitions = $this->getDefinitions();
-
- foreach ($definitions as $id => $info) {
- if ($this->moduleHandler->moduleExists($info['module'])) {
- $schemes[$id] = (string) $info['label'];
- }
- }
-
- return $schemes;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getScheme($id) {
- try {
- return $this->createInstance($id);
- }
- catch (PluginNotFoundException $e) {
- return FALSE;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getActiveScheme() {
- if ($scheme_id = $this->configFactory->get('workbench_access.settings')->get('scheme')) {
- return $this->getScheme($scheme_id);
- }
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getActiveTree() {
- if (!isset($this->tree)) {
- if ($scheme = $this->getActiveScheme()) {
- $this->tree = $scheme->getTree();
- }
- }
- return $this->tree;
- }
-
- /**
- * {@inheritdoc}
- */
- public function resetTree() {
- unset($this->tree);
- if ($scheme = $this->getActiveScheme()) {
- $scheme->resetTree();
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getElement($id) {
- if ($scheme = $this->getActiveScheme()) {
- return $scheme->load($id);
- }
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function getDefaultValue() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function addEntity($entity_id, $entity_type, $sections = []) {
-
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeEntity($entity_id, $entity_type, $sections = []) {
-
- }
-
- /**
- * {@inheritdoc}
- */
- public function checkTree($entity_sections, $user_sections) {
- $tree = $this->getActiveTree();
- $list = array_flip($user_sections);
- foreach ($entity_sections as $section) {
- // Simple check first: is there an exact match?
- if (isset($list[$section])) {
- return TRUE;
- }
- // Check for section on the tree.
- foreach ($tree as $id => $info) {
- if (isset($list[$section]) && isset($info[$section])) {
- return TRUE;
- }
- // Recursive check for parents.
- if (!empty($info[$section]['parents'])) {
- $parents = array_flip($info[$section]['parents']);
- // Check for parents.
- foreach ($list as $uid => $data) {
- if (isset($parents[$uid])) {
- return TRUE;
- }
- }
- }
- }
- }
- return FALSE;
- }
-
- /**
- * @inheritdoc
- */
- public function flushFields() {
- // Flush the field settings.
- $node_types = $this->entityTypeManager->getStorage('node_type')->loadMultiple();
- foreach ($node_types as $id => $type) {
- $type->setThirdPartySetting('workbench_access', 'workbench_access_status', 0);
- $type->save();
- $fields['node'][$id] = '';
- }
- $this->configFactory->getEditable('workbench_access.settings')
- ->set('fields', $fields)
- ->save();
- drupal_set_message($this->t('Field settings reset.'));
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\RoleSectionStorage::addRole() instead
- */
- public function addRole($role_id, $sections = []) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- $this->roleSectionStorage->addRole($role_id, $sections);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\RoleSectionStorage::removeRole() instead
- */
- public function removeRole($role_id, $sections = []) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- $this->roleSectionStorage->removeRole($role_id, $sections);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\RoleSectionStorage::getRoles() instead
- */
- public function getRoles($id) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- $this->roleSectionStorage->getRoles($id);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\RoleSectionStorage::flushRoles() instead
- */
- public function flushRoles() {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- $this->roleSectionStorage->flushRoles();
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\UserSectionStorage::addUser() instead
- */
- public function addUser($user_id, $sections = []) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- $this->userSectionStorage->addUser($user_id, $sections);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\UserSectionStorage::removeUser() instead
- */
- public function removeUser($user_id, $sections = []) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- $this->userSectionStorage->removeUser($user_id, $sections);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\UserSectionStorage::getEditors() instead
- */
- public function getEditors($id) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- return $this->userSectionStorage->getEditors($id);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\UserSectionStorage::getPotentialEditors() instead
- */
- public function getPotentialEditors($id) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- return $this->userSectionStorage->getPotentialEditors($id);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\UserSectionStorage::getPotentialEditorsRoles() instead
- */
- public function getPotentialEditorsRoles($id) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- return $this->userSectionStorage->getPotentialEditorsRoles($id);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\UserSectionStorage::getUserSections() instead
- */
- public function getUserSections($uid = NULL, $add_roles = TRUE) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- return $this->userSectionStorage->getUserSections($uid, $add_roles);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\UserSectionStorage::flushUsers() instead
- */
- public function flushUsers() {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- $this->userSectionStorage->flushUsers();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAllSections($root_only = FALSE) {
- $sections = [];
- foreach ($this->getActiveTree() as $root => $item) {
- if ($root_only) {
- $sections[] = $root;
- }
- else {
- foreach ($item as $id => $data) {
- $sections[] = $id;
- }
- }
- }
- return $sections;
- }
-
- /**
- * {@inheritdoc}
- */
- public function userInAll($uid = NULL) {
- // Get the information from the account.
- if (is_null($uid)) {
- $uid = $this->currentUser->id();
- }
- $user = $this->entityTypeManager->getStorage('user')->load($uid);
- if ($user->hasPermission('bypass workbench access')) {
- return TRUE;
- }
- else {
- // If the user is assigned to all the top-level sections, treat as admin.
- $user_sections = $this->userSectionStorage->getUserSections($uid);
- foreach (array_keys($this->getActiveTree()) as $root) {
- if (empty($user_sections[$root])) {
- return FALSE;
- }
- }
- }
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\RoleSectionStorage::getRoleSections() instead
- */
- public function getRoleSections(AccountInterface $account) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- return $this->roleSectionStorage->getRoleSections($account);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\RoleSectionStorage::getPotentialRoles() instead
- */
- public function getPotentialRoles($id) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- return $this->roleSectionStorage->getPotentialRoles($id);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated To be removed before 8.x-1.0 - use
- * \Drupal\workbench_access\RoleSectionStorage::getPotentialRolesFiltered() instead
- */
- public function getPotentialRolesFiltered($id) {
- trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
- return $this->roleSectionStorage->getPotentialRolesFiltered($id);
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManagerInterface.php b/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManagerInterface.php
deleted file mode 100644
index a055a7c..0000000
--- a/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManagerInterface.php
+++ /dev/null
@@ -1,154 +0,0 @@
- 'User'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []) {
- return $field;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/Derivative/DerivedAccessControlPlugins.php b/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/Derivative/DerivedAccessControlPlugins.php
deleted file mode 100644
index df12a39..0000000
--- a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/Derivative/DerivedAccessControlPlugins.php
+++ /dev/null
@@ -1,25 +0,0 @@
-derivatives = [];
- foreach (['foo', 'bar'] as $plugin_id) {
- $this->derivatives[$plugin_id] = [
- 'label' => sprintf('Plugin for %s', $plugin_id),
- ] + $base_plugin_definition;
- }
- return $this->derivatives;
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/workbench_access_test.info.yml b/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/workbench_access_test.info.yml
deleted file mode 100644
index b157261..0000000
--- a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/workbench_access_test.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: Workbench access test
-description: Test code for workbench access
-type: module
-core: 8.x
-hidden: true
-dependencies:
- - workbench_access
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByRoleFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByRoleFormTest.php
deleted file mode 100644
index 53c9892..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByRoleFormTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-assertSession();
- $page = $this->getSession()->getPage();
-
- // Set up a content type, taxonomy field, and taxonomy scheme.
- $node_type = $this->setUpContentType();
- $vocab = $this->setUpVocabulary();
- $this->setUpTaxonomyField($node_type, $vocab);
- $this->setUpTaxonomyScheme($node_type, $vocab);
-
- // Set up some roles and terms for this test.
- // Create terms and roles.
- $staff_term = Term::create([
- 'vid' => $vocab->id(),
- 'name' => 'Staff',
- ]);
- $staff_term->save();
-
- $this->createRole([], 'non_staff', 'Non staff');
- $this->createRole(['use workbench access'], 'staff', 'Staff');
- $this->createRole(['use workbench access'], 'super_staff', 'Super staff');
-
- $this->drupalLogin($this->setUpAdminUser());
- $this->drupalGet(sprintf('/admin/config/workflow/workbench_access/sections/%s/roles', $staff_term->id()));
-
- $editors = $page->findField('edit-editors');
- $web_assert->fieldNotExists('Non staff', $editors);
- $web_assert->fieldExists('Staff', $editors);
- $web_assert->fieldExists('Super staff', $editors);
-
- $page->checkField('Staff');
- $page->pressButton('Submit');
- $expected = [$staff_term->id() => 1];
- $this->assertEquals($expected, \Drupal::state()->get(RoleSectionStorageInterface::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . 'staff', []));
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByUserFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByUserFormTest.php
deleted file mode 100644
index 62884f6..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByUserFormTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-assertSession();
- $page = $this->getSession()->getPage();
-
- $node_type = $this->setUpContentType();
- $vocab = $this->setUpVocabulary();
- $this->setUpTaxonomyField($node_type, $vocab);
- $this->setUpTaxonomyScheme($node_type, $vocab);
-
- // Set up some roles and terms for this test.
- $staff_term = Term::create([
- 'vid' => $vocab->id(),
- 'name' => 'Staff',
- ]);
- $staff_term->save();
-
- $non_staff_rid = $this->createRole([], 'non_staff');
- $staff_rid = $this->createRole(['use workbench access'], 'staff');
-
- $user1 = $this->createUserWithRole($non_staff_rid);
- $user2 = $this->createUserWithRole($staff_rid);
- $user3 = $this->createUserWithRole($staff_rid);
- $user4 = $this->createUserWithRole($staff_rid);
-
- $this->drupalLogin($this->setUpAdminUser());
- $this->drupalGet(sprintf('/admin/config/workflow/workbench_access/sections/%s/users', $staff_term->id()));
-
- // Add a user from staff with autocomplete.
- $page->fillField('edit-editors-add', $user2->label() . ' (' . $user2->id() . ')');
- $page->pressButton('add');
-
- // Check remove editors list.
- $editors = $page->findField('editors_remove');
- $web_assert->fieldNotExists('editors_remove[' . $user1->id() . ']', $editors);
- $web_assert->fieldExists('editors_remove[' . $user2->id() . ']', $editors);
-
- // Test remove the user.
- $page->checkField('editors_remove[' . $user2->id() . ']');
- $page->pressButton('remove');
-
- // Check user has been removed to the section.
- $editors = $page->findField('editors_remove');
- $web_assert->fieldNotExists('editors_remove[' . $user2->id() . ']', $editors);
-
- // Test adding users with the textarea, mixed username and uid.
- $page->fillField('edit-editors-add-mass', $user3->label() . ', ' . $user4->id());
- $page->pressButton('add');
-
- $editors = $page->findField('editors_remove');
- $web_assert->fieldExists('editors_remove[' . $user3->id() . ']', $editors);
- $web_assert->fieldExists('editors_remove[' . $user4->id() . ']', $editors);
-
- // Check user is not or removed to the section.
- $user = User::load($user1->id());
- $expected = [['value' => $staff_term->id()]];
- $this->assertNotEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
-
- $user = User::load($user2->id());
- $expected = [['value' => $staff_term->id()]];
- $this->assertNotEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
-
- // Check user has been added to the section.
- $user = User::load($user3->id());
- $expected = [['value' => $staff_term->id()]];
- $this->assertEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
-
- $user = User::load($user4->id());
- $expected = [['value' => $staff_term->id()]];
- $this->assertEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/ConfigFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/ConfigFormTest.php
deleted file mode 100644
index cc735d3..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/ConfigFormTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-drupalLogin($this->createUser([], NULL, TRUE));
- }
-
- /**
- * Tests the config form.
- */
- public function testConfigFormSubmit() {
- $assert = $this->assertSession();
- $this->drupalGet('admin/config/workflow/workbench_access');
- $assert->statusCodeEquals(200);
- // Check the two schemes exist.
- $page = $this->getSession()->getPage();
- $menu_field = $page->find('css', 'input[name=scheme][value=menu]');
- $this->assertNotNull($menu_field);
- $this->assertNotNull($page->find('css', 'input[name=scheme][value=taxonomy]'));
- $page->fillField('scheme', $menu_field->getAttribute('value'));
- $this->submitForm([], 'Save configuration');
- $assert->statusCodeEquals(200);
- $scheme = $this->container->get('plugin.manager.workbench_access.scheme')->getActiveScheme();
- $this->assertEquals('menu', $scheme->id());
- // Set some parents
- $page->checkField('menu[admin]');
- $this->submitForm([], 'Save configuration');
- $assert->checkboxChecked('menu[admin]');
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/NodeFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/NodeFormTest.php
deleted file mode 100644
index c3940ee..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/NodeFormTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-setUpContentType();
- $vocab = $this->setUpVocabulary();
- $this->setUpTaxonomyField($node_type, $vocab);
- $this->setUpTaxonomyScheme($node_type, $vocab);
- // Set up an editor and log in as them.
- $editor = $this->setUpEditorUser();
- $this->drupalLogin($editor);
-
- // Set up some roles and terms for this test.
- // Create terms and roles.
- $staff_term = Term::create([
- 'vid' => $vocab->id(),
- 'name' => 'Staff',
- ]);
- $staff_term->save();
- $super_staff_term = Term::create([
- 'vid' => $vocab->id(),
- 'name' => 'Super staff',
- ]);
- $super_staff_term->save();
- $base_term = Term::create([
- 'vid' => $vocab->id(),
- 'name' => 'Editor',
- ]);
- $base_term->save();
- $editor->{WORKBENCH_ACCESS_FIELD} = $base_term->id();
- $editor->save();
-
- $staff_rid = $this->createRole([], 'staff');
- $super_staff_rid = $this->createRole([], 'super_staff');
- // Set the role -> term mapping.
- \Drupal::state()->set('workbench_access_roles_' . $staff_rid, [$staff_term->id() => 1]);
- \Drupal::state()->set('workbench_access_roles_' . $super_staff_rid, [$super_staff_term->id() => 1]);
-
- $web_assert = $this->assertSession();
- $this->drupalGet('node/add/page');
-
- // Assert we can't see the options yet.
- $web_assert->optionNotExists(WorkbenchAccessManagerInterface::FIELD_NAME, $staff_term->getName());
- $web_assert->optionNotExists(WorkbenchAccessManagerInterface::FIELD_NAME, $super_staff_term->getName());
-
- // Add the staff role and check the option exists.
- $editor->addRole($staff_rid);
- $editor->save();
- $this->drupalGet('node/add/page');
- $web_assert->optionExists(WorkbenchAccessManagerInterface::FIELD_NAME, $staff_term->getName());
-
- // Add the super staff role and check both options exist.
- $editor->addRole($super_staff_rid);
- $editor->save();
- $this->drupalGet('node/add/page');
- $web_assert->optionExists(WorkbenchAccessManagerInterface::FIELD_NAME, $staff_term->getName());
- $web_assert->optionExists(WorkbenchAccessManagerInterface::FIELD_NAME, $super_staff_term->getName());
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/WorkbenchAccessTestTrait.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/WorkbenchAccessTestTrait.php
deleted file mode 100644
index 5161565..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/WorkbenchAccessTestTrait.php
+++ /dev/null
@@ -1,145 +0,0 @@
-createContentType(['type' => 'page']);
- $node_type->setThirdPartySetting('workbench_access', 'workbench_access_status', 1);
- $node_type->save();
-
- return $node_type;
- }
-
- /**
- * Create a test vocabulary.
- *
- * @return \Drupal\taxonomy\Entity\Vocabulary
- * The vocabulary entity.
- */
- public function setUpVocabulary() {
- $vocab = Vocabulary::create(['vid' => 'workbench_access', 'name' => 'Access']);
- $vocab->save();
- return $vocab;
- }
-
- /**
- * Sets up an access taxonomy field for a given vocab on a given node type.
- *
- * @param \Drupal\node\Entity\NodeType $node_type
- * The node type to create the field on.
- * @param \Drupal\taxonomy\Entity\Vocabulary $vocab
- * The vocab to create the field against.
- */
- public function setUpTaxonomyField(NodeType $node_type, Vocabulary $vocab) {
- // Create workbench access storage for node.
- $field_storage = FieldStorageConfig::create([
- 'field_name' => WorkbenchAccessManagerInterface::FIELD_NAME,
- 'entity_type' => 'node',
- 'type' => 'entity_reference',
- 'cardinality' => 1,
- 'settings' => [
- 'target_type' => 'taxonomy_term',
- ],
- ]);
- $field_storage->save();
- // Create an instance of the access field on the content type.
- FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => $node_type->id(),
- 'settings' => [
- 'handler' => 'workbench_access:taxonomy_term',
- 'handler_settings' => [
- 'target_bundles' => [
- $vocab->id() => $vocab->id(),
- ],
- ],
- ],
- ])->save();
- // Set the field to display as a dropdown on the form.
- $form_display = EntityFormDisplay::load('node.' . $node_type->id() . '.default');
- $form_display->setComponent(WorkbenchAccessManagerInterface::FIELD_NAME, ['type' => 'options_select']);
- $form_display->save();
- }
-
- /**
- * Sets up a user with an editor role that has access to content.
- *
- * @return \Drupal\user\Entity\User
- * The user entity.
- */
- public function setUpEditorUser() {
- $editor_rid = $this->createRole([
- 'access administration pages',
- 'create page content',
- 'edit any page content',
- 'delete any page content',
- ], 'editor');
-
- return $this->createUserWithRole($editor_rid);
- }
-
- /**
- * Sets up a user with an editor role that has access to content.
- *
- * @return \Drupal\user\Entity\User
- * The user entity.
- */
- protected function setUpAdminUser() {
- $admin_rid = $this->createRole([
- 'access administration pages',
- 'assign workbench access',
- ], 'admin');
-
- return $this->createUserWithRole($admin_rid);
- }
-
- /**
- * Sets up a user with a given role and saves it.
- *
- * @param string $rid
- * The role id.
- *
- * @return \Drupal\user\Entity\User
- * The user entity.
- */
- protected function createUserWithRole($rid) {
- $user = $this->createUser();
- $user->addRole($rid);
- $user->save();
- return $user;
- }
-
- /**
- * Sets up a taxonomy scheme for a given node type.
- *
- * @param \Drupal\taxonomy\Entity\Vocabulary $vocab
- * The vocab to use for the scheme.
- */
- public function setUpTaxonomyScheme(NodeType $node_type, Vocabulary $vocab) {
- $config = \Drupal::configFactory()->getEditable('workbench_access.settings');
- $config->set('scheme', 'taxonomy');
- $config->set('parents', [$vocab->id() => $vocab->id()]);
- $fields['node'][$node_type->id()] = WorkbenchAccessManagerInterface::FIELD_NAME;
- $config->set('fields', $fields);
- $config->save();
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Kernel/NodeAccessTest.php b/modules/workbench_access-8.x-1.x/tests/src/Kernel/NodeAccessTest.php
deleted file mode 100644
index 0f3936f..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Kernel/NodeAccessTest.php
+++ /dev/null
@@ -1,157 +0,0 @@
-installEntitySchema('node');
- $this->installConfig(['filter', 'node', 'workbench_access']);
- $this->installEntitySchema('user');
- $this->installEntitySchema('taxonomy_term');
- $this->installSchema('system', ['key_value', 'sequences']);
- module_load_install('workbench_access');
- workbench_access_install();
- $node_type = $this->setUpContentType();
- $this->vocabulary = $this->setUpVocabulary();
- $this->accessHandler = $this->container->get('entity_type.manager')
- ->getAccessControlHandler('node');
- $this->setUpTaxonomyField($node_type, $this->vocabulary);
- $this->setUpTaxonomyScheme($node_type, $this->vocabulary);
- }
-
- /**
- * Test create access integration.
- */
- public function testCreateAccess() {
- // The first user in a kernel test gets UID 1, so we need to make sure we're
- // not testing with that user.
- $this->createUser();
- // Create a section.
- $term = Term::create([
- 'vid' => $this->vocabulary->id(),
- 'name' => 'Some section',
- ]);
- $term->save();
- // Create two users with equal permissions but assign one of them to the
- // section.
- $permissions = [
- 'create page content',
- 'edit any page content',
- 'access content',
- 'delete any page content',
- 'administer nodes',
- ];
- $allowed_editor = $this->createUser($permissions);
- $allowed_editor->{WorkbenchAccessManagerInterface::FIELD_NAME} = $term->id();
- $allowed_editor->save();
- $editor_with_no_access = $this->createUser($permissions);
- $permissions[] = 'bypass workbench access';
- $editor_with_bypass_access = $this->createUser($permissions);
-
- $this->assertTrue($this->accessHandler->createAccess('page', $allowed_editor));
- $this->assertFalse($this->accessHandler->createAccess('page', $editor_with_no_access));
- $this->assertTrue($this->accessHandler->createAccess('page', $editor_with_bypass_access));
- }
-
- /**
- * Test edit access integration.
- */
- public function testEditAccess() {
- // The first user in a kernel test gets UID 1, so we need to make sure we're
- // not testing with that user.
- $this->createUser();
- // Create a section.
- $term = Term::create([
- 'vid' => $this->vocabulary->id(),
- 'name' => 'Some section',
- ]);
- $term->save();
- // Create two users with equal permissions but assign one of them to the
- // section.
- $permissions = [
- 'create page content',
- 'edit any page content',
- 'access content',
- 'delete any page content',
- ];
- $allowed_editor = $this->createUser($permissions);
- $allowed_editor->{WorkbenchAccessManagerInterface::FIELD_NAME} = $term->id();
- $allowed_editor->save();
- $editor_with_no_access = $this->createUser($permissions);
-
- // Test a node that is not assigned to a section. Both should be allowed because we
- // do not assert access control by default.
- $node1 = $this->createNode(['type' => 'page', 'title' => 'foo']);
- $this->assertTrue($this->accessHandler->access($node1, 'update', $allowed_editor));
- $this->assertTrue($this->accessHandler->access($node1, 'update', $editor_with_no_access));
-
- // Create a node that is assigned to a section.
- $node2 = $this->createNode(['type' => 'page', 'title' => 'bar', WorkbenchAccessManagerInterface::FIELD_NAME => $term->id()]);
- $this->assertTrue($this->accessHandler->access($node2, 'update', $allowed_editor));
- $this->assertFalse($this->accessHandler->access($node2, 'update', $editor_with_no_access));
-
- // With strict checking, nodes that are not assigned to a section return false.
- $this->config('workbench_access.settings')
- ->set('deny_on_empty', 1)
- ->save();
-
- // Test a new node because the results for $node1 are cached.
- $node3 = $this->createNode(['type' => 'page', 'title' => 'baz']);
- $this->assertFalse($this->accessHandler->access($node3, 'update', $allowed_editor));
- $this->assertFalse($this->accessHandler->access($node3, 'update', $editor_with_no_access));
-
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Kernel/SectionCacheTest.php b/modules/workbench_access-8.x-1.x/tests/src/Kernel/SectionCacheTest.php
deleted file mode 100644
index b61909a..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Kernel/SectionCacheTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-installConfig(['workbench_access']);
- $this->installEntitySchema('user');
- $this->installEntitySchema('taxonomy_term');
- $this->installSchema('system', ['key_value', 'sequences']);
- module_load_install('workbench_access');
- workbench_access_install();
- $this->vocabulary = $this->setUpVocabulary();
- // The user section storage service.
- $this->userSectionStorage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
- }
-
- /**
- * Test create access integration.
- */
- public function testSectionCache() {
- // The first user in a kernel test gets UID 1, so we need to make sure we're
- // not testing with that user.
- $this->createUser();
- // Create a section.
- $term = Term::create([
- 'vid' => $this->vocabulary->id(),
- 'name' => 'Some section',
- ]);
- $term->save();
- // Create one user and assign to the section.
- $permissions = [
- 'use workbench access'
- ];
- $editor = $this->createUser($permissions);
- $editor->{WorkbenchAccessManagerInterface::FIELD_NAME} = $term->id();
- $editor->save();
-
- // Now fetch the sections for this user. Count should be 1.
- $sections = $this->userSectionStorage->getUserSections($editor->id());
- $this->assertTrue(count($sections) == 1);
-
- // Create a new section.
- $term2 = Term::create([
- 'vid' => $this->vocabulary->id(),
- 'name' => 'Some new section',
- ]);
- $term2->save();
-
- // Add to the user.
- $this->userSectionStorage->addUser($editor->id(), [$term2->id()]);
-
- // Now fetch the sections for this user. Count should be 2.
- $sections = $this->userSectionStorage->getUserSections($editor->id());
- $this->assertTrue(count($sections) == 2);
-
- // Now remove and test again.
- $this->userSectionStorage->removeUser($editor->id(), [$term2->id()]);
- $sections = $this->userSectionStorage->getUserSections($editor->id());
- $this->assertTrue(count($sections) == 1);
-
- }
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Kernel/WorkbenchAccessDerivativeDiscoveryTest.php b/modules/workbench_access-8.x-1.x/tests/src/Kernel/WorkbenchAccessDerivativeDiscoveryTest.php
deleted file mode 100644
index a05fba5..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Kernel/WorkbenchAccessDerivativeDiscoveryTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-installEntitySchema('entity_test');
- }
-
- /**
- * Tests that derivative plugins work.
- */
- public function testDerivativeDiscovery() {
- $manager = $this->container->get('plugin.manager.workbench_access.scheme');
- foreach ($manager->getSchemes() as $id => $name) {
- $this->assertNotNull($manager->createInstance($id));
- }
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Unit/UserSectionStorageUnitTest.php b/modules/workbench_access-8.x-1.x/tests/src/Unit/UserSectionStorageUnitTest.php
deleted file mode 100644
index 08ea073..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Unit/UserSectionStorageUnitTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-prophesize(FieldItemListInterface::class);
- $field_items->getValue()->willReturn([
- ['value' => 123],
- ['value' => 456],
- ])->shouldBeCalledTimes(1);
- $user = $this->prophesize(UserInterface::class);
- $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->willReturn($field_items->reveal());
- $testUserId = 37;
- $user_storage = $this->prophesize(UserStorageInterface::class);
- // We shouldn't hit this code more than once if the static cache works.
- $user_storage->load($testUserId)->willReturn($user->reveal())->shouldBeCalledTimes(1);
- $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
- $entity_type_manager->getStorage('user')->willReturn($user_storage->reveal());
- $role_section_storage = $this->prophesize(RoleSectionStorageInterface::class);
- $role_section_storage->getRoleSections($user->reveal())->willReturn([]);
- $user_section_storage = new UserSectionStorage($entity_type_manager->reveal(), $user->reveal(), $role_section_storage->reveal());
- // First time, prime the cache.
- $user_section_storage->getUserSections($testUserId);
- // Second time, just return the result.
- $user_section_storage->getUserSections($testUserId);
- }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.drush.inc b/modules/workbench_access-8.x-1.x/workbench_access.drush.inc
deleted file mode 100644
index 73d8036..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.drush.inc
+++ /dev/null
@@ -1,165 +0,0 @@
- 'Install test configuration of Workbench Access.',
- 'aliases' => array('wa-test'),
- );
- $items['workbench-access-flush'] = array(
- 'description' => 'Flush section assignments for users and roles.',
- 'aliases' => array('wa-flush'),
- );
-
- return $items;
-}
-
-/**
- * Implement hook_drush_help().
- */
-function workbench_access_drush_help($section) {
- $items = workbench_access_drush_command();
- $name = str_replace('workbench access:', '', $section);
- if (isset($items[$name])) {
- return dt($items[$name]['description']);
- }
-}
-
-/**
- * Installs the test configuration.
- */
-function drush_workbench_access_test() {
- try {
- // Create a vocabulary.
- $vocabulary = entity_create('taxonomy_vocabulary', array(
- 'name' => 'Workbench Access',
- 'description' => 'Test taxonomy for Workbench Access',
- 'vid' => 'workbench_access',
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
- 'weight' => 100,
- ));
- $vocabulary->save();
- // Create some terms.
- $terms = array(
- 'Alumni',
- 'Faculty',
- 'Staff',
- 'Students',
- );
- $children = array(
- 'Directory',
- 'Information',
- );
-
- $filter_formats = filter_formats();
- $format = array_pop($filter_formats);
- foreach ($terms as $name) {
- $term = entity_create('taxonomy_term', array(
- 'name' => $name,
- 'description' => array(),
- 'vid' => $vocabulary->id(),
- 'parent' => 0,
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
- ));
- $term->save();
- foreach ($children as $child) {
- $child = entity_create('taxonomy_term', array(
- 'name' => "$name $child",
- 'description' => array(),
- 'vid' => $vocabulary->id(),
- 'parent' => $term->id(),
- 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
- ));
- $child->save();
- }
- }
- }
- catch (Exception $e) {
- drush_print('The test vocabulary has already been created.');
- }
- try {
- workbench_access_confirm_fields('user', 'user');
- $node_types = \Drupal::entityTypeManager()->getStorage('node_type')->loadMultiple();
- _workbench_access_create_node_storage();
- foreach ($node_types as $id => $type) {
- if ($id != 'page') {
- workbench_access_confirm_fields('node', $id);
- $type->setThirdPartySetting('workbench_access', 'workbench_access_status', 1);
- $type->save();
- $fields['node'][$id] = WorkbenchAccessManagerInterface::FIELD_NAME;
- _workbench_access_form_display('node', $id);
- }
- }
- if (isset($fields)) {
- $config = \Drupal::configFactory()->getEditable('workbench_access.settings');
- $config->set('scheme', 'taxonomy');
- $config->set('parents', ['workbench_access' => 'workbench_access']);
- $config->set('fields', $fields);
- $config->save();
- }
- }
- catch (Exception $e) {
- drush_print('Field creation failed.');
- }
-}
-
-/**
- * Flushes assigned user permissions.
- */
-function drush_workbench_access_flush() {
- $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
- $role_section_storage = \Drupal::getContainer()->get('workbench_access.role_section_storage');
- $role_section_storage->flushRoles();
- $user_section_storage->flushUsers();
- $manager->flushFields();
- drush_print('User and role assignments cleared. Field assigments reset.');
-}
-
-/**
- * Creates a node storage field for testing.
- */
-function _workbench_access_create_node_storage() {
- try {
- $field_storage_values = [
- 'field_name' => WorkbenchAccessManagerInterface::FIELD_NAME,
- 'entity_type' => 'node',
- 'type' => 'entity_reference',
- 'translatable' => TRUE,
- 'settings' => ['target_type' => 'taxonomy_term'],
- 'cardinality' => 1,
- 'dependencies' => ['module' => ['node', 'taxonomy', 'workbench_access']],
- ];
- $manager = \Drupal::entityTypeManager();
- $manager->getStorage('field_storage_config')->create($field_storage_values)->save();
- }
- catch (Exception $e) {
- drush_print('Field storage creation failed.');
- }
-
-}
-
-function _workbench_access_form_display($entity_type, $bundle) {
- // Tell the form system how to behave. Default to radio buttons.
- // @TODO: This function is deprecated, but using the OO syntax is causing
- // test fails.
- entity_get_form_display($entity_type, $bundle, 'default')
- ->setComponent(WorkbenchAccessManagerInterface::FIELD_NAME, array(
- 'type' => 'options_select',
- 'weight' => 0,
- ))
- ->save();
-
-}
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.info.yml b/modules/workbench_access-8.x-1.x/workbench_access.info.yml
deleted file mode 100644
index c1d207f..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.info.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Workbench Access
-type: module
-description: Hierarchical access control module.
-core: 8.x
-configure: workbench_access.admin
-package: Workbench
-
-dependencies:
- - node
- - taxonomy
- - options
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.install b/modules/workbench_access-8.x-1.x/workbench_access.install
deleted file mode 100644
index ba848ab..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.install
+++ /dev/null
@@ -1,46 +0,0 @@
- $entity_type) {
- workbench_access_confirm_fields($entity_type, $bundle);
- }
-}
-
-/**
- * Implements hook_uninstall().
- *
- * Removes access control fields on uninstall.
- */
-function workbench_access_uninstall() {
- foreach (array('user') as $type) {
- $id = $type . '.' . WorkbenchAccessManagerInterface::FIELD_NAME;
- if ($field = \Drupal::entityManager()->getStorage('field_storage_config')->load($id)) {
- $field->delete();
- }
- }
-}
-
-/**
- * Add the setting to deny access to unassigned content.
- */
-function workbench_access_update_8001() {
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('workbench_access.settings');
- $config->set('deny_on_empty', 0);
- $config->save(TRUE);
-}
-
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.libraries.yml b/modules/workbench_access-8.x-1.x/workbench_access.libraries.yml
deleted file mode 100644
index 3aa9661..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.libraries.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-admin:
- version: VERSION
- js:
- js/workbench_access.js: {}
- dependencies:
- - core/jquery
- - core/drupal
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.links.menu.yml b/modules/workbench_access-8.x-1.x/workbench_access.links.menu.yml
deleted file mode 100644
index 62b1805..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-workbench_access.settings:
- title: 'Workbench Access'
- description: 'Configure settings for Workbench Access.'
- parent: system.admin_config_workflow
- route_name: workbench_access.admin
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.links.task.yml b/modules/workbench_access-8.x-1.x/workbench_access.links.task.yml
deleted file mode 100644
index 440500a..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.links.task.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-workbench_access.admin:
- title: 'Settings'
- route_name: workbench_access.admin
- base_route: workbench_access.admin
-
-workbench_access.sections:
- title: 'Sections'
- route_name: workbench_access.sections
- base_route: workbench_access.admin
- weight: 10
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.module b/modules/workbench_access-8.x-1.x/workbench_access.module
deleted file mode 100644
index 6367e6f..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.module
+++ /dev/null
@@ -1,254 +0,0 @@
-' . t('About') . '';
- $output .= '' . t('Hierarchical access control module.') . '
';
- return $output;
-
- default:
- }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Restricts selection options for the node form.
- */
-function workbench_access_form_node_form_alter(&$form, FormStateInterface $form_state) {
- $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- if ($scheme = $manager->getActiveScheme()) {
- $node = $form_state->getFormObject()->getEntity();
-
- // If no access field is set, we do nothing.
- $field = $scheme->fields('node', $node->bundle());
- if (empty($field)) {
- return;
- }
- // Load field data that can be edited.
- $account = \Drupal::currentUser();
- // If the user cannot access the form element or is a superuser, ignore.
- if (!empty($form[$field]['#access']) && !$account->hasPermission('bypass workbench access')) {
- $form[$field] = $scheme->alterOptions($form[$field], $manager, \Drupal::service('workbench_access.user_section_storage')->getUserSections($account->id()));
- // Add the options hidden from the user silently to the form.
- $options_diff = $scheme->disallowedOptions($form[$field]);
- if (!empty($options_diff)) {
- // @TODO: Potentially show this information to users with permission.
- $form['workbench_access_disallowed'] = workbench_access_hidden_field($options_diff, $scheme);
- // Call our submitEntity() method to merge in values.
- // @todo Add tests for this.
- $class = '\\' . get_class($scheme) . '::submitEntity';
- // Account for all the submit buttons on the node form.
- $buttons = ['submit', 'publish', 'unpublish'];
- foreach ($buttons as $button) {
- if (isset($form['actions'][$button]['#submit'])) {
- array_unshift($form['actions'][$button]['#submit'], $class);
- }
- }
- }
- }
- }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Adds Workbench Access options to the node type form.
- *
- * @see NodeTypeForm::form().
- * @see menu_ui_form_node_type_form_builder().
- */
-function workbench_access_form_node_type_form_alter(&$form, FormStateInterface $form_state) {
- // Add a checkbox to registration form about agreeing to terms of use.
- $type = $form_state->getFormObject()->getEntity();
- $form['workflow']['workbench_access_status'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable Workbench Access control for @type content.', array('@type' => $type->label())),
- '#description' => t('If selected, all @type content will be subject to editorial access restrictions.', array('@type' => $type->label())),
- '#default_value' => $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0),
- '#access' => \Drupal::currentUser()->hasPermission('administer workbench access'),
- );
- $form['#entity_builders'][] = 'workbench_access_form_node_type_form_builder';
- }
-
-/**
- * Entity builder for the node type form with Workbench Access options.
- *
- * @see workbench_access_form_node_type_form_alter().
- */
-function workbench_access_form_node_type_form_builder($entity_type, NodeTypeInterface $type, &$form, FormStateInterface $form_state) {
- $type->setThirdPartySetting('workbench_access', 'workbench_access_status', $form_state->getValue('workbench_access_status'));
-}
-
-/**
- * Creates our fields for an entity bundle.
- *
- * @param $entity_type
- * The entity type being created. Users are supported.
- * @param $bundle
- * The bundle being created.
- */
-function workbench_access_confirm_fields($entity_type, $bundle) {
- // We have reports that importing config causes this function to fail.
- try {
- $text = [
- 'user' => [
- 'type' => 'user',
- 'label' => 'Sections', // @TODO tie to config
- 'description' => 'Assign the editorial sections that this user belongs to.',
- ],
- 'node' => [
- 'type' => $bundle,
- 'label' => 'Sections', // @TODO tie to config
- 'description' => 'The editorial section for this content.',
- ]
- ];
- $id = $entity_type . '.' . $bundle . '.' . WorkbenchAccessManagerInterface::FIELD_NAME;
-
- if (!$field = \Drupal::entityManager()->getStorage('field_config')->load($id)) {
- $field = array(
- 'field_name' => WorkbenchAccessManagerInterface::FIELD_NAME,
- 'entity_type' => $entity_type,
- 'label' => $text[$entity_type]['label'],
- 'bundle' => $bundle,
- 'required' => FALSE,
- 'description' => $text[$entity_type]['description'],
- 'default_value_callback' => 'Drupal\workbench_access\WorkbenchAccessManager::getDefaultValue',
- );
- if ($entity_type == 'node') {
- $field['settings']['handler_settings']['target_bundles'] = ['workbench_access' => 'workbench_access'];
- $field['settings']['handler_settings']['auto_create'] = FALSE;
- $field['settings']['handler_settings']['sort'] = ['field' => '_none'];
- }
- $field_config = \Drupal::entityManager()->getStorage('field_config')->create($field);
- $field_config->save();
- }
- // Installing without setting form display leaves the field hidden, which is
- // what we want right now. @TODO: UI for user form.
- }
- catch (Exception $e) {
- \Drupal::logger('workbench_access')->notice('Field installation failed.');
- }
-}
-
-/**
- * Implements hook_node_access().
- */
-function workbench_access_node_access(NodeInterface $node, $op, AccountInterface $account) {
- // Check that our access control is configured.
- $manager = \Drupal::service('plugin.manager.workbench_access.scheme');
- if ($scheme = $manager->getActiveScheme()) {
- return $scheme->checkEntityAccess($node, $op, $account, $manager);
- }
- return AccessResult::neutral();
-}
-
-/**
- * Implements hook_node_create_access().
- *
- * @link https://www.drupal.org/node/2348203
- */
-function workbench_access_node_create_access(AccountInterface $account, $context, $entity_bundle) {
- $return = AccessResult::neutral();
- // User can bypass.
- if ($account->hasPermission('bypass workbench access')) {
- return $return;
- }
-
- // Check that our access control is configured.
- $manager = \Drupal::service('plugin.manager.workbench_access.scheme');
- if (!$manager->getActiveScheme()) {
- return $return;
- }
-
- // Check that access control applies to this content type.
- $type = \Drupal::entityTypeManager()->getStorage('node_type')->load($entity_bundle);
- if (!$type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0)) {
- return $return;
- }
-
- // Check that the user is able to assign content to a section.
- $user_section_storage = \Drupal::service('workbench_access.user_section_storage');
- if (!$user_section_storage->getUserSections($account->id())) {
- return AccessResult::forbidden();
- }
- return $return;
-}
-
-/**
- * Implements hook_views_data_alter().
- */
-function workbench_access_views_data_alter(array &$data) {
- $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
- if ($scheme = $manager->getActiveScheme()) {
- $data['node']['workbench_access_section'] = array(
- 'title' => t('Workbench Section'),
- 'help' => t('The sections to which this content belongs.'),
- 'field' => array(
- 'id' => 'workbench_access_section',
- ),
- 'filter' => array(
- 'field' => 'nid',
- 'id' => 'workbench_access_section',
- ),
- );
- $data['users']['workbench_access_section'] = array(
- 'title' => t('Workbench Section'),
- 'help' => t('The sections to which this user belongs.'),
- 'field' => array(
- 'id' => 'workbench_access_user_section',
- ),
- 'filter' => array(
- 'field' => 'uid',
- 'id' => 'workbench_access_section',
- ),
- );
- }
-}
-
-/**
- * Adds a hidden field that stored access information that cannot be edited.
- *
- * @param array $options_diff
- * An array of section ids that cannot be edited by the current user.
- * @param Drupal\workbench_access\Annotation\AccessControlHierarchy $scheme
- * The active access control scheme.
- *
- * @return array
- * A form element.
- */
-function workbench_access_hidden_field($options_diff, $scheme) {
- $element = array(
- '#type' => 'value',
- '#value' => $options_diff,
- );
- return $element;
-}
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.permissions.yml b/modules/workbench_access-8.x-1.x/workbench_access.permissions.yml
deleted file mode 100644
index e1d81dc..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.permissions.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-administer workbench access:
- description: 'Administer access control settings for Workbench Access.'
- title: 'Administer Workbench Access configuration'
- restrict access: TRUE
-
-assign workbench access:
- description: 'Assign users and roles to edit content in specific editorial sections.'
- title: 'Assign users to Workbench Access sections'
- restrict access: FALSE
-
-batch update workbench access:
- description: 'Perform batch section assignments from the content overview page.'
- title: 'Batch update section assignments for content'
- restrict access: FALSE
-
-bypass workbench access:
- description: 'Automatically grant access to all access sections.'
- title: 'Bypass Workbench Access permissions'
- restrict access: TRUE
-
-use workbench access:
- description: 'Lets users be assigned to editorial sections.'
- title: 'Allow all members of this role to be assigned to Workbench Access sections'
- restrict access: FALSE
-
-view workbench access information:
- description: 'View the editorial access status of each content page.'
- title: 'View Workbench Access information'
- restrict access: FALSE
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.routing.yml b/modules/workbench_access-8.x-1.x/workbench_access.routing.yml
deleted file mode 100644
index 84aaade..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.routing.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-workbench_access.admin:
- path: '/admin/config/workflow/workbench_access'
- defaults:
- _form: 'Drupal\workbench_access\Form\WorkbenchAccessConfigForm'
- _title: 'Workbench Access'
- requirements:
- _permission: 'administer workbench access'
-
-workbench_access.sections:
- path: '/admin/config/workflow/workbench_access/sections'
- defaults:
- _controller: 'Drupal\workbench_access\Controller\WorkbenchAccessSections::page'
- _title: 'Sections'
- requirements:
- _permission: 'assign workbench access'
-
-workbench_access.by_role:
- path: '/admin/config/workflow/workbench_access/sections/{id}/roles'
- defaults:
- _form: 'Drupal\workbench_access\Form\WorkbenchAccessByRoleForm'
- _title_callback: 'Drupal\workbench_access\Form\WorkbenchAccessByRoleForm::pageTitle'
- requirements:
- _permission: 'assign workbench access'
-
-workbench_access.by_user:
- path: '/admin/config/workflow/workbench_access/sections/{id}/users'
- defaults:
- _form: 'Drupal\workbench_access\Form\WorkbenchAccessByUserForm'
- _title_callback: 'Drupal\workbench_access\Form\WorkbenchAccessByUserForm::pageTitle'
- requirements:
- _permission: 'assign workbench access'
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.services.yml b/modules/workbench_access-8.x-1.x/workbench_access.services.yml
deleted file mode 100644
index 4f911fe..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.services.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
- plugin.manager.workbench_access.scheme:
- class: Drupal\workbench_access\WorkbenchAccessManager
- arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@entity_type.manager', '@workbench_access.user_section_storage', '@workbench_access.role_section_storage', '@config.factory', '@current_user']
- workbench_access.user_section_storage:
- class: Drupal\workbench_access\UserSectionStorage
- arguments: ['@entity_type.manager', '@current_user', '@workbench_access.role_section_storage']
- workbench_access.role_section_storage:
- class: Drupal\workbench_access\RoleSectionStorage
- arguments: ['@state', '@entity_type.manager']
diff --git a/modules/workflow/CHANGELOG.txt b/modules/workflow/CHANGELOG.txt
deleted file mode 100644
index 97a4423..0000000
--- a/modules/workflow/CHANGELOG.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Changes since 8.x-1.x
-Issue #2351299 by johnv: Porting D7-version to D8 - numerous commits.
-
-Issue #2585093 by johnv: Fixed lost error message on Workflow UI - Transitions page.
-Issue #2587165 by johnv: Port Workflow to D8: dropped features, clone support.
-Issue #297898: Move "Workflow tab permissions" to permissions page'
-Issue #2587171: Make permission "schedule workflow transition" specific per Workflow type
\ No newline at end of file
diff --git a/modules/workflow/LICENSE.txt b/modules/workflow/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/workflow/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/workflow/config/install/workflow.settings.yml b/modules/workflow/config/install/workflow.settings.yml
deleted file mode 100644
index 815b395..0000000
--- a/modules/workflow/config/install/workflow.settings.yml
+++ /dev/null
@@ -1 +0,0 @@
-workflow_states_per_page: 20
diff --git a/modules/workflow/config/optional/block.block.workflowtransitionform.yml b/modules/workflow/config/optional/block.block.workflowtransitionform.yml
deleted file mode 100644
index 1fb0302..0000000
--- a/modules/workflow/config/optional/block.block.workflowtransitionform.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - workflow
- theme:
- - bartik
-id: workflowtransitionform
-theme: bartik
-region: sidebar_second
-weight: -7
-provider: null
-plugin: workflow_transition_form_block
-settings:
- id: workflow_transition_form_block
- label: 'Workflow Transition form'
- provider: workflow
- label_display: visible
-visibility: { }
diff --git a/modules/workflow/config/schema/workflow.schema.yml b/modules/workflow/config/schema/workflow.schema.yml
deleted file mode 100644
index f9dabcc..0000000
--- a/modules/workflow/config/schema/workflow.schema.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-# Schema for the configuration files of the Workflow module.
-workflow.settings:
- type: config_object
- label: 'Workflow settings'
- mapping:
- workflow_states_per_page:
- type: integer
- label: 'Number of workflow states per page'
-
-workflow.workflow.*:
- type: config_entity
- label: 'Workflow settings'
- mapping:
- id:
- type: string
- label: 'ID'
- status:
- type: boolean
- label: 'Status'
- label:
- type: string
- label: 'Label'
- module:
- type: string
- label: 'Module'
- options:
- type: mapping
- label: 'Options'
- mapping:
- name_as_title:
- type: integer
- label: 'Use the workflow name as the title of the workflow form'
- fieldset:
- type: integer
- label: 'Show the form in a fieldset'
- options:
- type: string
- label: 'How to show the available states'
- schedule_timezone:
- type: integer
- label: 'Show a timezone when scheduling a transition'
- comment_log_node:
- type: integer
- label: 'Show comment on the Content edit form'
- watchdog_log:
- type: integer
- label: 'Log watchdog messages upon state change'
-
-field.storage_settings.workflow:
- type: mapping
- label: 'Workflow settings'
- mapping:
- workflow_type:
- type: string
- label: 'Workflow'
- allowed_values:
- type: sequence
- label: 'Allowed values list'
- sequence:
- type: mapping
- label: 'Allowed value with label'
- mapping:
- value:
- type: string
- label: 'Value'
- label:
- type: label
- label: 'Label'
- allowed_values_function:
- type: string
- label: 'Allowed values function'
-
-field.field_settings.workflow:
- type: mapping
- label: 'Workflow settings'
-
-workflow.settings:
- type: config_object
- mapping:
- workflow_states_per_page:
- type: integer
- label: 'Number of workflow states displayed per page.'
diff --git a/modules/workflow/config/schema/workflow.state.schema.yml b/modules/workflow/config/schema/workflow.state.schema.yml
deleted file mode 100644
index d406d5c..0000000
--- a/modules/workflow/config/schema/workflow.state.schema.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Schema for the configuration files of the state from Workflow module.
-
-workflow.state.*:
- type: config_entity
- label: 'Workflow State'
- mapping:
- id:
- type: string
- label: 'ID'
- status:
- type: boolean
- label: 'Status'
- label:
- type: string
- label: 'Label'
- module:
- type: string
- label: 'Module'
- wid:
- type: string
- label: 'Machine name of the attached Workflow'
- weight:
- type: integer
- label: 'Weight'
- sysid:
- type: integer
- label: 'SysId'
diff --git a/modules/workflow/config/schema/workflow.transition.schema.yml b/modules/workflow/config/schema/workflow.transition.schema.yml
deleted file mode 100644
index 9027684..0000000
--- a/modules/workflow/config/schema/workflow.transition.schema.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Schema for the configuration files of the transitions for Workflow module.
-
-workflow.transition.*:
- type: config_entity
- label: 'Workflow Transition'
- mapping:
- id:
- type: string
- label: 'ID'
- label:
- type: string
- label: 'Label'
- module:
- type: string
- label: 'Module'
- from_sid:
- type: string
- label: 'From workflow state'
- to_sid:
- type: string
- label: 'To workflow state'
- roles:
- type: sequence
- label: 'User roles'
- sequence:
- type: string
- label: 'Role'
diff --git a/modules/workflow/config/schema/workflow.views.schema.yml b/modules/workflow/config/schema/workflow.views.schema.yml
deleted file mode 100644
index 4877697..0000000
--- a/modules/workflow/config/schema/workflow.views.schema.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Schema for the views plugins of the Workflow module.
-
-views.filter.workflow_state:
- type: views.filter.many_to_one
diff --git a/modules/workflow/modules/workflow_access/config/install/workflow_access.settings.yml b/modules/workflow/modules/workflow_access/config/install/workflow_access.settings.yml
deleted file mode 100644
index bfa09f3..0000000
--- a/modules/workflow/modules/workflow_access/config/install/workflow_access.settings.yml
+++ /dev/null
@@ -1 +0,0 @@
-workflow_access_priority: 0
diff --git a/modules/workflow/modules/workflow_access/config/schema/workflow_access.schema.yml b/modules/workflow/modules/workflow_access/config/schema/workflow_access.schema.yml
deleted file mode 100644
index e8567d8..0000000
--- a/modules/workflow/modules/workflow_access/config/schema/workflow_access.schema.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-workflow_access.settings:
- type: config_object
- label: Settings
- mapping:
- workflow_access_priority:
- type: integer
diff --git a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessRoleForm.php b/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessRoleForm.php
deleted file mode 100644
index 73749f7..0000000
--- a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessRoleForm.php
+++ /dev/null
@@ -1,143 +0,0 @@
- t('State'),
- 'view' => t('Roles who can view posts in this state'),
- 'update' => t('Roles who can edit posts in this state'),
- 'delete' => t('Roles who can delete posts in this state'),
- ];
- return $header;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- $row = [];
-
- $workflow = $this->workflow;
- if ($workflow) {
- /* @var $state WorkflowState */
- $state = $entity;
- $sid = $state->id();
-
- // A list of role names keyed by role ID, including the 'author' role.
- // Only get the roles with proper permission + Author role.
- $type_id = $workflow->id();
- $roles = workflow_get_user_role_names("create $type_id workflow_transition");
-
- if ($state->isCreationState()) {
- // No need to set perms on creation.
- return [];
- }
-
- $view = $update = $delete = [];
- $count = 0;
- foreach (workflow_access_get_workflow_access_by_sid($sid) as $rid => $access) {
- $count++;
- $view[$rid] = ($access['grant_view']) ? $rid : 0;
- $update[$rid] = ($access['grant_update']) ? $rid : 0;
- $delete[$rid] = ($access['grant_delete']) ? $rid : 0;
- }
- // Allow view grants by default for anonymous and authenticated users,
- // if no grants were set up earlier.
- if (!$count) {
- $view = [
- AccountInterface::ANONYMOUS_ROLE => AccountInterface::ANONYMOUS_ROLE,
- AccountInterface::AUTHENTICATED_ROLE => AccountInterface::AUTHENTICATED_ROLE,
- ];
- }
-
- $row['label_new'] = [
- '#type' => 'value',
- '#markup' => t('@label', ['@label' => $state->label()]),
- ];
- $row['view'] = [
- '#type' => 'checkboxes',
- '#options' => $roles,
- '#default_value' => $view,
- ];
- $row['update'] = [
- '#type' => 'checkboxes',
- '#options' => $roles,
- '#default_value' => $update,
- ];
- $row['delete'] = [
- '#type' => 'checkboxes',
- '#options' => $roles,
- '#default_value' => $delete,
- ];
- }
- return $row;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- foreach ($form_state->getValue($this->entitiesKey) as $sid => $access) {
- // @todo: not waterproof; can be done smarter, using elementchildren().
- if (!WorkflowState::load($sid)) {
- continue;
- }
-
- foreach ($access['view'] as $rid => $checked) {
- $data[$rid] = [
- 'grant_view' => (!empty($access['view'][$rid])) ? (bool) $access['view'][$rid] : 0,
- 'grant_update' => (!empty($access['update'][$rid])) ? (bool) $access['update'][$rid] : 0,
- 'grant_delete' => (!empty($access['delete'][$rid])) ? (bool) $access['delete'][$rid] : 0,
- ];
- }
- workflow_access_insert_workflow_access_by_sid($sid, $data);
-
- // Update all nodes to reflect new settings.
- node_access_needs_rebuild(TRUE);
- }
-
- parent::submitForm($form, $form_state);
- }
-
-}
diff --git a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessSettingsForm.php b/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessSettingsForm.php
deleted file mode 100644
index 16f7fd3..0000000
--- a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessSettingsForm.php
+++ /dev/null
@@ -1,74 +0,0 @@
-config('workflow_access.settings');
- $weight = $config->get('workflow_access_priority');
-
- $form['workflow_access'] = [
- '#type' => 'details',
- '#open' => TRUE,
- '#title' => t('Workflow Access Settings'),
- ];
- $form['workflow_access']['#tree'] = TRUE;
-
- $url = 'https://api.drupal.org/api/drupal/core%21modules%21node%21node.api.php/function/hook_node_access_records/8';
- $form['workflow_access']['workflow_access_priority'] = [
- '#type' => 'weight',
- '#delta' => 10,
- '#title' => t('Workflow Access Priority'),
- '#default_value' => $weight,
- '#description' => t('This sets the node access priority. Changing this
- setting can be dangerous. If there is any doubt, leave it at 0.
- Read the manual .', [':url' => $url]),
- ];
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $weight = $form_state->getValues()['workflow_access']['workflow_access_priority'];
-
- $this->config('workflow_access.settings')
- ->set('workflow_access_priority', $weight)
- ->save();
-
- parent::submitForm($form, $form_state);
- }
-
-}
diff --git a/modules/workflow/modules/workflow_access/workflow_access.info.yml b/modules/workflow/modules/workflow_access/workflow_access.info.yml
deleted file mode 100644
index 306acb1..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Workflow access'
-description: 'Content access control based on workflows and roles. Depends on the node_access system, so only works for entities of type ''node''.'
-dependencies:
- - workflow
-package: Workflow
-# core: 8.x
-type: module
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_access/workflow_access.install b/modules/workflow/modules/workflow_access/workflow_access.install
deleted file mode 100644
index 57c6589..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.install
+++ /dev/null
@@ -1,41 +0,0 @@
-schema();
- $schema->dropTable('workflow_access');
- // Rebuild data.
- node_access_needs_rebuild(TRUE);
-}
diff --git a/modules/workflow/modules/workflow_access/workflow_access.links.task.yml b/modules/workflow/modules/workflow_access/workflow_access.links.task.yml
deleted file mode 100644
index a1bac44..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.links.task.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Menu tasks for Workflow UI.
-
-workflow_access_settings:
- route_name: workflow.access.settings
- base_route: entity.workflow_type.collection
- title: 'Access settings'
- weight: 5
- appears_on:
- - entity.workflow_type.collection
-
-entity.workflow_type.access_form:
- title: 'Access'
- route_name: entity.workflow_type.access_form
- base_route: entity.workflow_type.edit_form
- weight: -1
diff --git a/modules/workflow/modules/workflow_access/workflow_access.module b/modules/workflow/modules/workflow_access/workflow_access.module
deleted file mode 100644
index ae82ed9..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.module
+++ /dev/null
@@ -1,300 +0,0 @@
-";
- $output .= t("WARNING: Use of the 'Edit any', 'Edit own', and even 'View
- published content' permissions for the content type may override these
- access settings. You may disable those permissions or
- alter the priority of
- the Workflow access module .", [':url' => $url->toString()]
- );
- if (\Drupal::moduleHandler()->moduleExists('og')) {
- $output .= 'Strict node access
- // permissions is enabled, since this may override Workflow access
- // settings.", [':url' => $url]);
- $output .= t("In particular, if Strict node access
- permissions is enabled, since this may override Workflow access
- settings.");
- }
- break;
-
- default:
- break;
- }
- return $output;
-}
-
-/**
- * Implements hook_workflow_operations().
- *
- * Create action link for access form on EntityWorkflowUIController::overviewForm.
- */
-function workflow_access_workflow_operations($op, EntityInterface $entity = NULL) {
- $operations = [];
- return $operations;
-}
-
-/**
- * Implements hook_entity_insert().
- *
- * We use the Role weight as an id.
- * In contrary to content_access module, that uses a 'content_access_roles_gids'
- * config setting.
- * @todo: determine the best way for D8. See also content_access.module
- * The problem is that node_access table uses Int, whereas the Role Id is string.
- */
-function workflow_access_user_role_insert(EntityInterface $entity) {
- // Attend user to Rebuild data, because the weight of a role
- // is the key for workflow_Access.
- /** @var $entity \Drupal\user\RoleInterface */
- node_access_needs_rebuild(TRUE);
-}
-
-/**
- * Implements hook_access_entity_update().
- *
- * @param EntityInterface $entity
- */
-function workflow_access_user_role_update(EntityInterface $entity) {
- // Attend user to Rebuild data, because the weight of a role
- // is the key for workflow_Access.
- /** @var $entity \Drupal\user\RoleInterface */
- if ($entity->getWeight() != $entity->original->getWeight()) {
- // Role's weight has changed.
- node_access_needs_rebuild(TRUE);
- }
-}
-
-/**
- * Implements hook_node_grants().
- *
- * Supply the workflow access grants. We are simply using
- * roles as access lists, so rids translate directly to gids.
- */
-function workflow_access_node_grants(AccountInterface $account, $op) {
- $gids = [];
- $roles = $account->getRoles();
- foreach ($roles as $role) {
- // @todo D8: compare with content_access module.
- $gids[] = workflow_access_get_role_gid($role);
- }
-
- return [
- 'workflow_access' => $gids,
- 'workflow_access_owner' => [$account->id()],
- ];
-}
-
-/**
- * Helper providing numeric id for role.
- * Copied from content_access.module
- */
-function workflow_access_get_role_gid($rid) {
- // @todo D8: compare with content_access module.
- // $config = \Drupal::configFactory()->getEditable('content_access.settings');
- // $roles_gids = $config->get('content_access_roles_gids');
- // return $roles_gids[$role];
-
- /* @var $role Role */
- $role = \Drupal\user\Entity\Role::load($rid);
- $weight = 100; // Avoid negative values.
- if ($role) {
- $weight += $role->getWeight();
- }
- else {
- // For Author, no role exists.
- $weight -= 20;
- }
-
- return $weight;
-}
-
-/**
- * Implements hook_node_access_records().
- *
- * Returns a list of grant records for the passed in node object.
- * This hook is invoked by function node_access_acquire_grants().
- */
-function workflow_access_node_access_records(\Drupal\node\NodeInterface $node) {
- $grants = [];
- $workflow_transitions_added = FALSE;
-
- //if (!$node->isPublished()) {
- // // @todo: return;
- //}
-
- $entity_type = $node->getEntityTypeId();
-
-
- // Only relevant for content with Workflow.
- if (!isset($node->workflow_transitions)) {
- $node->workflow_transitions = [];
- // Sometimes, a node is saved without going through workflow_transition_form.
- // E.g.,
- // - when saving a node with workflow_node programmatically with node_save();
- // - when changing a state on a node view page/history tab;
- // - when rebuilding permissions via batch for Workflow Fields.
- // In that case, we need to create the workflow_transitions ourselves to
- // calculate the grants.
- foreach (_workflow_info_fields($node, $entity_type) as $field) {
- $field_name = $field->getName(); // Do not use id().
- $old_sid = $new_sid = $node->$field_name->value;
-
- // Create a dummy transition, just to set $node->workflow_transitions.
- if ($old_sid) {
- /* @var $transition WorkflowTransitionInterface */
- $transition = WorkflowTransition::create([$old_sid, 'field_name' => $field_name]);
- $transition->setTargetEntity($node);
- $transition->setValues($new_sid, $node->getOwnerId(), \Drupal::time()->getRequestTime(), '');
-
- // Store the transition, so it can be easily fetched later on.
- // Store in an array, to prepare for multiple workflow_fields per entity.
- // This is a.o. used in hook_entity_update to trigger 'transition post'.
- $node->workflow_transitions[$field_name] = $transition;
- $workflow_transitions_added = TRUE;
- }
- }
- }
-
- // Get 'author' of this entity.
- // - Some entities (e.g., taxonomy_term) do not have a uid.
- // But then again: node_access is only for nodes...
- $uid = ($node->getOwnerId()) ? (int) $node->getOwnerId() : 0;
- $priority = workflow_access_get_setting('workflow_access_priority');
-
- $count = 0;
- foreach ($node->workflow_transitions as $transition) {
- // @todo: add support for +1 workflows per entity.
- if ($count++ == 1) {
- continue;
- }
-
- $field_name = $transition->getFieldName();
- if ($current_sid = workflow_node_current_state($node, $field_name)) {
- foreach (workflow_access_get_workflow_access_by_sid($current_sid) as $rid => $grant) {
- $realm = ($uid > 0 && $rid == WORKFLOW_ROLE_AUTHOR_RID) ? 'workflow_access_owner' : 'workflow_access';
- $gid = ($uid > 0 && $rid == WORKFLOW_ROLE_AUTHOR_RID) ? $uid : workflow_access_get_role_gid($rid);
-
- // Anonymous ($uid == 0) author is not allowed for role 'author' (== -1).
- // Both logically (Anonymous having more rights then authenticated)
- // and technically: $gid must be a positive int.
- if ($uid == 0 && $rid == WORKFLOW_ROLE_AUTHOR_RID) {
- continue;
- }
-
- $grants[] = [
- 'realm' => $realm,
- 'gid' => $gid,
- 'grant_view' => (int) $grant['grant_view'],
- 'grant_update' => (int) $grant['grant_update'],
- 'grant_delete' => (int) $grant['grant_delete'],
- 'priority' => $priority,
- // 'langcode' => $node->language(),
- 'field_name' => $field_name, // Just for analysis and info.
- ];
- }
- }
- }
- if ($workflow_transitions_added == TRUE) {
- unset($node->workflow_transitions);
- }
-
- return $grants;
-}
-
-/**
- * Implements hook_node_access_explain().
- *
- * This is a Devel Node Access hook.
- */
-function workflow_access_node_access_explain($row) {
- static $interpretations = [];
- switch ($row->realm) {
- case 'workflow_access_owner':
- $interpretations[$row->gid] = t('Workflow access: author of the content may access');
- break;
-
- case 'workflow_access':
- $roles = user_roles();
- $interpretations[$row->gid] = t('Workflow access: %role may access', ['%role' => $roles[$row->gid]]);
- break;
- }
- return (!empty($interpretations[$row->gid]) ? $interpretations[$row->gid] : NULL);
-}
-
-/**
- * DB functions - all DB interactions are isolated here to make for easy updating should our schema change.
- */
-
-/**
- * Given a sid, retrieve the access information and return the row(s).
- */
-function workflow_access_get_workflow_access_by_sid($sid) {
- $result = \Drupal::config('workflow_access.role')->get($sid);
- if ($result == NULL) {
- // Avoid errors in calling function when no data available.
- $result = [];
- }
- return $result;
-}
-
-/**
- * Given a sid, delete all access data for this state.
- */
-function workflow_access_delete_workflow_access_by_sid($sid) {
- \Drupal::configFactory()->getEditable('workflow_access.role')
- ->clear($sid)
- ->save();
-}
-
-/**
- * Given data, insert into workflow access - we never update.
- */
-function workflow_access_insert_workflow_access_by_sid($sid, &$data, Config $config = NULL) {
- $config = \Drupal::configFactory()->getEditable('workflow_access.role');
- $config
- ->set($sid, $data)
- ->save();
-}
-
-/**
- * Get the module settings.
- *
- * @see WorkflowAccessSettingsForm::submitForm()
- */
-function workflow_access_get_setting($value) {
- $config = \Drupal::config('workflow_access.settings');
- $priority = $config->get($value);
- return $priority;
-}
diff --git a/modules/workflow/modules/workflow_access/workflow_access.routing.yml b/modules/workflow/modules/workflow_access/workflow_access.routing.yml
deleted file mode 100644
index f5bae05..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.routing.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Declaration of Workflow Access routings.
-
-### Workflow settings form
-workflow.access.settings:
- path: '/admin/config/workflow/workflow/access'
- defaults:
- _form: '\Drupal\workflow_access\Form\WorkflowAccessSettingsForm'
- _title: 'Access settings'
- requirements:
- _permission: 'administer workflow'
- _module_dependencies: 'workflow_ui'
-
-entity.workflow_type.access_form:
- path: '/admin/config/workflow/workflow/{workflow_type}/access'
- defaults:
- _title: 'Edit Workflow'
- _title_callback: 'workflow_url_get_title'
- _form: '\Drupal\workflow_access\Form\WorkflowAccessRoleForm'
- requirements:
- _permission: 'administer workflow'
- _module_dependencies: 'workflow_ui'
diff --git a/modules/workflow/modules/workflow_cleanup/src/Form/WorkflowCleanupSettingsForm.php b/modules/workflow/modules/workflow_cleanup/src/Form/WorkflowCleanupSettingsForm.php
deleted file mode 100644
index 3529b0b..0000000
--- a/modules/workflow/modules/workflow_cleanup/src/Form/WorkflowCleanupSettingsForm.php
+++ /dev/null
@@ -1,138 +0,0 @@
-getWorkflow()) {
- $orphans[$state->id()] = $state;
- }
- else {
- // Is the state still active?
- if (!$state->isActive()) {
- $inactive[$state->id()] = $state;
- }
- }
- }
-
- // Save the relevant states in an indexed array.
- $form['#workflow_states'] = $orphans + $inactive;
-
- $form['no_workflow'] = [
- '#type' => 'details',
- '#title' => t('Orphaned States'),
- '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
- '#description' => t('These states no longer belong to an existing workflow.'),
- '#tree' => TRUE,
- ];
- foreach ($orphans as $sid => $state) {
- $form['no_workflow'][$sid]['check'] = [
- '#type' => 'checkbox',
- '#title' => $state->label(),
- '#return_value' => $sid,
- ];
- }
-
- $form['inactive'] = [
- '#type' => 'details',
- '#title' => t('Inactive (Deleted) States'),
- '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
- '#description' => t('These states belong to a workflow, but have been marked inactive (deleted).'),
- '#tree' => TRUE,
- ];
- foreach ($inactive as $sid => $state) {
- $form['inactive'][$sid]['check'] = [
- '#type' => 'checkbox',
- '#title' => $state->label() . ' (' . $state->getWorkflow()->label() . ')',
- '#return_value' => $sid,
- ];
- }
-
- $form['submit'] = [
- '#type' => 'submit',
- '#value' => t('Delete selected states'),
- ];
-
- return $form;
- }
-
- /**
- * @inheritdoc
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $states = $form['#workflow_states'];
- $values = $form_state->getValues();
- foreach (['no_workflow', 'inactive'] as $section) {
- if (!isset($values[$section])) {
- continue;
- }
-
- foreach ($values[$section] as $sid => $data) {
- if ($data['check']) {
- /* @var $state WorkflowState */
- $state = $states[$sid];
- $state_name = $state->label();
-
- // Delete any transitions this state is involved in.
- $count = 0;
- foreach (WorkflowConfigTransition::loadMultiple() as $config_transition) {
- /* @var $config_transition WorkflowConfigTransition */
- if ($config_transition->getFromSid() == $sid || $config_transition->getToSid() == $sid) {
- $config_transition->delete();
- $count++;
- }
- }
- if ($count) {
- drupal_set_message(t('@count transitions for the "@state" state have been deleted.',
- ['@state' => $state_name, '@count' => $count]));
- }
-
- // @todo: Remove history records too.
- $count = 0;
- // $count = db_delete('workflow_node_history')->condition('sid', $sid)->execute();
- if ($count) {
- drupal_set_message(t('@count history records for the "@state" state have been deleted.',
- ['@state' => $state_name, '@count' => $count]));
- }
-
- $state->delete();
- drupal_set_message(t('The "@state" state has been deleted.',
- ['@state' => $state_name]));
- }
- }
- }
- }
-
-}
diff --git a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.info.yml b/modules/workflow/modules/workflow_cleanup/workflow_cleanup.info.yml
deleted file mode 100644
index b2d3c57..0000000
--- a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Workflow Clean Up
-type: module
-description: 'Cleans up Workflow cruft. (Do not enable in production sites.)'
-package: Workflow
-# core: 8.x
-dependencies:
- - workflow
-configure: workflow.cleanup.settings
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.links.task.yml b/modules/workflow/modules/workflow_cleanup/workflow_cleanup.links.task.yml
deleted file mode 100644
index 3b9bd94..0000000
--- a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.links.task.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Menu tasks for Workflow Cleanup.
-
-workflow.cleanup.settings:
- title: 'Cleanup'
- route_name: workflow.cleanup.settings
- base_route: entity.workflow_type.collection
- weight: 7
diff --git a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.module b/modules/workflow/modules/workflow_cleanup/workflow_cleanup.module
deleted file mode 100644
index 896b22f..0000000
--- a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.module
+++ /dev/null
@@ -1,26 +0,0 @@
-getPluginId());
- return hook_field_widget_form_alter($element, $form_state, $context);
-}
-
-function workflow_devel_field_widget_workflow_default_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
- // A hook specific for the 'workflow_default' widget.
- // D7: This hook is introduced in Drupal 7.8.
- // D8: This name is specified in the annotation of WorkflowDefaultWidget.
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
- return hook_field_widget_workflow_default_form_alter($element, $form_state, $context);
-}
-
-function workflow_devel_form_workflow_transition_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
- return hook_form_workflow_transition_form_alter($form, $form_state, $form_id);
-}
-
-function workflow_devel_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
- if (substr($form_id, 0, 8) == 'workflow') {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
- }
- return hook_form_alter($form, $form_state, $form_id);
-}
-
-/**
- * Hooks defined by core: Change the operations column in an Entity list.
- *
- * @see EntityListBuilder::getOperations()
- *
- * @return array
- */
-function workflow_devel_entity_operation($entities) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
- $operations = [];
- return $operations;
-}
-
-function workflow_devel_entity_operation_alter(array $operations, EntityInterface $entity) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, $entity->getEntityTypeId(), $entity->id());
-}
-
-/**
- * Hooks defined by core: hook_entity_CRUD.
- *
- * @see hook_entity_create(), hook_entity_update(), etc.
- * @see hook_ENTITY_TYPE_create(), hook_ENTITY_TYPE_update(), etc.
- */
-function workflow_devel_entity_create(EntityInterface $entity) {
- //workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'create' , $entity->getEntityTypeId());
-}
-function workflow_devel_entity_presave(EntityInterface $entity) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'presave', $entity->getEntityTypeId());
-}
-function workflow_devel_entity_insert(EntityInterface $entity) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'insert', $entity->getEntityTypeId());
-}
-function workflow_devel_entity_update(EntityInterface $entity) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'update', $entity->getEntityTypeId());
-}
-function workflow_devel_entity_predelete(EntityInterface $entity) {
- if (substr($entity->getEntityTypeId(), 0, 8) == 'workflow') {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'predelete', $entity->getEntityTypeId());
- }
- return hook_entity_predelete($entity);
-}
-function workflow_devel_entity_delete(EntityInterface $entity) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete', $entity->getEntityTypeId());
- return hook_entity_delete($entity);
-}
diff --git a/modules/workflow/modules/workflow_field/workflowfield.info.yml b/modules/workflow/modules/workflow_field/workflowfield.info.yml
deleted file mode 100644
index 2bd11b7..0000000
--- a/modules/workflow/modules/workflow_field/workflowfield.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Workflow Field'
-description: 'A residual submodule. No need to enable this module for installations with workflow 8.x-1.0-beta6 and later.'
-package: Workflow
-type: module
-# core: 8.x
-
-hidden: TRUE
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_operations/src/Form/WorkflowTransitionRevertForm.php b/modules/workflow/modules/workflow_operations/src/Form/WorkflowTransitionRevertForm.php
deleted file mode 100644
index 73dbbad..0000000
--- a/modules/workflow/modules/workflow_operations/src/Form/WorkflowTransitionRevertForm.php
+++ /dev/null
@@ -1,133 +0,0 @@
-entity;
- $state = $transition->getFromState();
-
- if ($state) {
- $question = t('Are you sure you want to revert %title to the "@state" state?', [
- '@state' => $state->label(),
- '%title' => $transition->label(),
- ]);
- return $question;
- }
- else {
- \Drupal::logger('workflow_revert')->error('Invalid state', []);
- drupal_set_message(t('Invalid transition. Your information has been recorded.'), 'error');
- //drupal_goto($return_uri);
- }
-
- return [];
- }
-
- public function getCancelUrl() {
- /* @var $transition WorkflowTransitionInterface */
- $transition = $this->entity;
- return new Url('entity.node.workflow_history', ['node' => $transition->getTargetEntityId(), 'field_name' => $transition->getFieldname()]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return t('Revert');
- }
-
- /**
- * {@inheritdoc}
- */
- //public function getDescription() {
- // return '';
- //}
-
- /**
- * The fact that we need to overwrite this function, is an indicator that
- * the Transition is not completely a complete Entity.
- *
- * {@inheritdoc}
- */
- protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
- //return parent::copyFormValuesToEntity($entity, $form, $form_state);
- return $this->entity;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, \Drupal\Core\Form\FormStateInterface $form_state) {
-
- // If Rules is available, signal the reversion.
- // @todo: move this Rules_invoke_event to hook outside this module.
- if (\Drupal::moduleHandler()->moduleExists('rules')) {
- rules_invoke_event('workflow_state_reverted', $this->entity);
- }
-
- /* @var $transition WorkflowTransitionInterface */
- $transition = $this->prepareRevertedTransition($this->entity);
-
- // The entity will be updated when the transition is executed. Keep the
- // original one for the confirmation message.
- $previous_sid = $transition->getToSid();
-
- // Force the transition because it's probably not valid.
- $transition->force(TRUE);
- $new_sid = workflow_execute_transition($transition, TRUE);
-
- $comment = ($previous_sid == $new_sid) ? 'State is reverted.' : 'State could not be reverted.';
- drupal_set_message(t($comment), 'warning');
-
- $form_state->setRedirect('entity.node.workflow_history', [
- 'node' => $transition->getTargetEntityId(),
- 'field_name' => $transition->getFieldName(),
- ]
- );
- }
-
- /**
- * Prepares a transition to be reverted.
- *
- * @param \Drupal\workflow\Entity\WorkflowTransitionInterface $transition
- * The transition to be reverted.
- *
- * @return \Drupal\workflow\Entity\WorkflowTransitionInterface
- * The prepared transition ready to be stored.
- */
- protected function prepareRevertedTransition(WorkflowTransitionInterface $transition) {
- $user = \Drupal::currentUser();
-
- $entity = $transition->getTargetEntity();
- $field_name = $transition->getFieldName();
- $current_sid = workflow_node_current_state($entity, $field_name);
- $previous_sid = $transition->getFromSid();
- $comment = t('State reverted.');
-
- $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
- $transition->setTargetEntity($entity);
- $transition->setValues($previous_sid, $user->id(), \Drupal::time()->getRequestTime(), $comment);
-
- return $transition;
- }
-
-}
diff --git a/modules/workflow/modules/workflow_operations/src/WorkflowAccessControlHandler.php b/modules/workflow/modules/workflow_operations/src/WorkflowAccessControlHandler.php
deleted file mode 100644
index 9b0db23..0000000
--- a/modules/workflow/modules/workflow_operations/src/WorkflowAccessControlHandler.php
+++ /dev/null
@@ -1,144 +0,0 @@
-entityTypeId = $entity_type->id();
- $this->entityType = $entity_type;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
- return new static(
- $entity_type
- );
- }
-
- /**
- * Access check, to be called from
- * - module.routing.yml
- * - hook_entity_operation
- *
- * @param \Drupal\workflow_operations\WorkflowTransitionInterface|null $transition
- *
- * @return \Drupal\Core\Access\AccessResult
- */
- public function revertAccess(WorkflowTransitionInterface $transition = NULL, AccountInterface $account = NULL, $return_as_object = TRUE) {
- if ($transition) {
- // Called from hook_entity_operation
- }
- else {
- // Called from module.routing.yml
- /* @var $transition WorkflowTransitionInterface */
- $route_match = \Drupal::routeMatch();
- $transition = $route_match->getParameter('workflow_transition');
- }
- return $this->access($transition, 'revert', $account, $return_as_object);
- }
-
- /**
- * {@inheritdoc}
- */
- public function access(EntityInterface $entity, $operation, AccountInterface $account = NULL, $return_as_object = FALSE) {
- $result = AccessResult::neutral();
-
- $account = $user = workflow_current_user($account);
-
- // This is only for Edit/Delete transition. For Add/create, use createAccess.
- switch ($entity->getEntityTypeId()) {
-
- case 'workflow_transition':
- case 'workflow_scheduled_transition':
- /* @var $transition WorkflowTransitionInterface */
- $transition = $entity;
-
- switch ($operation) {
- case 'revert':
- $is_owner = WorkflowManager::isOwner($user, $transition);
- $type_id = $transition->getWorkflowId();
- if ($transition->getFromSid() == $transition->getToSid()) {
- // No access for same state transitions.
- $result = AccessResult::forbidden();
- }
- elseif ($user->hasPermission("revert any $type_id workflow_transition")) {
- // OK, add operation.
- $result = AccessResult::allowed();
- }
- elseif ($is_owner && $user->hasPermission("revert own $type_id workflow_transition")) {
- // OK, add operation.
- $result = AccessResult::allowed();
- }
- else {
- // No access.
- $result = AccessResult::forbidden();
- }
- break;
-
- default:
- $result = parent::access($entity, $operation, $account, $return_as_object)->cachePerPermissions();
- break;
- } // End of switch ($operation).
-
- break; // case
-
- default: // $entity_type
- $result = AccessResult::forbidden();
- } // End of switch($entity->getEntityTypeId()).
-
- return $return_as_object ? $result : $result->isAllowed();
- }
-
- /**
- * {@inheritdoc}
- */
- public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = [], $return_as_object = FALSE) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- $result = parent::createAccess($entity_bundle, $account, $context, TRUE)->cachePerPermissions();
- return $return_as_object ? $result : $result->isAllowed();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function checkAccess(EntityInterface $transition, $operation, AccountInterface $account) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- return parent::checkAccess($transition, $operation, $account);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- return AccessResult::allowedIf($account->hasPermission('create ' . $entity_bundle . ' content'))->cachePerPermissions();
- }
-
-}
diff --git a/modules/workflow/modules/workflow_operations/src/WorkflowPermissions.php b/modules/workflow/modules/workflow_operations/src/WorkflowPermissions.php
deleted file mode 100644
index c48b273..0000000
--- a/modules/workflow/modules/workflow_operations/src/WorkflowPermissions.php
+++ /dev/null
@@ -1,71 +0,0 @@
-id();
- $type_params = ['%type_name' => $type->label()];
-
- return [
- // D7->D8-Conversion of 'edit workflow comment' permission to "edit own $type_id transition" (@see NodePermissions::edit any/own content).
- // D7->D8-Conversion of 'edit workflow comment' permission to "edit any $type_id transition" (@see NodePermissions::edit any/own content).
- "edit own $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Edit own comments', $type_params),
- 'description' => t('Edit the comment of own executed state transitions.'),
- 'restrict access' => TRUE,
- ],
- "edit any $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Edit any comments', $type_params),
- 'description' => t('Edit the comment of any executed state transitions.'),
- 'restrict access' => TRUE,
- ],
- /*
- // Workflow has no 'delete' permissions.
- "delete own $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Delete own content', $type_params),
- ],
- "delete any $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Delete any content', $type_params),
- ],
- */
- // D7->D8-Conversion of 'revert workflow' permission to "revert any/own $type_id transition"
- "revert own $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Revert own state transition', $type_params),
- 'description' => t('Allow user to revert own last executed state transition on entity.'),
- 'restrict access' => TRUE,
- ],
- "revert any $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Revert any state transition', $type_params),
- 'description' => t('Allow user to revert any last executed state transition on entity.'),
- 'restrict access' => TRUE,
- ],
- ];
- }
-
-}
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.info.yml b/modules/workflow/modules/workflow_operations/workflow_operations.info.yml
deleted file mode 100644
index 841bed9..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Workflow operations'
-description: "Adds lesser-used Transition permissions (edit, revert, delete permissions)."
-package: Workflow
-type: module
-# core: 8.x
-
-dependencies:
- - workflow
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.module b/modules/workflow/modules/workflow_operations/workflow_operations.module
deleted file mode 100644
index 4f06f01..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.module
+++ /dev/null
@@ -1,97 +0,0 @@
- [
- 'group' => t('Workflow'),
- 'label' => t('Workflow state reverted'),
- 'variables' => rules_events_node_variables(t('updated content'), TRUE),
- ],
- ];
- return $events;
-}
-
-/**
- * Core hooks: Change the operations column in a Entity list.
- * Add a 'revert' operation.
- *
- * @see EntityListBuilder::getOperations()
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- *
- * @return array
- */
-function workflow_operations_entity_operation(\Drupal\Core\Entity\EntityInterface $entity) {
- $operations = [];
-
- // Check correct entity type.
- if (!in_array($entity->getEntityTypeId(), ['workflow_transition'])) {
- return $operations;
- }
-
- $user = workflow_current_user();
- /* @var $transition WorkflowTransitionInterface */
- $transition = $entity;
-
- // Check access, to avoid that user sees a revert link, but is not allowed to
- // view the revert form. Use $first to check only once per page.
- static $first = TRUE;
-
- if ($first) {
- $handler = new WorkflowAccessControlHandler();
- $is_allowed = $handler->access($transition, 'revert', $user, FALSE);
- if (!$is_allowed) {
- // No access. We may try at next row.
- return $operations;
- }
- }
-
- // Only mark the first row.
- if ($first) {
- // Some states are not fit to revert to. In each of these cases, prohibit
- // to revert to an even older state.
- if ((!$from_state = $transition->getFromState()) || !$from_state->isActive() || $from_state->isCreationState()) {
- $first = FALSE;
- }
- else {
- // Let's ask other modules if the reversion is allowed. Reversing old and new sid!
- $permitted = \Drupal::moduleHandler()->invokeAll('workflow', ['transition revert', $transition, $user]); // @todo: add revert operation.
- // Stop if a module says so.
- if (!in_array(FALSE, $permitted, TRUE)) {
- // Add the operation - it is not vetoed.
- // @todo: Pluggability problem: the revert_form route is fixed in WorkflowTransition Annotation. Add to some alter() function.
- $operations['revert'] = [
- 'title' => t('Revert to last state'),
- 'url' => \Drupal\Core\Url::fromRoute('entity.workflow_transition.revert_form', ['workflow_transition' => $transition->id()]),
- 'query' => \Drupal::destination()->getAsArray(), // Add destination.
- 'weight' => 50,
- ];
-
- $first = FALSE;
- }
- }
- }
-
- return $operations;
-}
-
-/**
- * Implements hook_entity_operation_alter
- * This hook is not needed in this case.
- */
-//function workflow_operations_entity_operation_alter(array $operations, \Drupal\Core\Entity\EntityInterface $entity) {
-//}
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.permissions.yml b/modules/workflow/modules/workflow_operations/workflow_operations.permissions.yml
deleted file mode 100644
index b1281dc..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.permissions.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-permission_callbacks:
- - \Drupal\workflow_operations\WorkflowPermissions::workflowTypePermissions
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.routing.yml b/modules/workflow/modules/workflow_operations/workflow_operations.routing.yml
deleted file mode 100644
index 7c95012..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.routing.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-### Workflow Transition CRUD
-entity.workflow_transition.revert_form:
- path: '/workflow_transition/{workflow_transition}/revert'
- defaults:
- _entity_form: 'workflow_transition.revert'
- _title: 'Revert Workflow transition'
- requirements:
-# _entity_access: 'workflow_transition.revert'
- _custom_access: '\Drupal\workflow_operations\WorkflowAccessControlHandler::revertAccess'
-# _access: 'true'
diff --git a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowListBuilder.php b/modules/workflow/modules/workflow_ui/src/Controller/WorkflowListBuilder.php
deleted file mode 100644
index 59550bd..0000000
--- a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowListBuilder.php
+++ /dev/null
@@ -1,104 +0,0 @@
-t('ID');
- $header['label'] = $this->t('Label');
- $header['status'] = $this->t('Status');
-
- return $header + parent::buildHeader();
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- /* @var $entity \Drupal\workflow\Entity\Workflow */
- $row['id'] = $entity->id();
- $row['label'] = $this->getLabel($entity);
- $row['status'] = ''; // TODO $entity->getStatus();
-
- return $row + parent::buildRow($entity);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDefaultOperations(EntityInterface $entity) {
- $operations = parent::getDefaultOperations($entity);
-
- /* @var $workflow \Drupal\workflow\Entity\Workflow */
- $workflow = $entity;
-
- // Do not delete a Workflow if it contains content.
- if (isset($operations['delete']) && !$workflow->isDeletable()) {
- unset ($operations['delete']);
- }
-
- /**
- * Allow modules to insert their own workflow operations to the list.
- */
- // This is what EntityListBuilder::getOperations() does:
- // $operations = $this->getDefaultOperations($entity);
- // $operations += $this->moduleHandler()->invokeAll('entity_operation', [$entity]);
- // $this->moduleHandler->alter('entity_operation', $operations, $entity);
-
- // In D8, the interface of below hook_workflow_operations has changed a bit.
- // @see EntityListBuilder::getOperations, workflow_operations, workflow.api.php.
- $operations += $this->moduleHandler()->invokeAll('workflow_operations', ['workflow', $workflow]);
-
- return $operations;
- }
-
- /**
- * {@inheritdoc}
- */
- public function render() {
- $build = parent::render();
-
- /**
- * Allow modules to insert their own top_action links to the list, like cleanup module.
- *
- * This is not done anymore via the workflow hook.
- * Instead, for an example:
- * @see workflow_ui.links.action.yml
- * @see workflow.api.php under 'hook_workflow_operations'.
- */
- // $top_actions = \Drupal::moduleHandler()
- // ->invokeAll('workflow_operations', ['top_actions', NULL]);
- // $top_actions_args = [
- // 'links' => $top_actions,
- // 'attributes' => ['class' => ['inline', 'action-links']],
- // ];
-
- return $build;
- }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowStateListBuilder.php b/modules/workflow/modules/workflow_ui/src/Controller/WorkflowStateListBuilder.php
deleted file mode 100644
index ad03f76..0000000
--- a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowStateListBuilder.php
+++ /dev/null
@@ -1,421 +0,0 @@
-id();
-
- $entities = parent::load();
- foreach ($entities as $key => $entity) {
- if (!isset($entity->wid) || $entity->wid != $wid) {
- unset($entities[$key]);
- }
- }
-
- return $entities;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'workflow_state_form';
- //return parent::getFormId();
- }
-
- /**
- * {@inheritdoc}
- *
- * Building the header and content lines for the contact list.
- *
- * Calling the parent::buildHeader() adds a column for the possible actions
- * and inserts the 'edit' and 'delete' links as defined for the entity type.
- */
- public function buildHeader() {
- // The column 'weight' is added magically in the draggable EntityList.
- // $header['weight'] = $this->t('Weight');
- // Some columns are not welcome in the list.
- // $header['module'] = $this->t('Module');
- // $header['wid'] = $this->t('Workflow');
- // $header['sysid'] = $this->t('Sysid');
- // Column 'label' is manipulated in parent::buildForm(). So, we use 'label_new'.
- // $header['label'] = $this->t('Label');
- $header['label_new'] = $this->t('Label');
- $header['id'] = $this->t('ID');
- $header['sysid'] = '';
- $header['status'] = $this->t('Active');
- $header['reassign'] = $this->t('Reassign');
- $header['count'] = $this->t('Count');
-
- return $header + parent::buildHeader();
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- $row = [];
-
- // Get the Workflow from the page.
- /* @var $workflow \Drupal\workflow\Entity\Workflow */
- if (!$workflow = workflow_url_get_workflow()) {
- workflow_debug( __FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- }
- $wid = $url_wid = $workflow->id();
-
- /* @var $entity \Drupal\workflow\Entity\WorkflowState */
- $state = $entity;
- $sid = $state->id();
- $label = $state->label();
- $count = $state->count();
-
- // Build select options for reassigning states.
- // We put a blank state first for validation.
- $state_options = ['' => ' '];
- $state_options += workflow_get_workflow_state_names($wid, $grouped = FALSE, $all = FALSE);
-
- // Make it impossible to reassign to the same state that is disabled.
- if ($state->isCreationState() || !$sid || !$state->isActive()) {
- $current_state_options = [];
- }
- else {
- $current_state = [$sid => $state_options[$sid]];
- $current_state_options = array_diff($state_options, $current_state);
- }
-
- /*
- * Build the Row.
- */
- // The column 'weight' is added magically in the draggable EntityList.
- // $row['weight'] = $state->weight;
- // Some columns are not welcome in the list.
- // $row['module'] = $state->getModule();
- // $row['wid'] = $state->getWorkflow();
- // Column 'label' is manipulated in parent::buildForm(). So, we use 'label_new'.
- // $row['label'] = $state->label();
- $row['label_new'] = [
- '#markup' => $label,
- '#type' => 'textfield',
- '#size' => 30,
- '#maxlength' => 255,
- '#default_value' => $label,
- '#title' => NULL, // This hides the red 'required' asterisk.
- // '#required' => TRUE,
- ];
- $row['id'] = [
- '#type' => 'machine_name',
- '#title' => NULL, // This hides the red 'required' asterisk.
- '#size' => 30,
- '#description' => NULL,
- '#disabled' => TRUE, // !$state->isNew(),
- '#default_value' => $state->id(),
- // N.B.: Keep machine_name in WorkflowState and ~ListBuilder aligned.
- '#required' => FALSE,
- // @TODO D8-port: enable machine_name: interactive WorkflowState element.
- '#machine_name' => [
- 'exists' => [$this, 'exists'], // Local helper function, at the bottom of this class.
-// 'source' => ['label_new'],
- 'source' => ['states', $state->id(), 'label_new'],
-// 'replace_pattern' =>'([^a-z0-9_]+)|(^custom$)',
- 'replace_pattern' => '[^a-z0-9_()]+', // Added '()' characters from exclusion list since creation state has it.
- 'error' => $this->t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores.'),
- ],
- ];
- $row['sysid'] = [
- '#type' => 'value',
- '#value' => $state->sysid,
- ];
- $row['status'] = [
- '#type' => 'checkbox',
- '#default_value' => $state->isActive(),
- ];
- // The new value of states that are inactivated.
- $row['reassign'] = [
- '#type' => 'select',
- '#options' => $current_state_options,
- ];
- $row['count'] = [
- '#type' => 'value',
- '#value' => $count,
- '#markup' => $count,
- ];
-
- // Don't let the creation state change weight or status or name.
- if ($state->isCreationState()) {
- $row['label_new']['#disabled'] = TRUE;
- $row['status']['#disabled'] = TRUE;
- $row['reassign']['#type'] = 'hidden';
- $row['reassign']['#disabled'] = TRUE;
- }
- // New state and disabled states cannot be reassigned.
- if (!$sid || !$state->isActive() || ($count == 0) ) {
- $row['reassign']['#type'] = 'hidden';
- $row['reassign']['#disabled'] = TRUE;
- }
- // Disabled states cannot be renamed (and is a visual clue, too).
- if (!$state->isActive()) {
- $row['label_new']['#disabled'] = TRUE;
- }
-
- return $row + parent::buildRow($entity);
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- // Get the Workflow from the page.
- /* @var $workflow \Drupal\workflow\Entity\Workflow */
- if (!$workflow = workflow_url_get_workflow()) {
- return $form;
- }
- $wid = $workflow->getWorkflowId();
-
- $form = parent::buildForm($form, $form_state);
- // Add a sticky header.
- $form[$this->entitiesKey] += [
- '#sticky' => TRUE,
- ];
-
- // Build select options for reassigning states.
- // We put a blank state first for validation.
- $state_options = workflow_get_workflow_state_names($wid, $grouped = FALSE, $all = FALSE);
- // Is this the last state available?
- $form['#last_mohican'] = (count($state_options) == 1);
-
- // Create a placeholder WorkflowState (It must NOT be saved to DB). Add it to the item list.
- $sid = '';
- $placeholder = $workflow->createState($sid, FALSE);
- $placeholder->set('label', '');
- $this->entities['placeholder'] = $placeholder;
- $form['entities']['placeholder'] = $this->buildRow($placeholder);
-
- // Rename 'submit' button.
- $form['actions']['submit']['#value'] = t('Save');
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDefaultOperations(EntityInterface $entity) {
- $operations = parent::getDefaultOperations($entity);
-
- /* @var $state \Drupal\workflow\Entity\WorkflowState */
- $state = $entity;
-
- // $workflow = $state->getWorkflow();
-
- /**
- * Allow modules to insert their own workflow operations to the list.
- */
- // This is what EntityListBuilder::getOperations() does:
- // $operations = $this->getDefaultOperations($entity);
- // $operations += $this->moduleHandler()->invokeAll('entity_operation', [$entity]);
- // $this->moduleHandler->alter('entity_operation', $operations, $entity);
-
- // In D8, the interface of below hook_workflow_operations has changed a bit.
- // @see EntityListBuilder::getOperations, workflow_operations, workflow.api.php.
- $operations += $this->moduleHandler()->invokeAll('workflow_operations', ['state', $state]);
-
- return $operations;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
-
- foreach ($form_state->getValue($this->entitiesKey) as $sid => $value) {
- if (isset($this->entities[$sid])) {
- /* @var $state WorkflowState */
- $state = $this->entities[$sid];
-
- // Does user want to deactivate the state (reassign current content)?
- if ($sid && $value['status'] == 0 && $state->isActive()) {
- workflow_debug( __FILE__, __FUNCTION__, __LINE__, '', ''); // @todo D8-port: still test this snippet.
- $args = ['%state' => $state->label()];
- // Does that state have content in it?
- if ($value['count'] > 0 && empty($value['reassign'])) {
- if ($form['#last_mohican']) {
- $message = 'Since you are deleting the last available
- workflow state in this workflow, all content items
- which are in that state will have their workflow state
- removed.';
- drupal_set_message($this->t($message, $args), 'warning');
- }
- else {
- $message = 'The %state state has content; you must
- reassign the content to another state.';
- $form_state->setErrorByName("states'][$sid]['reassign'", $this->t($message, $args));
- }
- }
- }
-
- // Create the machine_name for new states.
- // N.B.: Keep machine_name in WorkflowState and ~ListBuilder aligned.
- if ($value['label_new'] && !$value['id']) {
- //$message = 'Machine name is required.';
- //$form_state->setErrorByName('machine_name', $this->t($message));
- }
-
- }
- }
- return;
- }
-
- /**
- * {@inheritdoc}
- *
- * Overrides DraggableListBuilder::submitForm().
- * The WorkflowState entities are always saved.
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- // parent::submitForm($form, $form_state);
-
- // Get the Workflow from the page.
- /* @var $workflow \Drupal\workflow\Entity\Workflow */
- if (!$workflow = workflow_url_get_workflow()) {
- return ;
- }
-
- // The default min_weight is -10. Work with it.
- $creation_weight = -11;
- $maxweight = $minweight = -9;
- foreach ($form_state->getValue($this->entitiesKey) as $sid => $value) {
- if (isset($this->entities[$sid])) {
- /* @var $state WorkflowState */
- $state = $this->entities[$sid];
-
- // Is the new state name empty?
- if (empty($value['label_new'])) {
- // No new state entered, so skip it.
- continue;
- }
-
- // Does user want to deactivate the state (reassign current content)?
- if ($sid && $value['status'] == 0 && $state->isActive()) {
- $new_sid = $value['reassign'];
- $new_state = WorkflowState::load($new_sid);
-
- $args = [
- '%workflow' => $workflow->label(),
- '%old_state' => $state->label(),
- '%new_state' => isset($new_state) ? $new_state->label() : '',
- ];
-
- if ($value['count'] > 0) {
- if ($form['#last_mohican']) {
- $new_sid = NULL; // Do not reassign to new state.
- $message = 'Removing workflow states from content in the %workflow.';
- drupal_set_message($this->t($message, $args));
- }
- else {
- // Prepare the state delete function.
- $message = 'Reassigning content from %old_state to %new_state.';
- drupal_set_message($this->t($message, $args));
- }
- }
- // Delete the old state without orphaning content, move them to the new state.
- $state->deactivate($new_sid);
-
- $message = $this->t('Deactivated workflow state %old_state in %workflow.', $args);
- \Drupal::logger('workflow')->notice($message, []);
- drupal_set_message($message);
- }
-
- // Set a proper weight to the new state.
- $maxweight = max($maxweight, $state->get($this->weightKey));
-
- // Is this a new state?
- if ($sid == 'placeholder' && empty(!$value['label_new'])) {
- // New state, add it.
- $state->set('id', $value['id']);
- // Set a proper weight to the new state.
- $state->set($this->weightKey, $maxweight + 1);
- }
- elseif ($value['sysid'] == WORKFLOW_CREATION_STATE) {
- // Set a proper weight to the creation state.
- $state->set($this->weightKey, $creation_weight);
- }
- else {
- $state->set($this->weightKey, $value['weight']);
- }
- $state->set('label', $value['label_new']);
- $state->set('status', $value['status']);
-
- $state->save();
- }
-
- }
- drupal_set_message(t('The Workflow states have been updated.'));
-
- return;
- }
-
- /**
- * Validate duplicate machine names. Function registered in 'machine_name'
- * form element.
- *
- * @param string $name
- * @param array $element
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- *
- * @return bool
- */
- function exists($name, array $element, FormStateInterface $form_state) {
- $state_names = [];
- foreach ($form_state->getValue($this->entitiesKey) as $sid => $value) {
- $state_names[] = $value['id'];
- }
-
- $state_names = array_map('strtolower', $state_names);
- $result = array_unique(array_diff_assoc($state_names, array_unique($state_names)));
-
- if (in_array($name, $result)) {
- return TRUE;
- }
- return FALSE;
- }
-
- /**
- * Returns the form builder.
- *
- * @return \Drupal\Core\Form\FormBuilderInterface
- * The form builder.
- */
- protected function formBuilder() {
- if (!$this->formBuilder) {
- $this->formBuilder = \Drupal::formBuilder();
- }
- return $this->formBuilder;
- }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowUiController.php b/modules/workflow/modules/workflow_ui/src/Controller/WorkflowUiController.php
deleted file mode 100644
index 6287a72..0000000
--- a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowUiController.php
+++ /dev/null
@@ -1,24 +0,0 @@
- 'Workflow settings form is not implemented yet.',
- ];
- return $element;
- }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionFormBase.php b/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionFormBase.php
deleted file mode 100644
index 71b513d..0000000
--- a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionFormBase.php
+++ /dev/null
@@ -1,191 +0,0 @@
-type and $this->entitiesKey must be set in the var section.
-
- // Get the Workflow from the page.
- $this->workflow = workflow_url_get_workflow();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'workflow_config_transition_' . $this->type . '_form';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEditableConfigNames() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- *
- * Create an $entity for every ConfigTransition.
- */
- public function load() {
- $entities = [];
-
- $entity_type = $this->entitiesKey;
- $workflow = $this->workflow;
- $states = $workflow->getStates($all = 'CREATION');
-
- if ($states) {
- /* @var $from_state WorkflowState */
- /* @var $to_state WorkflowState */
- switch ($entity_type) {
- case 'workflow_state':
- foreach ($states as $from_state) {
- $from_sid = $from_state->id();
- $entities[$from_sid] = $from_state;
- }
- break;
-
- case 'workflow_config_transition':
- foreach ($states as $from_state) {
- $from_sid = $from_state->id();
- foreach ($states as $to_state) {
- $to_sid = $to_state->id();
-
- // Don't allow transition TO (creation).
- if ($to_state->isCreationState()) {
- continue;
- }
-// // Only allow transitions from $from_state.
-// if ($state->id() <> $from_state->id()) {
-// continue;
-// }
-
- // Load existing config_transitions. Create if not found.
- $config_transitions = $workflow->getTransitionsByStateId($from_sid, $to_sid);
- if (!$config_transition = reset($config_transitions)) {
- $config_transition = $workflow->createTransition($from_sid, $to_sid);
- }
- $entities[] = $config_transition;
- }
- }
- break;
-
- default:
- drupal_set_message(t('Improper type provided in load method.'), 'error');
- \Drupal::logger('workflow_ui')->notice('Improper type provided in load method.', []);
- return $entities;
- }
- }
- return $entities;
- }
-
- /**
- * {@inheritdoc}
- */
-// abstract public function buildHeader();
-
- /**
- * {@inheritdoc}
- */
-// abstract public function buildRow(EntityInterface $entity);
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- $form = [];
-
- if (!$this->workflow) {
- return $form;
- }
-
- /*
- * Begin of copied code DraggableListBuilder::buildForm()
- */
- $form[$this->entitiesKey] = [
- '#type' => 'table',
- '#header' => $this->buildHeader(),
- '#sticky' => TRUE,
- '#empty' => t('There is no @label yet.', ['@label' => 'Transition']),
- '#tabledrag' => [['action' => 'order', 'relationship' => 'sibling', 'group' => 'weight', ], ],
- ];
-
- $this->entities = $this->load();
- $delta = 10;
- // Change the delta of the weight field if have more than 20 entities.
- if (!empty($this->weightKey)) {
- $count = count($this->entities);
- if ($count > 20) {
- $delta = ceil($count / 2);
- }
- }
- foreach ($this->entities as $entity) {
- $row = $this->buildRow($entity);
- if (isset($row['label'])) {
- $row['label'] = ['#markup' => $row['label']];
- }
- if (isset($row['weight'])) {
- $row['weight']['#delta'] = $delta;
- }
- $form[$this->entitiesKey][$entity->id()] = $row;
- }
- /*
- * End of copied code DraggableListBuilder::buildForm()
- */
-
- $form = parent::buildForm($form, $form_state);
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- parent::validateForm($form, $form_state);
- }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionLabelForm.php b/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionLabelForm.php
deleted file mode 100644
index 090f3f9..0000000
--- a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionLabelForm.php
+++ /dev/null
@@ -1,103 +0,0 @@
- t('Transition from'),
- 'to' => t('Transition to'),
- 'label_new' => t('label'),
- 'config_transition' => '',
- ];
-
- return $header;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildRow(EntityInterface $entity) {
- $row = [];
-
- $workflow = $this->workflow;
- if ($workflow) {
- /* @var $entity \Drupal\workflow\Entity\WorkflowConfigTransition */
- $config_transition = $entity;
-
- static $previous_from_sid = -1;
- // Get transitions, sorted by weight of the old state.
- $from_state = $config_transition->getFromState();
- $to_state = $config_transition->getToState();
- $from_sid = $from_state->id();
-
- // Skip the transitions without any roles.
- $skip = TRUE;
- foreach ($config_transition->roles as $rid => $active) {
- if ($active) {
- $skip = FALSE;
- }
- }
- if ($skip == TRUE && ($from_state != $to_state)) {
- return $row;
- }
-
- $row['from'] = [
- '#type' => 'value',
- '#markup' => ($previous_from_sid != $from_sid) ? $from_state->label() : '"',
- ];
- $row['to'] = [
- '#type' => 'value',
- '#markup' => $to_state->label(),
- ];
- $row['label_new'] = [
- '#type' => 'textfield',
- '#default_value' => $config_transition->get('label'),
- ];
- $row['config_transition'] = [
- '#type' => 'value',
- '#value' => $config_transition,
- ];
-
- $previous_from_sid = $from_sid;
- }
- return $row;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- foreach ($form_state->getValue($this->entitiesKey) as $key => $value) {
- $new_label = trim($value['label_new']);
- $value['config_transition']
- ->set('label', $new_label)
- ->save();
- }
-
- drupal_set_message(t('The transition labels have been saved.'));
- }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionRoleForm.php b/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionRoleForm.php
deleted file mode 100644
index 19377ad..0000000
--- a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionRoleForm.php
+++ /dev/null
@@ -1,181 +0,0 @@
-workflow;
- $states = $workflow->getStates($all = 'CREATION');
- if ($states) {
- $header['label_new'] = t('From \ To');
-
- /* @var $state WorkflowState */
- foreach ($states as $state) {
- // Don't allow transition TO (creation).
- if (!$state->isCreationState()) {
- $header[$state->id()] = t('@label', ['@label' => $state->label()]);
- }
- }
- }
- return $header;
- }
-
- /**
- * {@inheritdoc}
- *
- * Builds a row for the following table:
- * Transitions, for example:
- * 18 => [
- * 20 => [
- * 'author' => 1,
- * 1 => 0,
- * 2 => 1,
- * ]
- * ]
- * means the transition from state 18 to state 20 can be executed by
- * the content author or a user in role 2. The $transitions array should
- * contain ALL transitions for the workflow.
- */
- public function buildRow(EntityInterface $entity) {
- $row = [];
-
- $workflow = $this->workflow;
- if ($workflow) {
- // Each $entity is a from-state.
- /* @var $entity \Drupal\workflow\Entity\WorkflowState */
- $from_state = $entity;
- $from_sid = $from_state->id();
-
- /* @var $states WorkflowState[] */
- $states = $workflow->getStates($all = 'CREATION');
- if ($states) {
- // Only get the roles with proper permission + Author role.
- $type_id = $workflow->id();
- $roles = workflow_get_user_role_names("create $type_id workflow_transition");
- // Prepare default value for 'stay_on_this_state'.
- $allow_all_roles = []; // array_combine (array_keys($roles) , array_keys($roles));
-
- /* @var $state WorkflowState */
- foreach ($states as $state) {
- $row['to'] = [
- '#type' => 'value',
- '#markup' => t('@label', ['@label' => $from_state->label()]),
- ];
-
- /* @var $to_state WorkflowState */
- foreach ($states as $to_state) {
- // Don't allow transition TO (creation).
- if ($to_state->isCreationState()) {
- continue;
- }
- // Only allow transitions from $from_state.
- if ($state->id() <> $from_state->id()) {
- continue;
- }
- $to_sid = $to_state->id();
- $stay_on_this_state = ($to_sid == $from_sid);
-
- // Load existing config_transitions. Create if not found.
- $config_transitions = $workflow->getTransitionsByStateId($from_sid, $to_sid);
- if (!$config_transition = reset($config_transitions)) {
- $config_transition = $workflow->createTransition($from_sid, $to_sid);
- }
-
- $row[$to_sid]['workflow_config_transition'] = ['#type' => 'value', '#value' => $config_transition, ];
- $row[$to_sid]['roles'] = [
- '#type' => $stay_on_this_state ? 'checkboxes' : 'checkboxes',
- '#options' => $stay_on_this_state ? [] : $roles,
- '#disabled' => $stay_on_this_state,
- // When $stay_on_this_state, allow all roles.
- '#default_value' => $stay_on_this_state ? $allow_all_roles : $config_transition->roles,
- ];
- }
- }
- }
- }
- return $row;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- $workflow = $this->workflow;
- // Make sure 'author' is checked for (creation) -> [something].
- $creation_state = $workflow->getCreationState();
-
- if (empty($form_state->getValue($this->entitiesKey))) {
- $author_has_permission = TRUE;
- }
- else {
- $author_has_permission = FALSE;
- foreach ($form_state->getValue($this->entitiesKey) as $from_sid => $to_data) {
- foreach ($to_data as $to_sid => $transition_data) {
- if ($from_sid == $to_sid) {
- // Same-state-transition do not count.
- }
- elseif (!empty($transition_data['roles'][WORKFLOW_ROLE_AUTHOR_RID])) {
- $author_has_permission = TRUE;
- break;
- }
- }
- }
- }
- if (!$author_has_permission) {
- $form_state->setErrorByName('id', t('Please give the author permission to go from %creation to at least one state!',
- ['%creation' => $creation_state->label()]));
- }
-
- return;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
-
- foreach ($form_state->getValue($this->entitiesKey) as $from_sid => $to_data) {
- foreach ($to_data as $transition_data) {
- /* @var $config_transition WorkflowConfigTransition */
- if (isset($transition_data['workflow_config_transition'])) {
- $config_transition = $transition_data['workflow_config_transition'];
- $config_transition->roles = $transition_data['roles'];
- $config_transition->save();
- }
- else {
- // Should not be possible.
- // $config_transition = [];
- }
- }
- }
-
- drupal_set_message(t('The workflow was updated.'));
- }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.info.yml b/modules/workflow/modules/workflow_ui/workflow_ui.info.yml
deleted file mode 100644
index d777b01..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.info.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 'Workflow UI'
-description: 'Administrative UI for Workflow.'
-package: Workflow
-type: module
-# core: 8.x
-# version: VERSION
-
-configure: entity.workflow_type.collection
-
-dependencies:
- - workflow
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.install b/modules/workflow/modules/workflow_ui/workflow_ui.install
deleted file mode 100644
index c2b2f66..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.install
+++ /dev/null
@@ -1,24 +0,0 @@
- 'module-workflow']);
- $message = t("Please review which roles may 'participate in workflows'
- on the Permissions page .",
- [':url' => $url->toString()]);
- drupal_set_message($message);
-}
-
-/**
- * Drupal 8 updates.
- */
-function workflow_ui_update_8001(&$sandbox) {
-}
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.links.action.yml b/modules/workflow/modules/workflow_ui/workflow_ui.links.action.yml
deleted file mode 100644
index 6e43aff..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.links.action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Action links for Workflow UI.
-
-### Workflow related actions.
-workflow_type_add_action:
- route_name: entity.workflow_type.add_form
- title: 'Add workflow'
- weight: 1
- appears_on:
- - entity.workflow_type.collection
-
-### Workflow State related actions.
-
-### Workflow Transition related actions.
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.links.menu.yml b/modules/workflow/modules/workflow_ui/workflow_ui.links.menu.yml
deleted file mode 100644
index 66f173f..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.links.menu.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Menu links for Workflow UI.
-
-workflow.ui.workflows:
- title: 'Workflow'
- route_name: entity.workflow_type.collection
- parent: system.admin_config_workflow
- description: 'Workflow administration overview.'
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.links.task.yml b/modules/workflow/modules/workflow_ui/workflow_ui.links.task.yml
deleted file mode 100644
index 573c111..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.links.task.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Menu tasks for Workflow UI.
-
-workflow.ui.settings:
- title: 'Settings'
- route_name: workflow.ui.settings
- base_route: entity.workflow_type.collection
- weight: 9
-workflow.ui.workflows:
- title: 'Workflows'
- route_name: entity.workflow_type.collection
- base_route: entity.workflow_type.collection
- weight: 1
-
-workflow.ui.workflow_states:
- title: 'States'
- route_name: entity.workflow_state.collection
- base_route: entity.workflow_type.edit_form
- weight: -4
-workflow.ui.workflow_transitions:
- title: 'Transitions'
- route_name: entity.workflow_transition.collection
- base_route: entity.workflow_type.edit_form
- weight: -3
-workflow.ui.workflow_labels:
- title: 'Transition labels'
- route_name: entity.workflow_label.collection
- base_route: entity.workflow_type.edit_form
- weight: -2
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.module b/modules/workflow/modules/workflow_ui/workflow_ui.module
deleted file mode 100644
index bfce242..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.module
+++ /dev/null
@@ -1,93 +0,0 @@
-'
- . t("A state must be marked as active, to be available in the
- workflow's transitions.") . ''
- . t("If not all roles are in the list, please review which roles may
- 'participate in workflows' on the Permissions page .
- On that page, uncheck the 'Authenticated user' role temporarily to
- view the permissions of each separate role. ",
- [':url' => $url->toString()]);
-
- case 'entity.workflow_label.collection':
- return t('You can add labels to transitions if you don\'t like the
- standard state labels. They will modify the Workflow form options, so
- specific workflow transitions can have their own labels, relative to
- the beginning and ending states. Rather than showing the user a
- workflow box containing options like "review required" as a state in
- the workflow, it could say "move to the editing department for grammar
- review".');
- }
- return [];
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @deprecated : @see workflow_url_get_workflow .
- */
-function workflow_ui_url_get_workflow($url = '' ) {
- return workflow_url_get_workflow($url);
-}
-
-/**
- * Helper function to determine the title of the page.
- *
- * @deprecated : @see workflow_url_get_title .
- */
-function workflow_ui_url_get_title() {
- return workflow_url_get_title();
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @deprecated : @see workflow_url_get_form_type .
- */
-function workflow_ui_url_get_form_type($url = '' ) {
- return workflow_url_get_form_type($url);
-}
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.routing.yml b/modules/workflow/modules/workflow_ui/workflow_ui.routing.yml
deleted file mode 100644
index 93c16fc..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.routing.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Declaration of Workflow UI routings.
-
-# copy from WorkflowUIController.php
-# https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Entity%21entity.api.php/group/entity_api/8
-
-### Workflow settings form
-workflow.ui.settings:
- path: '/admin/config/workflow/workflow/settings'
- defaults:
- _controller: '\Drupal\workflow_ui\Controller\WorkflowUiController::settingsForm'
- _title: 'Workflow settings'
- requirements:
- _permission: 'administer workflow'
-
-
-### Workflow States
-entity.workflow_state.collection:
- path: '/admin/config/workflow/workflow/{workflow_type}/states'
- defaults:
- _entity_list: 'workflow_state'
-# _controller: '\workflow\EntityWorkflowUIController::adminOverview'
- _title: 'Edit Workflow'
- _title_callback: 'workflow_url_get_title'
- requirements:
- _permission: 'administer workflow'
-
-
-### Workflow Transitions
-entity.workflow_transition.collection:
- path: '/admin/config/workflow/workflow/{workflow_type}/transition_roles'
- defaults:
- _form: 'Drupal\workflow_ui\Form\WorkflowConfigTransitionRoleForm'
- _title: 'Edit Workflow'
- _title_callback: 'workflow_url_get_title'
- requirements:
- _permission: 'administer workflow'
-
-### Workflow Labels
-entity.workflow_label.collection:
- path: '/admin/config/workflow/workflow/{workflow_type}/transition_labels'
- defaults:
- _form: 'Drupal\workflow_ui\Form\WorkflowConfigTransitionLabelForm'
- _title: 'Edit Workflow'
- _title_callback: 'workflow_url_get_title'
- requirements:
- _permission: 'administer workflow'
diff --git a/modules/workflow/src/Controller/WorkflowTransitionListController.php b/modules/workflow/src/Controller/WorkflowTransitionListController.php
deleted file mode 100644
index 225fd28..0000000
--- a/modules/workflow/src/Controller/WorkflowTransitionListController.php
+++ /dev/null
@@ -1,203 +0,0 @@
-dateFormatter = $date_formatter;
- $this->renderer = $renderer;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('date.formatter'),
- $container->get('renderer')
- );
- }
-
- /**
- * Generates an overview table of older revisions of a node,
- * but only if this::historyAccess() allows it.
- *
- * @param EntityInterface $node
- * A node object.
- * @return array An array as expected by drupal_render().
- * An array as expected by drupal_render().
- */
- public function historyOverview(EntityInterface $node = NULL) {
- $form = [];
-
- /*
- * Get data from parameters.
- */
-
- // @todo D8-port: make Workflow History tab happen for every entity_type.
- // For workflow_tab_page with multiple workflows, use a separate view. See [#2217291].
- // @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- // ATM it only works for Nodes and Terms.
- // This is a hack. The Route should always pass an object.
- // On view tab, $entity is object,
- // On workflow tab, $entity is id().
- // Get the entity for this form.
- if (!$entity = workflow_url_get_entity($node)) {
- return $form;
- }
-
- /*
- * Get derived data from parameters.
- */
- if (!$field_name = workflow_get_field_name($entity, workflow_url_get_field_name())) {
- return $form;
- }
-
- /*
- * Step 1: generate the Transition Form.
- */
- // Create a transition, to pass to the form. No need to use setValues().
- $current_sid = workflow_node_current_state($entity, $field_name);
- $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
- $transition->setTargetEntity($entity);
- // Add the WorkflowTransitionForm to the page.
- $form = $this->entityFormBuilder()->getForm($transition, 'add');
-
- /*
- * Step 2: generate the Transition History List.
- */
- $entity_type = 'workflow_transition';
- // $form = $this->listing('workflow_transition');
- $list_builder = $this->entityTypeManager()->getListBuilder($entity_type);
- // Add the Node explicitly, since $list_builder expects a Transition.
- $list_builder->workflow_entity = $entity;
-
- $form += $list_builder->render();
-
- /*
- * Finally: sort the elements (overriding their weight).
- */
- // $form['#weight'] = 10;
- $form['actions']['#weight'] = 100;
- $form['table']['#weight'] = 201;
-
- return $form;
- }
-
- /**
- * Menu access control callback. Checks access to Workflow tab.
- *
- * This used to be D7-function workflow_tab_access($user, $entity).
- *
- * The History tab should not be used with multiple workflows per entity.
- * Use the dedicated view for this use case.
- * @todo D8: remove this in favour of View 'Workflow history per entity'.
- * @todo D8-port: make this workf for non-Node entity types.
- *
- * @param \Drupal\Core\Session\AccountInterface $account
- * Run access checks for this account.
- *
- * @return \Drupal\Core\Access\AccessResult
- */
- public function historyAccess(AccountInterface $account) {
- static $access = [];
-
- $uid = ($account) ? $account->id() : -1;
-
- // @todo D8-port: make Workflow History tab happen for every entity_type.
- // @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
- // ATM it only works for Nodes and Terms.
- // This is a hack. The Route should always pass an object.
- // On view tab, $entity is object,
- // On workflow tab, $entity is id().
- // Get the entity for this form.
- $entity = workflow_url_get_entity();
-
- /* @var $entity EntityInterface */
- // Figure out the $entity's bundle and id.
- $entity_type = $entity->getEntityTypeId();
- $entity_bundle = $entity->bundle();
- $entity_id = ($entity) ? $entity->id() : '';
- $field_name = workflow_url_get_field_name();
-
- if (isset($access[$uid][$entity_type][$entity_id][$field_name ? $field_name : 'no_field'])) {
- return $access[$uid][$entity_type][$entity_id][$field_name ? $field_name : 'no_field'];
- }
-
- $access_result = AccessResult::forbidden();
-
- // When having multiple workflows per bundle, use Views display
- // 'Workflow history per entity' instead!
- $fields = _workflow_info_fields($entity, $entity_type, $entity_bundle, $field_name);
- if (!$fields) {
- return AccessResult::forbidden();
- }
- else {
- // @todo: Keep below code aligned between WorkflowState, ~Transition, ~TransitionListController
- $uid = ($account) ? $account->id() : -1;
- $entity_id = ($entity) ? $entity->id() : '';
- // Determine if user is owner of the entity.
- $is_owner = WorkflowManager::isOwner($account, $entity);
-
- /**
- * Determine if user has Access. Fill the cache.
- */
- // @todo: what to do with multiple workflow_fields per bundle? Use Views instead! Or introduce a setting.
- // @todo D8-port: workflow_tab_access: use proper 'WORKFLOW_TYPE' permissions
- foreach ($fields as $definition) {
- $type_id = $definition->getSetting('workflow_type');
- if ($account->hasPermission("access any $type_id workflow_transion overview")) {
- $access_result = AccessResult::allowed();
- }
- elseif ($is_owner && $account->hasPermission("access own $type_id workflow_transion overview")) {
- $access_result = AccessResult::allowed();
- }
- elseif ($account->hasPermission('administer nodes')) {
- $access_result = AccessResult::allowed();
- }
- $access[$uid][$entity_type][$entity_id][$field_name ? $field_name : 'no_field'] = $access_result;
- }
- }
- return $access_result;
- }
-
-}
diff --git a/modules/workflow/src/Element/WorkflowTransitionElement.php b/modules/workflow/src/Element/WorkflowTransitionElement.php
deleted file mode 100644
index 8ce6717..0000000
--- a/modules/workflow/src/Element/WorkflowTransitionElement.php
+++ /dev/null
@@ -1,576 +0,0 @@
- TRUE,
- '#return_value' => 1,
- '#process' => [
- [$class, 'processTransition'],
- [$class, 'processAjaxForm'],
- //array($class, 'processGroup'),
- ],
- '#element_validate' => [
- [$class, 'validateTransition'],
- ],
- '#pre_render' => [
- [$class, 'preRenderTransition'],
- //array($class, 'preRenderGroup'),
- ],
- //'#theme' => 'input__checkbox',
- //'#theme' => 'input__textfield',
- '#theme_wrappers' => ['form_element'],
- //'#title_display' => 'after',
- ];
- }
-
- /**
- * Form element validation handler.
- *
- * Note that #maxlength is validated by _form_validate() already.
- *
- * This checks that the submitted value:
- * - Does not contain the replacement character only.
- * - Does not contain disallowed characters.
- * - Is unique; i.e., does not already exist.
- * - Does not exceed the maximum length (via #maxlength).
- * - Cannot be changed after creation (via #disabled).
- *
- * @param array $element Reference to the Form element
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * @param array $complete_form
- */
- public static function validateTransition(&$element, FormStateInterface $form_state, &$complete_form) {
- workflow_debug( __FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- }
-
- /**
- * Generate an element.
- *
- * This function is referenced in the Annotation for this class.
- *
- * @param $element
- * @param FormStateInterface $form_state
- * @param $complete_form
- *
- * @return array
- * The Workflow element
- */
- public static function processTransition(&$element, FormStateInterface $form_state, &$complete_form) {
- workflow_debug( __FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- return self::transitionElement($element, $form_state, $complete_form);
- }
-
- /**
- * Generate an element.
- *
- * This function is an internal function, to be reused in:
- * - TransitionElement
- * - TransitionDefaultWidget
- *
- * Usage:
- * @example $element['#default_value'] = $transition;
- * @example $element += WorkflowTransitionElement::transitionElement($element, $form_state, $form);
- *
- * @param array $element Reference to the form element
- * @param FormStateInterface $form_state
- * @param array $complete_form
- *
- * @return array
- * The form element
- */
- public static function transitionElement(&$element, FormStateInterface $form_state, &$complete_form) {
- // $element = [];
-
- /*
- * Input.
- */
- // A Transition object must have been set explicitly.
- /** @var $transition WorkflowTransitionInterface */
- $transition = $element['#default_value'];
- /** @var $user \Drupal\Core\Session\AccountInterface */
- $user = \Drupal::currentUser();
-
- /*
- * Derived input.
- */
- $field_name = $transition->getFieldName();
- $workflow = $transition->getWorkflow();
- $wid = $transition->getWorkflowId();
- $force = $transition->isForced();
- $entity = $transition->getTargetEntity();
- $entity_type = $transition->getTargetEntityTypeId();
- $entity_id = $transition->getTargetEntityId();
-
- if ($transition->isExecuted()) {
- // We are editing an existing/executed/not-scheduled transition.
- // Only the comments may be changed!
-
- $current_sid = $from_sid = $transition->getFromSid();
- // The states may not be changed anymore.
- $to_state = $transition->getToState();
- $options = [$to_state->id() => $to_state->label()];
- // We need the widget to edit the comment.
- $show_widget = TRUE;
- $default_value = $transition->getToSid();
- }
- elseif ($entity) {
- // Normal situation: adding a new transition on an new/existing entity.
-
- // Get the scheduling info, only when updating an existing entity.
- // This may change the $default_value on the Form.
- // Technically you could have more than one scheduled transition, but
- // this will only add the soonest one.
- // @todo: Read the history with an explicit langcode?
- $langcode = ''; // $entity->language()->getId();
- if ($entity_id && $scheduled_transition = WorkflowScheduledTransition::loadByProperties($entity_type, $entity_id, [], $field_name, $langcode)) {
- $transition = $scheduled_transition;
- }
-
- $current_sid = $from_sid = $transition->getFromSid();
- $current_state = $from_state = $transition->getFromState();
- $options = ($current_state) ? $current_state->getOptions($entity, $field_name, $user, FALSE) : [];
- $show_widget = ($from_state) ? $from_state->showWidget($entity, $field_name, $user, FALSE) : [];
- $default_value = $from_sid;
- $default_value = ($from_state && $from_state->isCreationState()) ? $workflow->getFirstSid($entity, $field_name, $user, FALSE) : $default_value;
- $default_value = ($transition->isScheduled()) ? $transition->getToSid() : $default_value;
- }
- elseif (!$entity) {
- // Sometimes, no entity is given. We encountered the following cases:
- // - D7: the Field settings page,
- // - D7: the VBO action form;
- // - D7/D8: the Advance Action form on admin/config/system/actions;
- // If so, show all options for the given workflow(s).
- if (!$temp_state = $transition->getFromState()) {
- $temp_state = $transition->getToState();
- }
- $options = ($temp_state)
- ? $temp_state->getOptions($entity, $field_name, $user, FALSE)
- : workflow_get_workflow_state_names($wid, $grouped = TRUE, $all = FALSE);
- $show_widget = TRUE;
- $current_sid = $transition->getToSid(); // @todo
- $default_value = $from_sid = $transition->getToSid(); // @todo
- }
- else {
- // We are in trouble! A message is already set in workflow_node_current_state().
- $options = [];
- $current_sid = 0;
- $show_widget = FALSE;
- $default_value = FALSE;
- }
-
- // Fetch the form ID. This is unique for each entity, to allow multiple form per page (Views, etc.).
- // Make it uniquer by adding the field name, or else the scheduling of
- // multiple workflow_fields is not independent of each other.
- // If we are indeed on a Transition form (so, not a Node Form with widget)
- // then change the form id, too.
- // $form_id = $this->getFormId();
- $form_id = 'workflow_transition_form'; //@todo D8-port: add $form_id for widget and History tab.
-
- /*
- * Output: generate the element.
- */
- // Get settings from workflow. @todo: implement default_settings.
- if ($workflow) {
- $workflow_settings = $workflow->options;
- }
- else {
- // @todo D8-port: now only tested with Action.
- $workflow_settings = [
- 'name_as_title' => 0,
- 'options' => "radios",
- 'schedule_timezone' => 1,
- 'comment_log_node' => "1",
- 'watchdog_log' => TRUE,
- ];
- }
- // Current sid and default value may differ in a scheduled transition.
-
- $workflow_settings['comment'] = $workflow_settings['comment_log_node']; // 'comment_log_tab' is removed;
-
- // Capture settings to format the form/widget.
- $settings_title_as_name = !empty($workflow_settings['name_as_title']);
- $settings_fieldset = isset($workflow_settings['fieldset']) ? $workflow_settings['fieldset'] : 0;
- $settings_options_type = $workflow_settings['options'];
-
- // Display scheduling form if user has permission.
- // Not shown on new entity (not supported by workflow module, because that
- // leaves the entity in the (creation) state until scheduling time.)
- // Not shown when editing existing transition.
- $type_id = ($workflow) ? $workflow->id() : ''; // Might be empty on Action configuration.
- $settings_schedule = !$transition->isExecuted() && $user->hasPermission("schedule $type_id workflow_transition");
- if ($settings_schedule) {
- //@todo D8-port: check below code: form on VBO.
- // workflow_debug( __FILE__ , __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- $step = $form_state->getValue('step');
- if (isset($step) && ($form_state->getValue('step') == 'views_bulk_operations_config_form')) {
- // On VBO 'modify entity values' form, leave field settings.
- $settings_schedule = TRUE;
- }
- else {
- // ... and cannot be shown on a Content add page (no $entity_id),
- // ...but can be shown on a VBO 'set workflow state to..'page (no entity).
- $settings_schedule = !($entity && !$entity_id);
- }
- }
-
- $settings_schedule_timezone = !empty($workflow_settings['schedule_timezone']);
- // Show comment, when both Field and Instance allow this.
- $settings_comment = $workflow_settings['comment'];
-
- $transition_is_scheduled = $transition->isScheduled();
- // Save the current value of the entity in the form, for later Workflow-module specific references.
- // We add prefix, since #tree == FALSE.
- $element['workflow_transition'] = [
- '#type' => 'value',
- '#value' => $transition,
- ];
-
- // Decide if we show a widget or a formatter.
- // There is no need for a widget when the only option is the current sid.
-
- // Add a state formatter before the rest of the form,
- // when transition is scheduled or widget is hidden.
- if ( (!$show_widget) || $transition_is_scheduled || $transition->isExecuted()) {
- $element['workflow_current_state'] = workflow_state_formatter($entity, $field_name, $current_sid);
- // Set a proper weight, which works for Workflow Options in select list AND action buttons.
- $element['workflow_current_state']['#weight'] = -0.005;
- }
-
- $element['#tree'] = TRUE;
- // Add class following node-form pattern (both on form and container).
- $workflow_type_id = ($workflow) ? $workflow->id() : '';
- $element['#attributes']['class'][] = 'workflow-transition-' . $workflow_type_id . '-container';
- $element['#attributes']['class'][] = 'workflow-transition-container';
- if (!$show_widget) {
- // Show no widget.
- $element['to_sid']['#type'] = 'value';
- $element['to_sid']['#value'] = $default_value;
- $element['to_sid']['#options'] = $options; // In case action buttons need them.
- $element['comment']['#type'] = 'value';
- $element['comment']['#value'] = '';
-
- return $element; // <-- exit.
- }
-
- // @todo: repair the usage of $settings_title_as_name: no container if no details (schedule/comment).
- // Prepare a UI wrapper. This might be a fieldset.
- if ($settings_fieldset == 0) { // Use 'container'.
- $element += [
- '#type' => 'container',
- ];
- }
- else {
- $element += [
- '#type' => 'details',
- '#collapsible' => TRUE,
- '#open' => ($settings_fieldset == 2) ? FALSE : TRUE,
- ];
- }
-
- $element['field_name'] = [
- '#type' => 'select',
- '#title' => t('Field name'),
- '#description' => t('Choose the field name.'),
- '#access' => FALSE, // Only show on VBO/Actions screen.
- '#options' => workflow_get_workflow_field_names($entity),
- '#default_value' => $field_name,
- '#required' => TRUE,
- '#weight' => -20,
- ];
- $element['force'] = [
- '#type' => 'checkbox',
- '#title' => t('Force transition'),
- '#description' => t('If this box is checked, the new state will be assigned even if workflow permissions disallow it.'),
- '#access' => FALSE, // Only show on VBO/Actions screen.
- '#default_value' => $force,
- '#weight' => -19,
- ];
-
- // This overrides BaseFieldDefinition. @todo: apply for form and widget.
- // The 'options' widget. May be removed later if 'Action buttons' are chosen.
- // The help text is not available for container. Let's add it to the
- // State box. N.B. it is empty on Workflow Tab, Node View page.
- $help_text = isset($element['#description']) ? $element['#description'] : '';
- // This overrides BaseFieldDefinition. @todo: apply for form and widget.
- $element['to_sid'] = [
- '#type' => ($wid) ? $settings_options_type : 'select', // Avoid error with grouped options.
- '#title' => ($settings_title_as_name && !$transition->isExecuted())
- ? t('Change @name state', ['@name' => $workflow->label()])
- : t('Target state'),
- '#access' => TRUE,
- '#options' => $options,
- // '#parents' => array('workflow'),
- '#default_value' => $default_value,
- '#description' => $help_text,
- ];
-
- // Display scheduling form under certain conditions.
- if ($settings_schedule == TRUE) {
- $timezone = $user->getTimeZone();
-
- $timezone_options = array_combine(timezone_identifiers_list(), timezone_identifiers_list());
- $timestamp = $transition ? $transition->getTimestamp() : \Drupal::time()->getRequestTime();
- $hours = (!$transition_is_scheduled) ? '00:00' : \Drupal::service('date.formatter')->format($timestamp, 'custom', 'H:i', $timezone);
- // Add a container, so checkbox and time stay together in extra fields.
- $element['workflow_scheduling'] = [
- '#type' => 'container',
- '#tree' => TRUE,
- ];
- $element['workflow_scheduling']['scheduled'] = [
- '#type' => 'radios',
- '#title' => t('Schedule'),
- '#options' => [
- '0' => t('Immediately'),
- '1' => t('Schedule for state change'),
- ],
- '#default_value' => $transition_is_scheduled ? '1' : '0',
- '#attributes' => [
- // 'id' => 'scheduled_' . $form_id,
- 'class' => [Html::getClass('scheduled_' . $form_id)],
- ],
- ];
- $element['workflow_scheduling']['date_time'] = [
- '#type' => 'details', // 'container',
- '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
- '#attributes' => ['class' => ['container-inline']],
- '#prefix' => '',
- '#suffix' => '
',
- '#states' => [
- //'visible' => array(':input[id="' . 'scheduled_' . $form_id . '"]' => array('value' => '1')),
- 'visible' => ['input.' . Html::getClass('scheduled_' . $form_id) => ['value' => '1']],
- ],
- ];
- $element['workflow_scheduling']['date_time']['workflow_scheduled_date'] = [
- '#type' => 'date',
- '#prefix' => t('At'),
- '#default_value' => implode( '-', [
- 'year' => date('Y', $timestamp),
- 'month' => date('m', $timestamp),
- 'day' => date('d', $timestamp),
- ]
- )
- ];
- $element['workflow_scheduling']['date_time']['workflow_scheduled_hour'] = [
- '#type' => 'textfield',
- '#title' => t('Time'),
- '#maxlength' => 7,
- '#size' => 6,
- '#default_value' => $hours,
- '#element_validate' => ['_workflow_transition_form_element_validate_time'], // @todo D8-port: this is not called.
- ];
- $element['workflow_scheduling']['date_time']['workflow_scheduled_timezone'] = [
- '#type' => $settings_schedule_timezone ? 'select' : 'hidden',
- '#title' => t('Time zone'),
- '#options' => $timezone_options,
- '#default_value' => [$timezone => $timezone],
- ];
- $element['workflow_scheduling']['date_time']['workflow_scheduled_help'] = [
- '#type' => 'item',
- '#prefix' => '' . $this->getWorkflowId() . ' ' . ($function ? ("in function '$function'") : '');
- $output[] = 'Entity = ' . $this->getTargetEntityTypeId() . '/' . (($entity) ? ($entity->bundle() . '/' . $entity->id()) : '___/0') ;
- $output[] = 'Field = ' . $transition->getFieldName();
- $output[] = 'From/To = ' . $transition->getFromSid() . ' > ' . $transition->getToSid() . ' @ ' . $time;
- $output[] = 'Comment = ' . $user_name . ' says: ' . $transition->getComment();
- $output[] = 'Forced = ' . ($transition->isForced() ? 'yes' : 'no') .'; ' . 'Scheduled = ' . ($transition->isScheduled() ? 'yes' : 'no');
- if (function_exists('dpm')) { dpm($output, $t_string); }
- }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowTransitionInterface.php b/modules/workflow/src/Entity/WorkflowTransitionInterface.php
deleted file mode 100644
index ad55871..0000000
--- a/modules/workflow/src/Entity/WorkflowTransitionInterface.php
+++ /dev/null
@@ -1,277 +0,0 @@
- $field_name]);
- * $transition->setTargetEntity($entity);
- * $transition->setValues($new_sid, $user->id(), REQUEST_TIME, $comment);
- *
- * @param string $to_sid
- * @param int $uid
- * @param int $timestamp
- * @param string $comment
- * @param bool $force_create
- */
- public function setValues($to_sid, $uid = NULL, $timestamp = NULL, $comment = '', $force_create = FALSE);
-
- /**
- * Load (Scheduled) WorkflowTransitions, most recent first.
- *
- * @param string $entity_type
- * @param int $entity_id
- * @param array $revision_ids
- * @param string $field_name
- * @param string $langcode
- * @param string $sort
- * @param string $transition_type
- *
- * @return \Drupal\workflow\Entity\WorkflowTransitionInterface
- * Object representing one row from the {workflow_transition_history} table.
- */
- public static function loadByProperties($entity_type, $entity_id, array $revision_ids = [], $field_name = '', $langcode = '', $sort = 'ASC', $transition_type = '');
-
- /**
- * Given an entity, get all transitions for it.
- *
- * Since this may return a lot of data, a limit is included to allow for only one result.
- *
- * @param string $entity_type
- * @param int[] $entity_ids
- * @param int[] $revision_ids
- * @param string $field_name
- * Optional. Can be NULL, if you want to load any field.
- * @param string $langcode
- * Optional. Can be empty, if you want to load any language.
- * @param int $limit
- * Optional. Can be NULL, if you want to load all transitions.
- * @param string $sort
- * Optional sort order. {'ASC'|'DESC'}
- * @param string $transition_type
- * The type of the transition to be fetched.
- *
- * @return WorkflowTransitionInterface[]
- * An array of transitions.
- */
- public static function loadMultipleByProperties($entity_type, array $entity_ids, array $revision_ids = [], $field_name = '', $langcode = '', $limit = NULL, $sort = 'ASC', $transition_type = '');
-
- /**
- * Execute a transition (change state of an entity).
- *
- * A Scheduled Transition shall only be saved, unless the
- * 'schedule' property is set.
- * @usage
- * $transition->schedule(FALSE);
- * $to_sid = $transition->execute(TRUE);
- *
- * @param bool $force
- * If set to TRUE, workflow permissions will be ignored.
- *
- * @return
- * New state ID. If execution failed, old state ID is returned,
- */
- public function execute($force = FALSE);
-
- /**
- * Executes a transition (change state of an entity), from OUTSIDE the entity.
- *
- * Use $transition->executeAndUpdateEntity() to start a State Change from
- * outside an entity, e.g., workflow_cron().
- * Use $transition->execute() to start a State Change from within an entity.
- *
- * A Scheduled Transition ($transition->isScheduled() == TRUE) will be
- * un-scheduled and saved in the history table.
- * The entity will not be updated.
- * If $transition->isScheduled() == FALSE, the Transition will be
- * removed from the {workflow_transition_scheduled} table (if necessary),
- * and added to {workflow_transition_history} table.
- * Then the entity wil be updated to reflect the new status.
- *
- * @usage
- * $to_sid = $transition->->executeAndUpdateEntity($force);
- *
- * @see workflow_execute_transition()
- *
- * @param bool $force
- * If set to TRUE, workflow permissions will be ignored.
- *
- * @return string
- * The resulting WorkflowState id.
- */
- public function executeAndUpdateEntity($force = FALSE);
-
- /**
- * Invokes 'transition post'.
- * Adds the possibility to invoke the hook from elsewhere.
- *
- * @param bool $force
- */
- public function post_execute($force = FALSE);
-
- /**
- * Set the Entity, that is added to the Transition.
- * Also set all dependent fields, that will be saved in tables {workflow_transition_*}
- *
- * @param EntityInterface $entity
- * The Entity ID or the Entity object, to add to the Transition.
- *
- * @return object
- * The Entity, that is added to the Transition.
- */
- public function setTargetEntity($entity);
-
- /**
- * Returns the entity to which the workflow is attached.
- *
- * @return EntityInterface
- * The entity to which the workflow is attached.
- */
- public function getTargetEntity();
-
- /**
- * Returns the ID of the entity to which the workflow is attached.
- *
- * @return int
- * The ID of the entity to which the workflow is attached.
- */
- public function getTargetEntityId();
-
- /**
- * Returns the type of the entity to which the workflow is attached.
- *
- * @return string
- * An entity type.
- */
- public function getTargetEntityTypeId();
-
- /**
- * Get the field_name for which the Transition is valid.
- *
- * @return string
- * The field_name, that is added to the Transition.
- */
- public function getFieldName();
-
- /**
- * Get the language code for which the Transition is valid.
- *
- * @todo: OK?? Shouldn't we use entity's language() method for langcode?
- *
- * @return string $langcode
- */
- public function getLangcode();
-
- /**
- * Get the comment of the Transition.
- *
- * @return
- * The comment
- */
- public function getComment();
-
- /**
- * Get the comment of the Transition.
- *
- * @param $value
- * The new comment.
- *
- * @return WorkflowTransitionInterface
- */
- public function setComment($value);
-
- /**
- * Returns the time on which the transitions was or will be executed.
- *
- * @return
- */
- public function getTimestamp();
-
- /**
- * Returns the human-readable time.
- *
- * @return string
- */
- public function getTimestampFormatted();
-
- /**
- * Returns the time on which the transitions was or will be executed.
- *
- * @param $value
- * The new timestamp.
- * @return WorkflowTransitionInterface
- */
- public function setTimestamp($value);
-
- /**
- * Returns if this is a Scheduled Transition.
- *
- * @return bool
- */
- public function isScheduled();
-
- /**
- * Sets the Transition to be scheduled or not.
- *
- * @param bool $schedule
- * @return WorkflowTransitionInterface
- */
- public function schedule($schedule = TRUE);
-
- /**
- * Set the 'is_executed' property.
- *
- * @param bool $is_executed
- *
- * @return WorkflowTransitionInterface
- */
- public function setExecuted($is_executed = TRUE);
-
- /**
- * Returns if this is an Executed Transition.
- *
- * @return bool
- */
- public function isExecuted();
-
- /**
- * A transition may be forced skipping checks.
- *
- * @return bool
- * If the transition is forced. (Allow not-configured transitions).
- */
- public function isForced();
-
- /**
- * Set if a transition must be executed, even if transition is invalid
- * or user not authorized.
- *
- * @param bool $force
- *
- * @return object
- * The transition itself
- */
- public function force($force = TRUE);
-
- /**
- * Helper/debugging function. Shows simple contents of Transition.
- *
- * @param string $function
- */
- public function dpm($function = '');
-
-}
diff --git a/modules/workflow/src/Form/WorkflowForm.php b/modules/workflow/src/Form/WorkflowForm.php
deleted file mode 100644
index 35298f3..0000000
--- a/modules/workflow/src/Form/WorkflowForm.php
+++ /dev/null
@@ -1,247 +0,0 @@
- t('No'), 1 => t('Yes')];
- $fieldset_options = [0 => t('No fieldset'), 1 => t('Collapsible fieldset'), 2 => t('Collapsed fieldset')];
- /* @var $workflow Workflow */
- $workflow = $this->entity;
-
- $form['label'] = [
- '#type' => 'textfield',
- '#description' => t('The human-readable label of the workflow. This will be used as a label when
- the workflow status is shown during editing of content.'),
- '#title' => $this->t('Label'),
- '#default_value' => $this->entity->label(),
- '#required' => TRUE,
- ];
-
- $form['id'] = [
- '#type' => 'machine_name',
- '#description' => t('A unique machine-readable name. Can only contain lowercase letters, numbers, and underscores.'),
- '#disabled' => !$this->entity->isNew(),
- '#default_value' => $this->entity->id(),
- '#machine_name' => [
- 'exists' => [$this, 'exists'],
- 'replace_pattern' => '([^a-z0-9_]+)|(^custom$)',
- 'error' => $this->t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'),
- ],
- ];
-
- $form['permissions'] = [
- '#type' => 'details',
- '#title' => t('Workflow permissions'),
- '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
- '#description' => t("To enable further Workflow functionality, go to the
- /admin/people/permissions page and select any roles that should have
- access to below and other functionalities."),
- ];
- $form['permissions']['transition_execute'] = [
- '#type' => 'item',
- '#title' => t('Participate in workflow (create, execute transitions)'),
- '#markup' => t("You can determine which roles are enabled on the
- 'Workflow Transitions & roles' configuration page. Use this to enable
- only the relevant roles. Some sites have too many roles to show on
- the configuration page."),
- ];
- $form['permissions']['transition_schedule'] = [
- '#type' => 'item',
- '#title' => t('Schedule state transition'),
- '#markup' => t("Workflow transitions may be scheduled to a moment in the
- future. Soon after the desired moment, the transition is executed by
- Cron. This may be hidden by settings in widgets, formatters or permissions."
- ),
- ];
- $form['permissions']['history_tab'] = [
- '#type' => 'item',
- '#title' => t('Access Workflow history tab'),
- '#markup' => t("You can determine if a tab 'Workflow history' is
- shown on the entity view page, which gives access to the History of
- the workflow.
- If you have multiple workflows per bundle, better disable this feature,
- and use, clone & adapt the Views display 'Workflow history per Entity'."),
- ];
-
- $form['basic'] = [
- '#type' => 'details',
- '#title' => t('Workflow form settings'),
- // '#description' => t('Lorem ipsum.'),
- '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
- ];
-
- $form['basic']['fieldset'] = [
- '#type' => 'select',
- '#options' => $fieldset_options,
- '#title' => t('Show the form in a fieldset?'),
- '#default_value' => isset($workflow->options['fieldset']) ? $workflow->options['fieldset'] : 0,
- ];
- $form['basic']['options'] = [
- '#type' => 'select',
- '#title' => t('How to show the available states'),
- '#required' => FALSE,
- '#default_value' => isset($workflow->options['options']) ? $workflow->options['options'] : 'radios',
- // '#multiple' => TRUE / FALSE,
- '#options' => [
- // These options are taken from options.module
- 'select' => 'Select list',
- 'radios' => 'Radio buttons',
- 'buttons' => 'Action buttons',
- 'dropbutton' => 'Drop button',
- ],
- '#description' => t("The Widget shows all available states. Decide which
- is the best way to show them."
- ),
- ];
-
- $form['basic']['name_as_title'] = [
- '#type' => 'checkbox',
- '#attributes' => ['class' => ['container-inline']],
- '#title' => t('Use the workflow name as the title of the workflow form'),
- '#default_value' => isset($workflow->options['name_as_title']) ? $workflow->options['name_as_title'] : 0,
- '#description' => t(
- 'The workflow section of the editing form is in its own fieldset.
- Checking the box will add the workflow name as the title of workflow
- section of the editing form.'
- ),
- ];
-
- $form['basic']['schedule_timezone'] = [
- '#type' => 'checkbox',
- '#title' => t('Show a timezone when scheduling a transition.'),
- '#required' => FALSE,
- '#default_value' => isset($workflow->options['schedule_timezone']) ? $workflow->options['schedule_timezone'] : 1,
- ];
-
- $form['basic']['comment_log_node'] = [
- '#type' => 'select',
- '#required' => FALSE,
- '#options' => [
- // Use 0/1/2 to stay compatible with previous checkbox.
- 0 => t('hidden'),
- 1 => t('optional'),
- 2 => t('required'),
- ],
- '#attributes' => ['class' => ['container-inline']],
- '#title' => t('How to show the Comment subfield'),
- '#default_value' => isset($workflow->options['comment_log_node']) ? $workflow->options['comment_log_node'] : 1,
- '#description' => t(
- 'A Comment area can be shown on the Workflow Transition form so that the person
- making a state change can record reasons for doing so. The comment is
- then included in the content\'s workflow history.'
- ),
- ];
-
- $form['watchdog'] = [
- '#type' => 'details',
- '#title' => t('Watchdog'),
- '#description' => t('Informational watchdog messages can be logged when a transition is executed (state of a node is changed).'),
- '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
- ];
-
- $form['watchdog']['watchdog_log'] = [
- '#type' => 'checkbox',
- '#title' => t('Log watchdog messages upon state change'),
- '#default_value' => isset($workflow->options['watchdog_log']) ? $workflow->options['watchdog_log'] : 0,
- '#description' => '',
- ];
-
- return parent::form($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function actions(array $form, FormStateInterface $form_state) {
- $actions = parent::actions($form, $form_state);
- // $actions['submit']['#value'] = $this->t('Save');
- return $actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function save(array $form, FormStateInterface $form_state) {
- /* @var $entity \Drupal\workflow\Entity\Workflow */
- $entity = $this->entity;
-
- // Prevent leading and trailing spaces.
- $entity->set('label', trim($entity->label()));
-
- $entity->set('options', [
- 'name_as_title' => $form_state->getValue('name_as_title'),
- 'fieldset' => $form_state->getValue('fieldset'),
- 'options' => $form_state->getValue('options'),
- 'schedule_timezone' => $form_state->getValue('schedule_timezone'),
- 'comment_log_node' => $form_state->getValue('comment_log_node'),
- 'watchdog_log' => $form_state->getValue('watchdog_log'),
- ]
- );
-
- $status = parent::save($form, $form_state);
- $action = $status == SAVED_UPDATED ? 'updated' : 'added';
-
- // Tell the user we've updated the data.
- $args = [
- '%label' => $entity->label(),
- '%action' => $action,
- 'link' => $entity->toLink(t('Edit'))->toString(),
- ];
- drupal_set_message($this->t('Workflow %label has been %action. Please maintain the permissions, states and transitions.', $args));
- $this->logger('workflow')->notice('Workflow %label has been %action.', $args);
-
- if ($status == SAVED_NEW) {
- $form_state->setRedirect('entity.workflow_type.edit_form', ['workflow_type' => $entity->id()]);
- }
-
- }
-
- /**
- * Form validation handler.
- *
- * @param array $form
- * An associative array containing the structure of the form.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The current state of the form.
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- $workflow = $this->entity;
- $name = $workflow->id();
-
- // Make sure workflow name is not numeric.
- // TODO: this was a prerequisite in D7. Remove in D8?
- if (ctype_digit($name)) {
- $form_state->setErrorByName('id', t('Please choose a non-numeric name for your workflow.'));
- }
-
- parent::validateForm($form, $form_state);
- }
-
- /**
- * Machine name exists callback.
- *
- * @param string $id
- * The machine name ID.
- *
- * @return bool
- * TRUE if an entity with the same name already exists, FALSE otherwise.
- */
- public function exists($id) {
- $type = $this->entity->getEntityTypeId();
-
- return (bool) $this->entityTypeManager->getStorage($type)->load($id);
- }
-
-}
diff --git a/modules/workflow/src/Form/WorkflowTransitionForm.php b/modules/workflow/src/Form/WorkflowTransitionForm.php
deleted file mode 100644
index b85b306..0000000
--- a/modules/workflow/src/Form/WorkflowTransitionForm.php
+++ /dev/null
@@ -1,210 +0,0 @@
-entity;
- $field_name = $transition->getFieldName();
-
- /** @var $entity \Drupal\Core\Entity\EntityInterface */
- // Entity may be empty on VBO bulk form.
- // $entity = $transition->getTargetEntity();
- // Compose Form Id from string + Entity Id + Field name.
- // Field ID contains entity_type, bundle, field_name.
- // The Form Id is unique, to allow for multiple forms per page.
- // $workflow_type_id = $transition->getWorkflowId();
- // Field name contains implicit entity_type & bundle (since 1 field per entity)
- // $entity_type = $transition->getTargetEntityTypeId();
- // $entity_id = $transition->getTargetEntityId();;
-
- // Emulate nodeForm convention.
- if ($transition->id()) {
- $suffix = 'edit_form';
- }
- else {
- $suffix = 'form';
- }
- $form_id = implode('_', ['workflow_transition', $field_name, $suffix]);
- $form_id = Html::getUniqueId($form_id);
-
- return $form_id;
- }
-
- /**
- * {@inheritdoc}
- *
- * N.B. The D8-version of this form is stripped. If any use case is missing:
- * - compare with the D7-version of WorkflowTransitionForm::submitForm()
- * - compare with the D8-version of WorkflowTransitionElement::copyFormValuesToEntity()
- */
- /*
- public function submitForm(array &$form, FormStateInterface $form_state) {
- parent::submitForm($form, $form_state);
- }
- */
-
- /* *************************************************************************
- *
- * Implementation of interface EntityFormInterface (extends FormInterface).
- *
- */
-
- /**
- * This function is called by buildForm().
- * Caveat: !! It is not declared in the EntityFormInterface !!
- *
- * {@inheritdoc}
- */
- public function form(array $form, FormStateInterface $form_state) {
- // Call parent to get (extra) fields.
- // This might cause baseFieldDefinitions to appear twice.
- $form = parent::form($form, $form_state);
-
- /** @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
- $transition = $this->entity;
-
- // Do not pass the element, but the form.
- // $element['#default_value'] = $transition;
- // $form += WorkflowTransitionElement::transitionElement($element, $form_state, $form);
- //
- // Pass the form via parameter
- $form['#default_value'] = $transition;
- $form = WorkflowTransitionElement::transitionElement($form, $form_state, $form);
- return $form;
- }
-
- /*
- * Returns the action form element for the current entity form.
- * Caveat: !! It is not declared in the EntityFormInterface !!
- *
- * {@inheritdoc}
- protected function actionsElement(array $form, FormStateInterface $form_state) {
- $element = parent::actionsElement($form, $form_state);
- return $element;
- }
- */
-
- /**
- * Returns an array of supported actions for the current entity form.
- * Caveat: !! It is not declared in the EntityFormInterface !!
- * @param array $form
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * @return array
- */
- protected function actions(array $form, FormStateInterface $form_state) {
- // N.B. Keep code aligned: workflow_form_alter(), WorkflowTransitionForm::actions().
- $actions = parent::actions($form, $form_state);
-
- // A default button is provided by core. Override it.
- $actions['submit']['#value'] = t('Update workflow');
- $actions['submit']['#attributes'] = ['class' => ['form-save-default-button']];
-
- if (!_workflow_use_action_buttons()) {
- // Change the default submit button on the Workflow History tab.
- return $actions;
- }
-
- // Find the first workflow.
- // (So this won't work with multiple workflows per entity.)
- // Quit if there is no Workflow on this page.
- if (!$workflow_form = &$form) {
- return $actions;
- }
-
- // Quit if there are no Workflow Action buttons.
- // (If user has only 1 workflow option, there are no Action buttons.)
- if (count($workflow_form['to_sid']['#options']) <= 1) {
- return $actions;
- }
-
- // Place the buttons. Remove the default 'Save' button.
- // $actions += _workflow_transition_form_get_action_buttons($form, $workflow_form);
- // Remove the default submit button from the form.
- // unset($actions['submit']);
- $default_submit_action = $actions['submit'];
- $actions = _workflow_transition_form_get_action_buttons($form, $workflow_form, $default_submit_action);
- foreach ($actions as $key => &$action) {
- $action['#submit'] = $default_submit_action['#submit'];
- }
-
- return $actions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildEntity(array $form, FormStateInterface $form_state) {
- /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
- $entity = clone $this->entity;
- // N.B. Use a proprietary version of copyFormValuesToEntity,
- // where $entity is passed by reference.
- // $this->copyFormValuesToEntity($entity, $form, $form_state);
- $item = $form_state->getValues();
- $entity = WorkflowTransitionElement::copyFormValuesToTransition($entity, $form, $form_state, $item);
-
- // Mark the entity as NOT requiring validation. (Used in validateForm().)
- $entity->setValidationRequired(FALSE);
-
- return $entity;
- }
-
- /*
- public function buildForm(array $form, FormStateInterface $form_state) {
- $form = parent::buildForm($form, $form_state);
-
- // Add class following node-form pattern (both on form and container).
- // D8-port: This is apparently already magically set in parent.
- // $form['#attributes']['class'][] = 'workflow-transition-' . $workflow_type_id . '-form';
- // $form['#attributes']['class'][] = 'workflow-transition-form';
- return $form;
- }
- */
-
- /**
- * {@inheritdoc}
- *
- * This is called from submitForm().
- */
- public function save(array $form, FormStateInterface $form_state) {
- // Execute transition and update the attached entity.
- /** @var WorkflowTransitionInterface $transition */
- $transition = $this->getEntity();
- return $transition->executeAndUpdateEntity();
- }
-
- /*************************************************************************
- *
- * Implementation of interface ContentEntityFormInterface (extends EntityFormInterface).
- *
- */
-
- /**
- * {@inheritdoc}
- */
- //public function validateForm(array &$form, FormStateInterface $form_state) {
- // return parent::validateForm($form, $form_state);
- //}
-
-}
diff --git a/modules/workflow/src/Plugin/Action/WorkflowNodeGivenStateAction.php b/modules/workflow/src/Plugin/Action/WorkflowNodeGivenStateAction.php
deleted file mode 100644
index b12bbcf..0000000
--- a/modules/workflow/src/Plugin/Action/WorkflowNodeGivenStateAction.php
+++ /dev/null
@@ -1,79 +0,0 @@
- ['workflow', 'node'],
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form = parent::buildConfigurationForm($form, $form_state);
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function execute($object = NULL) {
- /*
- * D7: As advanced action with Trigger 'node':
- * - $entity is empty;
- * - $context['group'] = 'node'
- * - $context['hook'] = 'node_insert / _update / _delete'
- * - $context['node'] = (Object) stdClass
- * - $context['entity_type'] = NULL
- *
- * D7: As advanced action with Trigger 'taxonomy':
- * - $entity is (Object) stdClass;
- * - $context['type'] = 'entity'
- * - $context['group'] = 'taxonomy'
- * - $context['hook'] = 'taxonomy_term_insert / _update / _delete'
- * - $context['node'] = (Object) stdClass
- * - $context['entity_type'] = NULL
- *
- * D7: As advanced action with Trigger 'workflow API':
- * ...
- *
- * D7: As VBO action:
- * - $entity is (Object) stdClass;
- * - $context['type'] = NULL
- * - $context['group'] = NULL
- * - $context['hook'] = NULL
- * - $context['node'] = (Object) stdClass
- * - $context['entity_type'] = 'node'
- */
-
- if (!$transition = $this->getTransitionForExecution($object)) {
- drupal_set_message('The entity is not valid for this action.');
- return;
- }
-
- // Fire the transition.
- workflow_execute_transition($transition, $force);
- }
-
-}
diff --git a/modules/workflow/src/Plugin/Action/WorkflowNodeNextStateAction.php b/modules/workflow/src/Plugin/Action/WorkflowNodeNextStateAction.php
deleted file mode 100644
index 87caa85..0000000
--- a/modules/workflow/src/Plugin/Action/WorkflowNodeNextStateAction.php
+++ /dev/null
@@ -1,71 +0,0 @@
- ['workflow', 'node'],
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form = parent::buildConfigurationForm($form, $form_state);
-
- // Remove to_sid. User can't set it, since we want a dynamic 'next' state.
- unset($form['to_sid']);
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function execute($object = NULL) {
-
- if (!$transition = $this->getTransitionForExecution($object)) {
- drupal_set_message('The object is not valid for this action.', 'warning');
- return;
- }
-
- /*
- * Set the new next state.
- */
- $entity = $transition->getTargetEntity();
- $field_name = $transition->getFieldName();
- $user = $transition->getOwner();
- $force = $this->configuration['force'];
- // $comment = $transition->getComment();
-
- // Get the node's new State Id (which is the next available state).
- $to_sid = $transition->getWorkflow()->getNextSid($entity, $field_name, $user, $force);
-
- // Add actual data.
- $transition->to_sid = $to_sid;
-
- // Fire the transition.
- workflow_execute_transition($transition, $force);
- }
-
-}
diff --git a/modules/workflow/src/Plugin/Action/WorkflowStateActionBase.php b/modules/workflow/src/Plugin/Action/WorkflowStateActionBase.php
deleted file mode 100644
index 21afc7e..0000000
--- a/modules/workflow/src/Plugin/Action/WorkflowStateActionBase.php
+++ /dev/null
@@ -1,232 +0,0 @@
- ['workflow',],
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- return new static($configuration, $plugin_id, $plugin_definition);
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
- $configuration = parent::defaultConfiguration();
- $configuration += $this->configuration;
- $configuration += [
- 'field_name' => '',
- 'to_sid' => '',
- 'comment' => "New state is set by a triggered Action.",
- 'force' => 0,
- ];
- return $configuration;
- }
-
- /**
- * @param EntityInterface $entity
- * @return \Drupal\workflow\Entity\WorkflowTransitionInterface
- */
- protected function getTransitionForExecution(EntityInterface $entity) {
- $user = workflow_current_user();
-
- if (!$entity) {
- \Drupal::logger('workflow_action')->notice('Unable to get current entity - entity is not defined.', []);
- return NULL;
- }
-
- // Get the entity type and numeric ID.
- $entity_id = $entity->id();
- if (!$entity_id) {
- \Drupal::logger('workflow_action')->notice('Unable to get current entity ID - entity is not yet saved.', []);
- return NULL;
- }
-
- // In 'after saving new content', the node is already saved. Avoid second insert.
- // @todo: clone?
- $entity->enforceIsNew(FALSE);
-
- $config = $this->configuration;
- $field_name = workflow_get_field_name($entity, $config['field_name']);
- $current_sid = workflow_node_current_state($entity, $field_name);
- if (!$current_sid) {
- \Drupal::logger('workflow_action')->notice('Unable to get current workflow state of entity %id.', ['%id' => $entity_id]);
- return NULL;
- }
-
- $to_sid = isset($config['to_sid']) ? $config['to_sid'] : '';
- // Get the Comment. Parse the $comment variables.
- $comment_string = $this->configuration['comment'];
- $comment = t($comment_string, [
- '%title' => $entity->label(),
- // "@" and "%" will automatically run check_plain().
- '%state' => workflow_get_sid_name($to_sid),
- '%user' => $user->getDisplayName(),
- ]);
- $force = $this->configuration['force'];
-
- $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
- $transition->setTargetEntity($entity);
- $transition->setValues($to_sid, $user->id(), \Drupal::time()->getRequestTime(), $comment);
- $transition->force($force);
-
- return $transition;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
- $form = [];
-
- // If we are on admin/config/system/actions and use CREATE AN ADVANCED ACTION
- // Then $context only contains:
- // - $context['actions_label'] = "Change workflow state of post to new state"
- // - $context['actions_type'] = "entity"
- //
- // If we are on a VBO action form, then $context only contains:
- // - $context['entity_type'] = "node"
- // - $context['view'] = "(Object) view"
- // - $context['settings'] = "[]"
-
- $config = $this->configuration;
- $field_name = $config['field_name'];
- $wids = workflow_get_workflow_names();
-
- if (empty($field_name) && count($wids) > 1) {
- drupal_set_message('You have more then one workflow in the system. Please first select the field name
- and save the form. Then, revisit the form to set the correct state value.', 'warning');
- }
- if (empty($field_name)) {
- $wid = count($wids) ? array_keys($wids)[0] : '';
- }
- else {
- $fields = _workflow_info_fields($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name);
- $wid = count($fields) ? reset($fields)->getSetting('workflow_type') : '';
- }
-
- // Get the common Workflow, or create a dummy Workflow.
- $workflow = $wid ? Workflow::load($wid) : Workflow::create(['id' => 'dummy_action', 'label' => 'dummy_action']);
- $current_state = $workflow->getCreationState();
-
- /*
- // @todo D8-port for VBO
- // Show the current state and the Workflow form to allow state changing.
- // N.B. This part is replicated in hook_node_view, workflow_tab_page, workflow_vbo.
- if ($workflow) {
- $field = _workflow_info_field($field_name, $workflow);
- $field_name = $field['field_name'];
- $field_id = $field['id'];
- $instance = field_info_instance($entity_type, $field_name, $entity_bundle);
-
- // Hide the submit button. VBO has its own 'next' button.
- $instance['widget']['settings']['submit_function'] = '';
- if (!$field_id) {
- // This is a Workflow Node workflow. Set widget options as in v7.x-1.2
- $field['settings']['widget']['comment'] = $workflow->options['comment_log_node']; // 'comment_log_tab' is removed;
- $field['settings']['widget']['current_status'] = TRUE;
- // As stated above, the options list is probably very long, so let's use select list.
- $field['settings']['widget']['options'] = 'select';
- // Do not show the default [Update workflow] button on the form.
- $instance['widget']['settings']['submit_function'] = '';
- }
- }
-
- // Add the form/widget to the formatter, and include the nid and field_id in the form id,
- // to allow multiple forms per page (in listings, with hook_forms() ).
- // Ultimately, this is a wrapper for WorkflowDefaultWidget.
- // $form['workflow_current_state'] = workflow_state_formatter($entity_type, $entity, $field, $instance);
- $form_id = implode('_', [
- 'workflow_transition_form',
- $entity_type,
- $entity_id,
- $field_id
- ]);
- */
- $user = workflow_current_user();
- $transition = WorkflowTransition::create([$current_state, 'field_name' => $field_name]);
- $transition->setValues(
- $to_sid = $config['to_sid'],
- $user->id(),
- \Drupal::time()->getRequestTime(),
- $comment = $config['comment'],
- $force = $config['force']
- );
-
- // Add the WorkflowTransitionForm to the page.
-
- $element = []; // Just to be explicit.
- $element['#default_value'] = $transition;
-
- // Avoid Action Buttons. That removes the options box&more. No Buttons in config screens!
- $original_options = $transition->getWorkflow()->options['options'];
- $transition->getWorkflow()->options['options'] = 'select';
- // Generate and add the Workflow form element.
- $element = WorkflowTransitionElement::transitionElement($element, $form_state, $form);
- // Just to be sure, reset the options box setting.
- $transition->getWorkflow()->options['options'] = $original_options;
-
- // Make adaptations for VBO-form:
- $element['field_name']['#access'] = TRUE;
- $element['force']['#access'] = TRUE;
- $element['to_sid']['#description'] = t('Please select the state that should be assigned when this action runs.');
- $element['comment']['#title'] = $this->t('Message');
- $element['comment']['#description'] = $this->t('This message will be written into the workflow history log when the action
- runs. You may include the following variables: %state, %title, %user.');
-
- $form['workflow_transition_action_config'] = $element;
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
- $configuration = $form_state->getValue('workflow_transition_action_config');
- // Remove the transition: generates an error upon saving the action definition.
- unset($configuration['workflow_transition']);
-
- $this->configuration = $configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
- $access = AccessResult::allowed();
- return $return_as_object ? $access : $access->isAllowed();
- }
-
-}
diff --git a/modules/workflow/src/Plugin/Block/WorkflowTransitionBlock.php b/modules/workflow/src/Plugin/Block/WorkflowTransitionBlock.php
deleted file mode 100644
index a60dae1..0000000
--- a/modules/workflow/src/Plugin/Block/WorkflowTransitionBlock.php
+++ /dev/null
@@ -1,89 +0,0 @@
- DRUPAL_NO_CACHE, // DRUPAL_CACHE_PER_ROLE will be assumed.
- *
- * @Block(
- * id = "workflow_transition_form_block",
- * admin_label = @Translation("Workflow Transition form"),
- * category = @Translation("Forms")
- * )
- */
-class WorkflowTransitionBlock extends BlockBase {
-
- /**
- * {@inheritdoc}
- */
- protected function blockAccess(AccountInterface $account) {
- /* @var $entity \Drupal\Core\Entity\EntityInterface */
- if (!$entity = workflow_url_get_entity()) {
- return AccessResult::forbidden();
- }
-
- // Only show block on entity view page (when default operation = '').
- if ($operation = workflow_url_get_operation()) {
- return AccessResult::forbidden();
- }
-
- // Only show block if entity has workflow, and user has permission.
- foreach (_workflow_info_fields($entity) as $definition) {
- $type_id = $definition->getSetting('workflow_type');
- if ($account->hasPermission("access $type_id workflow_transition form")) {
- return AccessResult::allowed();
- }
- }
-
- return AccessResult::forbidden();
- }
-
- /**
- * {@inheritdoc}
- */
- public function build() {
- $form = [];
-
- // Get the entity for this form.
- /* @var $entity \Drupal\Core\Entity\EntityInterface */
- if (!$entity = workflow_url_get_entity()) {
- return $form;
- }
- // Get the field name. Avoid error on Node Add page.
- if (!$field_name = workflow_get_field_name($entity)) {
- return $form;
- }
-
- /*
- * Output: generate the Transition Form.
- */
- // Create a transition, to pass to the form. No need to use setValues().
- $current_sid = workflow_node_current_state($entity, $field_name);
- $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
- $transition->setTargetEntity($entity);
- // Add the WorkflowTransitionForm to the page.
- $form = $this->entityFormBuilder()->getForm($transition, 'add');
-
- return $form;
- }
-
- /**
- * Retrieves the entity form builder.
- *
- * @return \Drupal\Core\Entity\EntityFormBuilderInterface
- * The entity form builder.
- */
- protected function entityFormBuilder() {
- return \Drupal::getContainer()->get('entity.form_builder');
- }
-
-}
diff --git a/modules/workflow/src/Plugin/Field/FieldFormatter/WorkflowDefaultFormatter.php b/modules/workflow/src/Plugin/Field/FieldFormatter/WorkflowDefaultFormatter.php
deleted file mode 100644
index 62a4bee..0000000
--- a/modules/workflow/src/Plugin/Field/FieldFormatter/WorkflowDefaultFormatter.php
+++ /dev/null
@@ -1,252 +0,0 @@
-get('current_user'),
- $container->get('entity.manager'),
- $container->get('entity.form_builder')
- );
- }
-
- /**
- * Constructs a new WorkflowDefaultFormatter.
- *
- * @param string $plugin_id
- * The plugin_id for the formatter.
- * @param mixed $plugin_definition
- * The plugin implementation definition.
- * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
- * The definition of the field to which the formatter is associated.
- * @param array $settings
- * The formatter settings.
- * @param string $label
- * The formatter label display setting.
- * @param string $view_mode
- * The view mode.
- * @param array $third_party_settings
- * Third party settings.
- * @param \Drupal\Core\Session\AccountInterface $current_user
- * The current user.
- * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
- * The entity manager
- * @param \Drupal\Core\Entity\EntityFormBuilderInterface $entity_form_builder
- * The entity form builder.
- */
- public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityManagerInterface $entity_manager, EntityFormBuilderInterface $entity_form_builder) {
- parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
- $this->viewBuilder = $entity_manager->getViewBuilder('workflow_transition');
- $this->storage = $entity_manager->getStorage('workflow_transition');
- $this->currentUser = $current_user;
- $this->entityManager = $entity_manager;
- $this->entityFormBuilder = $entity_form_builder;
- }
-
- /**
- * {@inheritdoc}
- *
- * N.B. A large part of this function is taken from CommentDefaultFormatter.
- */
- public function viewElements(FieldItemListInterface $items, $langcode) {
- $elements = [];
- $output = [];
-
- $field_name = $this->fieldDefinition->getName();
- $entity = $items->getEntity();
- $entity_type = $entity->getEntityTypeId();
-
- $status = $items->status;
-
- $workflow_settings = $this->getFieldSettings();
-
- $user = \Drupal::currentUser(); // @todo #2287057: OK?
- // @todo: Perhaps global user is not always the correct user.
- // E.g., on ScheduledTransition->execute()? But this function is mostly used in UI.
-
- $current_sid = $this->workflowManager()->getCurrentStateId($entity, $field_name);
- /* @var $current_state WorkflowState */
- $current_state = WorkflowState::load($current_sid);
-
- // First compose the current value with the normal formatter from list.module.
- $elements = workflow_state_formatter($entity, $field_name, $current_sid);
-
- // The state must not be deleted, or corrupted.
- if (!$current_state) {
- return $elements;
- }
-
- // Check permission, so that even with state change rights,
- // the form can be suppressed from the entity view (#1893724).
- $type_id = $current_state->getWorkflowId();
- if (!\Drupal::currentUser()->hasPermission("access $type_id workflow_transition form")) {
- return $elements;
- }
-
- // Workflows are added to the search results and search index by
- // workflow_node_update_index() instead of by this formatter, so don't
- // return anything if the view mode is search_index or search_result.
- if (in_array($this->viewMode, ['search_result', 'search_index'])) {
- return $elements;
- }
-
- if ($entity_type == 'comment') {
- // No Workflow form allowed on a comment display.
- // (Also, this avoids a lot of error messages.)
- return $elements;
- }
-
- // Only build form if user has possible target state(s).
- if (!$current_state->showWidget($entity, $field_name, $user, FALSE)) {
- return $elements;
- }
-
- // Create a transition, to pass to the form. No need to use setValues().
- $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
- $transition->setTargetEntity($entity);
-
- // Remove the default formatter. We are now building the widget.
- $elements = [];
-
- // BEGIN Copy from CommentDefaultFormatter
- $elements['#cache']['contexts'][] = 'user.permissions';
- $output['workflows'] = [];
- // Add the WorkflowTransitionForm to the page.
- // $build = $this->viewBuilder->viewMultiple($workflows);
- $build = $this->entityFormBuilder()->getForm($transition, 'add');
- $output['workflows'] += $build;
-
- // Only show the add workflow form if the user has permission.
- $elements['#cache']['contexts'][] = 'user.roles';
- // Do not show the form for the print view mode.
- $elements[] = $output + [
- '#workflow_type' => $this->getFieldSetting('workflow_type'),
- '#workflow_display_mode' => $this->getFieldSetting('default_mode'),
- 'workflows' => [],
- ];
- // END Copy from CommentDefaultFormatter
-
- return $elements;
- }
-
- /**
- * {@inheritdoc}
- */
- public function settingsForm(array $form, FormStateInterface $form_state) {
- $element = [];
- return $element;
- }
-
- /**
- * {@inheritdoc}
- */
- public function settingsSummary() {
- return [];
- }
-
- /**
- * Retrieves the entity form builder.
- *
- * @return \Drupal\Core\Entity\EntityFormBuilderInterface
- * The entity form builder.
- */
- protected function entityFormBuilder() {
- if (!$this->entityFormBuilder) {
- $this->entityFormBuilder = $this->container()->get('entity.form_builder');
- }
- return $this->entityFormBuilder;
- }
-
- /**
- * Retrieves the WorkflowManager.
- *
- * @return WorkflowManagerInterface
- */
- protected function workflowManager() {
- return \Drupal::service('workflow.manager');
- }
-
-}
diff --git a/modules/workflow/src/Plugin/Field/FieldType/WorkflowItem.php b/modules/workflow/src/Plugin/Field/FieldType/WorkflowItem.php
deleted file mode 100644
index 689d444..0000000
--- a/modules/workflow/src/Plugin/Field/FieldType/WorkflowItem.php
+++ /dev/null
@@ -1,406 +0,0 @@
- label' pairs, i.e. 'Publishing': 1 => unpublished, 2 => draft, 3 => published."),
- * category = @Translation("Workflow"),
- * default_widget = "workflow_default",
- * default_formatter = "list_default",
- * constraints = {
- * "WorkflowField" = {}
- * },
- * )
- */
-class WorkflowItem extends ListItemBase {
- //class WorkflowItem extends FieldItemBase implements OptionsProviderInterface {
- // @todo D8-port: perhaps even:
- //class WorkflowItem extends FieldStringItem {
-
- /**
- * {@inheritdoc}
- */
- public static function schema(FieldStorageDefinitionInterface $field_definition) {
- $schema = [
- 'columns' => [
- 'value' => [
- 'description' => 'The {workflow_states}.sid that this entity is currently in.',
- 'type' => 'varchar',
- 'length' => 128,
- ],
- ],
- 'indexes' => [
- 'value' => ['value'],
- ],
- ];
-
- return $schema;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-
- /**
- * Property definitions of the contained properties.
- *
- * @see FileItem::getPropertyDefinitions()
- *
- * @var array
- */
- static $propertyDefinitions;
-
-
- $definition['settings']['target_type'] = 'workflow_transition';
- // Definitions vary by entity type and bundle, so key them accordingly.
- $key = $definition['settings']['target_type'] . ':';
- $key .= isset($definition['settings']['target_bundle']) ? $definition['settings']['target_bundle'] : '';
-
- if (!isset($propertyDefinitions[$key])) {
-
- $propertyDefinitions[$key]['value'] = DataDefinition::create('string') // TODO D8-port : or 'any'
- ->setLabel(t('Workflow state'))
- ->addConstraint('Length', ['max' => 128])
- ->setRequired(TRUE);
-
- //workflow_debug( __FILE__ , __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- /*
- // @todo D8-port: test this.
- $propertyDefinitions[$key]['workflow_transition'] = DataDefinition::create('any')
- // $properties['workflow_transition'] = DataDefinition::create('WorkflowTransition')
- ->setLabel(t('Transition'))
- ->setDescription(t('The computed WorkflowItem object.'))
- ->setComputed(TRUE)
- ->setClass('\Drupal\workflow\Entity\WorkflowTransition')
- ->setSetting('date source', 'value');
-
- $propertyDefinitions[$key]['display'] = array(
- 'type' => 'boolean',
- 'label' => t('Flag to control whether this file should be displayed when viewing content.'),
- );
- $propertyDefinitions[$key]['description'] = array(
- 'type' => 'string',
- 'label' => t('A description of the file.'),
- );
-
- $propertyDefinitions[$key]['display'] = array(
- 'type' => 'boolean',
- 'label' => t('Flag to control whether this file should be displayed when viewing content.'),
- );
- $propertyDefinitions[$key]['description'] = array(
- 'type' => 'string',
- 'label' => t('A description of the file.'),
- );
- */
- }
- return $propertyDefinitions[$key];
- }
-
- /**
- * {@inheritdoc}
- */
- public function getEntity() {
- $entity = parent::getEntity();
-
- // For Workflow on CommentForm, get the CommentedEntity.
- if ($entity->getEntityTypeId() == 'comment') {
- /** @var $entity \Drupal\comment\CommentInterface */
- $entity = $entity->getCommentedEntity();
- }
-
- return $entity;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isEmpty() {
- $is_empty = empty($this->value);
- return $is_empty;
- }
-
- /**
- * {@inheritdoc}
- */
- public function onChange($property_name, $notify = TRUE) {
- //workflow_debug( __FILE__ , __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-
- // TODO D8: use this function onChange for adding a line in table workflow_transition_*
- // Enforce that the computed date is recalculated.
- //if ($property_name == 'value') {
- // $this->date = NULL;
- //}
- parent::onChange($property_name, $notify);
- }
-
- /**
- * {@inheritdoc}
- */
- public static function defaultStorageSettings() {
-
- return [
- 'workflow_type' => '',
- 'allowed_values_function' => 'workflow_state_allowed_values',
- ] + parent::defaultStorageSettings();
- }
-
- /**
- * Implements hook_field_settings_form() -> ConfigFieldItemInterface::settingsForm().
- */
- public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
- $element = [];
-
- // Create list of all Workflow types. Include an initial empty value.
- // Validate each workflow, and generate a message if not complete.
- $workflows = workflow_get_workflow_names(FALSE);
-
- // @todo D8: add this to WorkflowFieldConstraintValidator.
- // Set message, if no 'validated' workflows exist.
- if (count($workflows) == 1) {
- drupal_set_message(
- $this->t('You must create at least one workflow
- before content can be assigned to a workflow.',
- [':create' => Url::fromRoute('entity.workflow_type.collection')->toString(),]
- ), 'warning'
- );
- }
-
- // Validate via annotation WorkflowFieldConstraint. Show a message for each error.
- $violation_list = $this->validate();
- /** @var \Symfony\Component\Validator\ConstraintViolation $violation */
- foreach ($violation_list->getIterator() as $violation) {
- switch ($violation->getPropertyPath()) {
- case 'fieldnameOnComment':
- // @todo D8: CommentForm & constraints on storageSettingsForm()
- // A 'comment' field name MUST be equal to content field name.
- // @todo: Still not waterproof. You could have a field on a non-relevant entity_type.
- drupal_set_message($violation->getMessage(), 'error');
- $workflows = [];
- break;
-
- default:
- break;
- }
- }
-
- // @todo D8: CommentForm & constraints on storageSettingsForm
- // Set the required workflow_type on 'comment' fields.
- // N.B. the following must BELOW the (count($workflows) == 1) snippet.
- $field_storage = $this->getFieldDefinition()->getFieldStorageDefinition();
- if (!$this->getSetting('workflow_type') && $field_storage->getTargetEntityTypeId() == 'comment') {
- $field_name = $field_storage->get('field_name');
- $workflows = [];
- foreach (_workflow_info_fields($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name) as $key => $info) {
- if ($info->getName() == $field_name && ($info->getTargetEntityTypeId() !== 'comment')) {
- $wid = $info->getSetting('workflow_type');
- $workflow = Workflow::load($wid);
- $workflows[$wid] = $workflow->label();
- }
- }
- }
-
- // Let the user choose between the available workflow types.
- $wid = $this->getSetting('workflow_type');
- $url = Url::fromRoute('entity.workflow_type.collection')->toString();
- $element['workflow_type'] = [
- '#type' => 'select',
- '#title' => $this->t('Workflow type'),
- '#options' => $workflows,
- '#default_value' => $wid,
- '#required' => TRUE,
- '#disabled' => $has_data,
- '#description' => $this->t('Choose the Workflow type. Maintain workflows
- here .', [':url' => $url]),
- ];
-
- // Get a string representation to show all options.
-
- /*
- * Overwrite ListItemBase::storageSettingsForm().
- */
- if ($wid) {
- $allowed_values = WorkflowState::loadMultiple([], $wid);
- $allowed_values_function = $this->getSetting('allowed_values_function');
-
- $element['allowed_values'] = [
- '#type' => 'textarea',
- '#title' => $this->t('Allowed values for the selected Workflow type'),
- '#default_value' => ($wid) ? $this->allowedValuesString($allowed_values) : [],
- '#rows' => count($allowed_values),
- '#access' => ($wid) ? TRUE : FALSE, // User can see the data,
- '#disabled' => TRUE, // .. but cannot change them.
- '#element_validate' => [[get_class($this), 'validateAllowedValues']],
-
- '#field_has_data' => $has_data,
- '#field_name' => $this->getFieldDefinition()->getName(),
- '#entity_type' => ($this->getEntity()) ? $this->getEntity()->getEntityTypeId() : '',
- '#allowed_values' => $allowed_values,
- '#description' => $this->allowedValuesDescription(),
- ];
- }
-
- return $element;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function allowedValuesDescription() {
- return '';
- }
-
- /**
- * Generates a string representation of an array of 'allowed values'.
- *
- * This string format is suitable for edition in a textarea.
- *
- * @param WorkflowState[] $states
- * An array of WorkflowStates, where array keys are values and array values are
- * labels.
- *
- * @return string
- * The string representation of the $states array:
- * - Values are separated by a carriage return.
- * - Each value is in the format "value|label" or "value".
- */
- protected function allowedValuesString($states) {
- $lines = [];
-
- $wid = $this->getSetting('workflow_type');
-
- $previous_wid = -1;
- /** @var $state WorkflowState */
- foreach ($states as $key => $state) {
- // Only show enabled states.
- if ($state->isActive()) {
- // Show a Workflow name between Workflows, if more then 1 in the list.
- if ((!$wid) && ($previous_wid <> $state->getWorkflowId())) {
- $previous_wid = $state->getWorkflowId();
- $lines[] = $state->getWorkflow()->label() . "'s states: ";
- }
- $label = $this->t('@label', ['@label' => $state->label()]);
-
- $lines[] = " $key|$label";
- }
- }
- return implode("\n", $lines);
- }
-
-// /**
-// * {@inheritdoc}
-// */
-// public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
-// // @todo Implement this once https://www.drupal.org/node/2238085 lands.
-// $values['value'] = rand(pow(10, 8), pow(10, 9)-1);
-// return $values;
-// }
-
-
- /**
- * Implementation of TypedDataInterface
- *
- * @see folder \workflow\src\Plugin\Validation\Constraint
- */
-
- /**
- * {@inheritdoc}
- *
- * @see folder \workflow\src\Plugin\Validation\Constraint
- */
-// public function getConstraints() {
-// $constraints = parent::getConstraints();
-// return $constraints;
-// }
-
- /**
- * {@inheritdoc}
- *
- * @see folder \workflow\src\Plugin\Validation\Constraint
- */
-// public function validate() {
-// $result = parent::validate();
-// return $result;
-// }
-
- /**
- * Implementation of OptionsProviderInterface
- *
- * An array of settable options for the object that may be used in an
- * Options widget, usually when new data should be entered. It may either be
- * a flat array of option labels keyed by values, or a two-dimensional array
- * of option groups (array of flat option arrays, keyed by option group
- * label). Note that labels should NOT be sanitized.
- */
-
- /**
- * {@inheritdoc}
- */
- public function getPossibleValues(AccountInterface $account = NULL) {
- // Flatten options firstly, because Possible Options may contain group
- // arrays.
- $flatten_options = OptGroup::flattenOptions($this->getPossibleOptions($account));
- return array_keys($flatten_options);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPossibleOptions(AccountInterface $account = NULL) {
- $allowed_options = [];
-
- // Use the 'allowed_values_function' to calculate the options.
- $field_storage = $this->getFieldDefinition()->getFieldStorageDefinition();
- $entity = $this->getEntity();
- $cacheable = TRUE;
- $allowed_options = workflow_state_allowed_values($field_storage, $entity, $cacheable, $account);
-
- return $allowed_options;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSettableValues(AccountInterface $account = NULL) {
- // Flatten options firstly, because Settable Options may contain group
- // arrays.
- $flatten_options = OptGroup::flattenOptions($this->getSettableOptions($account));
- return array_keys($flatten_options);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSettableOptions(AccountInterface $account = NULL) {
- $allowed_options = [];
-
- // When we are initially on the Storage settings form, no wid is set, yet.
- if (!$wid = $this->getSetting('workflow_type')) {
- return $allowed_options;
- }
-
- // Use the 'allowed_values_function' to calculate the options.
- $field_storage = $this->getFieldDefinition()->getFieldStorageDefinition();
- $entity = $this->getEntity();
- $cacheable = TRUE;
- $allowed_options = workflow_state_allowed_values($field_storage, $entity, $cacheable, $account);
-
- return $allowed_options;
- }
-
-}
diff --git a/modules/workflow/src/Plugin/Field/FieldWidget/WorkflowDefaultWidget.php b/modules/workflow/src/Plugin/Field/FieldWidget/WorkflowDefaultWidget.php
deleted file mode 100644
index 82a58f4..0000000
--- a/modules/workflow/src/Plugin/Field/FieldWidget/WorkflowDefaultWidget.php
+++ /dev/null
@@ -1,248 +0,0 @@
- array(
- 'label' => t('Workflow'),
- 'field types' => array('workflow'),
- 'settings' => array(
- 'fieldset' => 0,
- 'name_as_title' => 1,
- 'comment' => 1,
- ),
- ),
- */
- ] + parent::defaultSettings();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-
- // Field ID contains entity_type, bundle, field_name.
- $field_id = $this->fieldDefinition->id();
- $entity_id = ''; // TODO D8-port
-
- $form_id = implode('_', ['workflow_transition_form', $entity_id, $field_id]);
- return $form_id;
- }
-
- /**
- * {@inheritdoc}
- *
- * Be careful: Widget may be shown in very different places. Test carefully!!
- * - On a entity add/edit page
- * - On a entity preview page
- * - On a entity view page
- * - On a entity 'workflow history' tab
- * - On a comment display, in the comment history
- * - On a comment form, below the comment history
- *
- * @todo D8: change "array $items" to "FieldInterface $items"
- */
- public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-
- $wid = $this->getFieldSetting('workflow_type');
- /** @var $workflow Workflow */
- if (!$workflow = Workflow::load($wid)) {
- // @todo: add error message.
- return $element;
- }
-
- if ($this->isDefaultValueWidget($form_state)) {
- // On the Field settings page, User may not set a default value
- // (this is done by the Workflow module).
- return [];
- }
-
- /** @var $item \Drupal\workflow\Plugin\Field\FieldType\WorkflowItem */
- $item = $items[$delta];
- /** @var $field_config \Drupal\field\Entity\FieldConfig */
- $field_config = $item->getFieldDefinition();
- /** @var $field_storage \Drupal\field\Entity\FieldStorageConfig */
- $field_storage = $field_config->getFieldStorageDefinition();
-
- $field_name = $field_storage->get('field_name');
- $entity = $item->getEntity();
- $from_sid = workflow_node_current_state($entity, $field_name);
-
- // Create a transition, to pass to the form. No need to use setValues().
- /** @var $transition WorkflowTransition */
- $transition = WorkflowTransition::create([$from_sid, 'field_name' => $field_name]);
- $transition->setTargetEntity($entity);
-
- // Here, on entity form, not the $element is added, but the entity form.
- // Problem 1: adding the element, does not add added fields.
- // Problem 2: adding the form, generates wrong UI.
- // Problem 3: does not work on ScheduledTransition.
-
- // Step 1: use the Element.
- $element['#default_value'] = $transition;
- $element += WorkflowTransitionElement::transitionElement($element, $form_state, $form);
-
- // Step 2: use the Form, in order to get extra fields.
- $entity_form_builder = \Drupal::getContainer()->get('entity.form_builder');
- $workflow_form = $entity_form_builder->getForm($transition, 'add');
- // Determine and add the attached fields.
- $attached_fields = Workflow::workflowManager()->getAttachedFields('workflow_transition', $wid);
- foreach ($attached_fields as $attached_field) {
- $element[$attached_field] = $workflow_form[$attached_field];
- }
-
- // Option 3: use the true Element.
- // $form = $this->element($form, $form_state, $transition);
- //$element['workflow_transition'] = array(
- // '#type' => 'workflow_transition',
- // '#title' => t('Workflow transition'),
- // '#default_value' => $transition,
- // );
-
- return $element;
- }
-
- /**
- * {@inheritdoc}
- *
- * Implements workflow_transition() -> WorkflowDefaultWidget::submit().
- *
- * Overrides submit(array $form, array &$form_state).
- * Contains 2 extra parameters for D7
- *
- * @param array $form
- * @param array $form_state
- * @param array $items
- * The value of the field.
- * @param bool $force
- * TRUE if all access must be overridden, e.g., for Rules.
- *
- * @return int
- * If update succeeded, the new State Id. Else, the old Id is returned.
- *
- * This is called from function _workflow_form_submit($form, &$form_state)
- * It is a replacement of function workflow_transition($entity, $to_sid, $force, $field)
- * It performs the following actions;
- * - save a scheduled action
- * - update history
- * - restore the normal $items for the field.
- * @todo: remove update of {node_form} table. (separate task, because it has features, too)
- */
- public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
-
- $user = workflow_current_user(); // @todo #2287057: verify if submit() really is only used for UI. If not, $user must be passed.
-
- // Set the new value.
- // Beware: We presume cardinality = 1 !!
- // The widget form element type has transformed the value to a
- // WorkflowTransition object at this point. We need to convert it
- // back to the regular 'value' string format.
- foreach ($values as &$item) {
- if (!empty($item)) { // } && $item['value'] instanceof DrupalDateTime) {
-
- // The following can NOT be retrieved from the WorkflowTransition.
- /** @var $entity \Drupal\Core\Entity\EntityInterface */
- $entity = $form_state->getFormObject()->getEntity();
- /** @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
- $transition = $item['workflow_transition'];
- $field_name = $transition->getFieldName();
- // N.B. Use a proprietary version of copyFormValuesToEntity,
- // where $entity/$transition is passed by reference.
- /** @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
- $transition = WorkflowTransitionElement::copyFormValuesToTransition($transition, $form, $form_state, $item);
-
- // Try to execute the transition. Return $from_sid when error.
- if (!$transition) {
- // This should not be possible (perhaps when testing/developing).
- drupal_set_message(t('Error: the transition from %from_sid to %to_sid could not be generated.'), 'error');
- // The current value is still the previous state.
- $to_sid = $from_sid = 0;
- }
- else {
- // The transition may be scheduled or not. Save the result, and
- // rely upon hook workflow_entity_insert/update($entity) in
- // file workflow.module to save/execute the transition.
-
- // - validate option; add hook to let other modules change comment.
- // - add to history; add to watchdog
- // Return the new State ID. (Execution may fail and return the old Sid.)
-
- // Get the new value from an action button if set in the workflow settings.
- $action_info = _workflow_transition_form_get_triggering_button($form_state);
- if ($field_name == $action_info['field_name']) {
- $transition->set('to_sid', $action_info['to_sid']);
- }
-
- $force = FALSE; // @TODO D8-port: add to form for usage in VBO.
-
- // Now, save/execute the transition.
- $from_sid = $transition->getFromSid();
- $force = $force || $transition->isForced();
-
- if (!$transition->isAllowed($user, $force)) {
- // Transition is not allowed.
- $to_sid = $from_sid;
- }
- elseif (!$entity || !$entity->id()) {
- // Entity is inserted. The Id is not yet known.
- // So we can't yet save the transition right now, but must rely on
- // function/hook workflow_entity_insert($entity) in file workflow.module.
- // $to_sid = $transition->execute($force);
- $to_sid = $transition->getToSid();
- }
- else {
- // Entity is updated. To stay in sync with insert, we rely on
- // function/hook workflow_entity_update($entity) in file workflow.module.
- // $to_sid = $transition->execute($force);
- $to_sid = $transition->getToSid();
- }
- }
-
- // Now the data is captured in the Transition, and before calling the
- // Execution, restore the default values for Workflow Field.
- // For instance, workflow_rules evaluates this.
- //
- // N.B. Align the following functions:
- // - WorkflowDefaultWidget::massageFormValues();
- // - WorkflowManager::executeTransition().
- // Set the transition back, to be used in hook_entity_update().
- $item['workflow_transition'] = $transition;
- // Set the value at the proper location.
- if ($transition && $transition->isScheduled()) {
- $item['value'] = $from_sid;
- }
- else {
- $item['value'] = $to_sid;
- }
- }
- }
- return $values;
- }
-
-}
diff --git a/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraint.php b/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraint.php
deleted file mode 100644
index dbc7eb1..0000000
--- a/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraint.php
+++ /dev/null
@@ -1,36 +0,0 @@
-userStorage = $user_storage;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static($container->get('entity.manager')->getStorage('user'));
- }
-
- /**
- * {@inheritdoc}
- */
- public function validate($entity, Constraint $constraint) {
- // Workflow field name on CommentForm has special requirements.
- $field_storage = $entity->getFieldDefinition()->getFieldStorageDefinition();
- if ($field_storage->getTargetEntityTypeId() == 'comment') {
- if (!$this->isValidFieldname($field_storage)) {
- $this->context->buildViolation($constraint->messageFieldname)
- ->atPath('fieldnameOnComment')
- ->addViolation();
- }
- }
- }
-
- /**
- * @param FieldStorageConfig $field_storage
- *
- * @return bool
- */
- protected function isValidFieldname(FieldStorageConfig $field_storage) {
- $comment_field_name_ok = FALSE;
-
- if ($field_storage->getTargetEntityTypeId() !== 'comment') {
- return TRUE;
- }
-
- $field_name = $field_storage->get('field_name');
-
- // Check if the 'comment' field name exists on the 'commented' entity type.
- // @todo: Still not waterproof. You could have a field on a non-relevant entity_type.
- foreach (_workflow_info_fields() as $key => $info) {
- if (($info->getName() == $field_name) && ($info->getTargetEntityTypeId() !== 'comment')) {
- $comment_field_name_ok = TRUE;
- }
- }
-
- return $comment_field_name_ok;
- }
-
-}
diff --git a/modules/workflow/src/Plugin/views/filter/WorkflowState.php b/modules/workflow/src/Plugin/views/filter/WorkflowState.php
deleted file mode 100644
index 8556a69..0000000
--- a/modules/workflow/src/Plugin/views/filter/WorkflowState.php
+++ /dev/null
@@ -1,55 +0,0 @@
-definition['wid']) ? $this->definition['wid'] : '';
- $grouped = isset($options['group_info']['widget']) ? $options['group_info']['widget'] == 'select' : false;
- $this->valueOptions = workflow_get_workflow_state_names($wid, $grouped);
- }
-
- /**
- * Child classes should be used to override this function and set the
- * 'value options', unless 'options callback' is defined as a valid function
- * or static public method to generate these values.
- *
- * This can use a guard to be used to reduce database hits as much as
- * possible.
- *
- * @return array|null
- * The stored values from $this->valueOptions.
- */
- public function getValueOptions() {
-
- if (isset($this->valueOptions)) {
- return $this->valueOptions;
- }
-
- //@todo: implement the below code, and remove the line from init.
- // @todo: follow Options patterns
- // @see callback_allowed_values_function()
- // @see options_allowed_values()
-
- return parent::getValueOptions();
- }
-}
diff --git a/modules/workflow/src/WorkflowAccessControlHandler.php b/modules/workflow/src/WorkflowAccessControlHandler.php
deleted file mode 100644
index 8597407..0000000
--- a/modules/workflow/src/WorkflowAccessControlHandler.php
+++ /dev/null
@@ -1,139 +0,0 @@
-prepareUser($account);
- // $account = workflow_current_user($account);
-
- /* @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
- $transition = $entity;
-
- // This is only for Edit/Delete transition. For Add/create, use createAccess.
- switch ($entity->getEntityTypeId()) {
- case 'workflow_scheduled_transition':
- switch ($operation) {
- case 'update':
- // This operation is not defined for Scheduled Transitions.
- $result = AccessResult::forbidden();
- break;
-
- case 'delete':
- // This operation is not defined for Scheduled Transitions.
- $result = AccessResult::forbidden();
- break;
-
- case 'revert':
- // This operation is not defined for Scheduled Transitions.
- $result = AccessResult::forbidden();
- break;
-
- default:
- $result = parent::access($entity, $operation, $account, $return_as_object);
- break;
- } // End of switch ($operation).
-
- break;
-
- case 'workflow_transition':
-
- switch ($operation) {
- case 'update':
- $is_owner = WorkflowManager::isOwner($account, $transition);
- $type_id = $transition->getWorkflowId();
- if ($account->hasPermission("bypass $type_id workflow_transition access")) {
- $result = AccessResult::allowed()->cachePerPermissions();
- }
- elseif ($account->hasPermission("edit any $type_id workflow_transition")) {
- $result = AccessResult::allowed()->cachePerPermissions();
- }
- elseif ($is_owner && $account->hasPermission("edit own $type_id workflow_transition")) {
- $result = AccessResult::allowed()->cachePerPermissions();
- }
- return $return_as_object ? $result : $result->isAllowed();
-
- case 'delete':
- // The delete operation is not defined for Transitions.
- $result = AccessResult::forbidden();
- break;
-
- case 'revert':
- // @see workflow_operations.
- default:
- $type_id = $transition->getWorkflowId();
- $result = parent::access($entity, $operation, $account, $return_as_object);
- //if ($account->hasPermission("bypass $type_id workflow_transition access")) {
- // $result = AccessResult::allowed()->cachePerPermissions();
- //}
- break;
- } // End of switch ($operation).
-
- break;
-
- case 'workflow_config_transition':
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, $account->id(), $transition->getOwnerId()); // @todo D8-port: still test this snippet.
- break;
- }
-
- /* @var $result \Drupal\Core\Access\AccessResult */
- $result = parent::access($entity, $operation, $account, TRUE)->cachePerPermissions();
- return $return_as_object ? $result : $result->isAllowed();
- }
-
- /**
- * {@inheritdoc}
- */
- public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = [], $return_as_object = FALSE) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- /* @var $result \Drupal\Core\Access\AccessResult */
- $result = parent::createAccess($entity_bundle, $account, $context, TRUE)->cachePerPermissions();
- return $return_as_object ? $result : $result->isAllowed();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function checkAccess(EntityInterface $transition, $operation, AccountInterface $account) {
- return parent::checkAccess($transition, $operation, $account);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- return AccessResult::allowedIf($account->hasPermission('create ' . $entity_bundle . ' content'))->cachePerPermissions();
- }
-
-}
diff --git a/modules/workflow/src/WorkflowPermissions.php b/modules/workflow/src/WorkflowPermissions.php
deleted file mode 100644
index ab440c3..0000000
--- a/modules/workflow/src/WorkflowPermissions.php
+++ /dev/null
@@ -1,79 +0,0 @@
-buildPermissions($type);
- }
- return $perms;
- }
-
- /**
- * Returns a list of workflow permissions for a given workflow type.
- *
- * @param \Drupal\workflow\Entity\Workflow $type
- * The workflow type.
- *
- * @return array
- * An associative array of permission names and descriptions.
- */
- protected function buildPermissions(Workflow $type) {
- $type_id = $type->id();
- $type_params = ['%type_name' => $type->label()];
-
- return [
- // D7->D8-Conversion of the 'User 1 is special' permission (@see NodePermissions::bypass node access).
- "bypass $type_id workflow_transition access" => [
- 'title' => $this->t('%type_name: Bypass transition access control', $type_params),
- 'description' => $this->t('View, edit and delete all transitions regardless of permission restrictions.'),
- 'restrict access' => TRUE,
- ],
- // D7->D8-Conversion of 'participate in workflow' permission to "create $type_id transition" (@see NodePermissions::create content).
- "create $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Participate in workflow', $type_params),
- 'description' => $this->t("Role is enabled to create state transitions. (Determines transition-specific permission on the workflow admin page.
- Warning: For better control, uncheck the 'Authenticated user', and manage the permissions per separate role. )"),
- ],
- // D7->D8-Conversion of 'schedule workflow transitions' permission to "schedule $type_id transition" (@see NodePermissions::create content).
- "schedule $type_id workflow_transition" => [
- 'title' => $this->t('%type_name: Schedule state transition', $type_params),
- 'description' => $this->t('Role is enabled to schedule state transitions.'),
- ],
- // D7->D8-Conversion of 'workflow history' permission on Workflow settings to "access $type_id overview" (@see NodePermissions::access content overview).
- "access own $type_id workflow_transion overview" => [
- 'title' => $this->t('%type_name: Access Workflow history tab of own content', $type_params),
- 'description' => $this->t('Role is enabled to view the "Workflow state transition history" tab on own entity.'),
- ],
- "access any $type_id workflow_transion overview" => [
- 'title' => $this->t('%type_name: Access Workflow history tab of any content', $type_params),
- 'description' => $this->t('Role is enabled to view the "Workflow state transition history" tab on any entity.'),
- ],
- // D7->D8-Conversion of 'show workflow transition form' permission. @see #1893724
- "access $type_id workflow_transition form" => [
- 'title' => $this->t('%type_name: Access the Workflow state transition form on entity view page', $type_params),
- 'description' => $this->t('Role is enabled to view a "Workflow state transition" block/widget and add a state transition on the entity page.'),
- ],
- ];
- }
-
-}
diff --git a/modules/workflow/src/WorkflowScheduledTransitionViewsData.php b/modules/workflow/src/WorkflowScheduledTransitionViewsData.php
deleted file mode 100644
index 9319a5d..0000000
--- a/modules/workflow/src/WorkflowScheduledTransitionViewsData.php
+++ /dev/null
@@ -1,22 +0,0 @@
-workflow_entity; // N.B. This is a custom variable.
- $field_name = workflow_url_get_field_name();
-
- $entity_type = $entity->getEntityTypeId();
- $entity_id = $entity->id();
-
- // @todo D8-port: document $limit.
- // @todo d8-port: $limit should be used in pager, not in load().
- $this->limit = \Drupal::config('workflow.settings')->get('workflow_states_per_page');
- $limit = $this->limit;
- // Get Transitions with highest timestamp first.
- $entities = WorkflowTransition::loadMultipleByProperties($entity_type, [$entity_id], [], $field_name, '', $limit, 'DESC');
- return $entities;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'workflow_transiton_history_form';
- }
-
- /**
- * {@inheritdoc}
- *
- * Building the header and content lines for the contact list.
- *
- * Calling the parent::buildHeader() adds a column for the possible actions
- * and inserts the 'edit' and 'delete' links as defined for the entity type.
- */
- public function buildHeader() {
-
- $entity = $this->workflow_entity; // N.B. This is a custom variable.
- $field_name = workflow_url_get_field_name();
-
- $header['timestamp'] = $this->t('Date');
- if ($this->showColumnFieldname($entity)) {
- $header['field_name'] = $this->t('Field name');
- }
- $header['from_state'] = $this->t('From State');
- $header['to_state'] = $this->t('To State');
- $header['user_name'] = $this->t('By');
- $header['comment'] = $this->t('Comment');
-
- // column 'Operations' is now added by core.
- //$header['operations'] = $this->t('Operations');
-
- return $header + parent::buildHeader();
- }
-
- /**
- * {@inheritdoc}
- *
- * @todo D8-port: add D7-theming to TransitionListBuilder.
- */
- public function buildRow(EntityInterface $transition) {
- // Show the history table.
- $current_themed = FALSE;
- /* @var $transition WorkflowTransitionInterface */
- $entity = $transition->getTargetEntity();
- $field_name = $transition->getFieldName();
- $current_sid = workflow_node_current_state($entity, $field_name);
-
- $to_state = $transition->getToState();
- if (!$to_state) {
- // This is an invalid/deleted state.
- $to_label = WORKFLOW_MARK_STATE_IS_DELETED;
- // Add a footer to explain the addition.
- $this->footer_needed = TRUE;
- }
- else {
- $label = Html::escape($this->t($to_state->label()));
- if ($transition->getToSid() == $current_sid && $to_state->isActive() && !$current_themed) {
- $to_label = $label;
-
- if (!$current_themed) {
- // Make a note that we have themed the current state; other times in the history
- // of this entity where the entity was in this state do not need to be specially themed.
- $current_themed = TRUE;
- }
- }
- elseif (!$to_state->isActive()) {
- $to_label = $label . WORKFLOW_MARK_STATE_IS_DELETED;
- // Add a footer to explain the addition.
- $this->footer_needed = TRUE;
- }
- else {
- // Regular state.
- $to_label = $label;
- }
- }
- unset($to_state); // Not needed anymore.
-
- $from_state = $transition->getFromState();
- if (!$from_state) {
- // This is an invalid/deleted state.
- $from_label = WORKFLOW_MARK_STATE_IS_DELETED;
- // Add a footer to explain the addition.
- $this->footer_needed = TRUE;
- }
- else {
- $label = Html::escape($this->t($from_state->label()));
- if (!$from_state->isActive()) {
- $from_label = $label . WORKFLOW_MARK_STATE_IS_DELETED;
- // Add a footer to explain the addition.
- $this->footer_needed = TRUE;
- }
- else {
- // Regular state.
- $from_label = $label;
- }
- }
- unset($from_state); // Not needed anymore.
-
- $owner = $transition->getOwner();
- $field_name = $transition->getFieldName();
- $field_label = $transition->getFieldName();
- $variables = [
- 'transition' => $transition,
- 'extra' => '',
- 'from_label' => $from_label,
- 'to_label' => $to_label,
- 'user' => $owner,
- ];
- // Allow other modules to modify the row.
- \Drupal::moduleHandler()->alter('workflow_history', $variables);
-
- // 'class' => array('workflow_history_row'), // TODO D8-port
- $row['timestamp']['data'] = $transition->getTimestampFormatted(); // 'class' => array('timestamp')
- // html_entity_decode() transforms chars like '&' correctly.
- if ($this->showColumnFieldname($entity)) {
- $row['field_name']['data'] = html_entity_decode($field_label);
- }
- $row['from_state']['data'] = html_entity_decode($from_label); // 'class' => array('previous-state-name'))
- $row['to_state']['data'] = html_entity_decode($to_label); // 'class' => array('state-name'))
- $row['user_name']['data'] = $owner->getUsername(); // 'class' => array('user-name')
- $row['comment']['data'] = html_entity_decode($transition->getComment()); // 'class' => array('log-comment')
-
- // Column 'Operations' is now added by core.
- // D7: $row['operations']['data'] = $this->buildOperations($entity);
- $row += parent::buildRow($transition);
-
- return $row;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
- $form = parent::buildForm($form, $form_state);
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- *
- * Builds the entity listing as renderable array for table.html.twig.
- */
- public function render() {
- $build = [];
-
- // @todo d8-port: get pager working.
- $this->limit = \Drupal::config('workflow.settings')->get('workflow_states_per_page'); // TODO D8-port
- // $output .= theme('pager', array('tags' => $limit)); // @todo D8-port
-
- $build += parent::render();
-
- // Add a footer. This is not yet added in EntityListBilder::render()
- if ($this->footer_needed) { // @todo D8-port: test this.
- // Two variants. First variant is official, but I like 2nd better.
- /*
- $build['table']['#footer'] = [
- [
- 'class' => ['footer-class'],
- 'data' => [
- [
- 'data' => WORKFLOW_MARK_STATE_IS_DELETED . ' ' . t('State is no longer available.'),
- 'colspan' => count($build['table']['#header']),
- ],
- ],
- ],
- ];
- */
- $build['workflow_footer'] = [
- '#markup' => WORKFLOW_MARK_STATE_IS_DELETED . ' ' . t('State is no longer available.'),
- '#weight' => 500, // @todo Make this better.
- ];
- }
-
- return $build;
- }
-
- /**
- * Just for reference: parent::getOperations calls 2 hooks/alters.
- * {@inheritdoc}
- */
- /*
- public function getOperations(EntityInterface $entity) {
- $operations = $this->getDefaultOperations($entity);
- $operations += $this->moduleHandler()->invokeAll('entity_operation', array($entity));
- $this->moduleHandler->alter('entity_operation', $operations, $entity);
- uasort($operations, '\Drupal\Component\Utility\SortArray::sortByWeightElement');
-
- return $operations;
- }
- */
-
- /**
- * {@inheritdoc}
- */
- public function getDefaultOperations(EntityInterface $entity) {
- $operations = parent::getDefaultOperations($entity);
-
- /* @var $transition WorkflowTransitionInterface */
- $transition = $entity;
-
- if (isset($operations['edit'])) {
- $destination = \Drupal::destination()->getAsArray();
- $operations['edit']['query'] = $destination;
- }
-
- return $operations;
- }
-
- /**
- * Gets the title of the page.
- *
- * @return string
- * A string title of the page.
- */
- protected function getTitle() {
- return $this->t('Workflow history');
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- return;
- }
-
- /**
- * {@inheritdoc}
- *
- * Overrides DraggableListBuilder::submitForm().
- * The WorkflowState entities are always saved.
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- }
-
- /**
- * Determines if the column 'Field name' must be shown.
- *
- * @param EntityInterface $entity
- *
- * @return bool
- */
- protected function showColumnFieldname(EntityInterface $entity) {
- if (is_null($this->show_column_fieldname)) {
- // @todo: also remove when field_name is set in route??
- if (count(_workflow_info_fields($entity)) > 1) {
- $this->show_column_fieldname = TRUE;
- }
- }
- return $this->show_column_fieldname;
- }
-
-}
diff --git a/modules/workflow/src/WorkflowTransitionViewsData.php b/modules/workflow/src/WorkflowTransitionViewsData.php
deleted file mode 100644
index 98b55b0..0000000
--- a/modules/workflow/src/WorkflowTransitionViewsData.php
+++ /dev/null
@@ -1,173 +0,0 @@
-entityType->getBaseTable();
- $base_field = $this->entityType->getKey('id');
-
- // @todo D8-port: Add data from D7 function workflow_views_views_data_alter()
- // @see http://cgit.drupalcode.org/workflow/tree/workflow_views/workflow_views.views.inc
-
- $data[$base_table]['table']['join'] = [
- // This is provided for the many_to_one argument.
- $base_table => [
- 'field' => $base_field,
- 'left_field' => $base_field,
- ],
- ];
-
- // @todo: this relationship needs to be reversed. See also taxonomy/src/NodeTermData.php
- //$data[$base_table]['nid'] = [
- // 'title' => $this->t('Content with workflow'),
- // 'help' => $this->t('Relate all content with a workflow.'),
- // 'relationship' => [
- // 'id' => 'standard',
- // 'base' => 'node',
- // 'base field' => 'nid',
- // 'label' => $this->t('node'),
- // 'skip base' => 'node',
- // ],
- //];
-
- $data[$base_table]['from_sid']['filter']['id'] = 'workflow_state';
- $data[$base_table]['from_sid']['help'] = $this->t('The name of the previous state of the transition.');
-
- $data[$base_table]['to_sid']['filter']['id'] = 'workflow_state';
- $data[$base_table]['to_sid']['help'] = $this->t('The name of the new state of the transition. (For the latest transition, this is the current state.)');
-
- $data[$base_table]['uid']['help'] = $this->t('The user who triggered the transition. If you need more fields than the uid add the content: author relationship');
- $data[$base_table]['uid']['filter']['id'] = 'user_name';
- $data[$base_table]['uid']['relationship']['title'] = $this->t('User');
- $data[$base_table]['uid']['relationship']['help'] = $this->t('The user who triggered the transition.');
- $data[$base_table]['uid']['relationship']['label'] = $this->t('User');
-
- // @todo Add similar support to any date field
- // @see https://www.drupal.org/node/2337507
- $data[$base_table]['timestamp_fulldate'] = [
- 'title' => $this->t('Created date'),
- 'help' => $this->t('Date in the form of CCYYMMDD.'),
- 'argument' => [
- 'field' => 'timestamp',
- 'id' => 'date_fulldate',
- ],
- ];
-
- $data[$base_table]['timestamp_year_month'] = [
- 'title' => $this->t('Created year + month'),
- 'help' => $this->t('Date in the form of YYYYMM.'),
- 'argument' => [
- 'field' => 'timestamp',
- 'id' => 'date_year_month',
- ],
- ];
-
- $data[$base_table]['timestamp_year'] = [
- 'title' => $this->t('Created year'),
- 'help' => $this->t('Date in the form of YYYY.'),
- 'argument' => [
- 'field' => 'timestamp',
- 'id' => 'date_year',
- ],
- ];
-
- $data[$base_table]['timestamp_month'] = [
- 'title' => $this->t('Created month'),
- 'help' => $this->t('Date in the form of MM (01 - 12).'),
- 'argument' => [
- 'field' => 'timestamp',
- 'id' => 'date_month',
- ],
- ];
-
- $data[$base_table]['timestamp_day'] = [
- 'title' => $this->t('Created day'),
- 'help' => $this->t('Date in the form of DD (01 - 31).'),
- 'argument' => [
- 'field' => 'timestamp',
- 'id' => 'date_day',
- ],
- ];
-
- $data[$base_table]['timestamp_week'] = [
- 'title' => $this->t('Created week'),
- 'help' => $this->t('Date in the form of WW (01 - 53).'),
- 'argument' => [
- 'field' => 'timestamp',
- 'id' => 'date_week',
- ],
- ];
-
- $data[$base_table]['changed_fulldate'] = [
- 'title' => $this->t('Updated date'),
- 'help' => $this->t('Date in the form of CCYYMMDD.'),
- 'argument' => [
- 'field' => 'changed',
- 'id' => 'date_fulldate',
- ],
- ];
-
- $data[$base_table]['changed_year_month'] = [
- 'title' => $this->t('Updated year + month'),
- 'help' => $this->t('Date in the form of YYYYMM.'),
- 'argument' => [
- 'field' => 'changed',
- 'id' => 'date_year_month',
- ],
- ];
-
- $data[$base_table]['changed_year'] = [
- 'title' => $this->t('Updated year'),
- 'help' => $this->t('Date in the form of YYYY.'),
- 'argument' => [
- 'field' => 'changed',
- 'id' => 'date_year',
- ],
- ];
-
- $data[$base_table]['changed_month'] = [
- 'title' => $this->t('Updated month'),
- 'help' => $this->t('Date in the form of MM (01 - 12).'),
- 'argument' => [
- 'field' => 'changed',
- 'id' => 'date_month',
- ],
- ];
-
- $data[$base_table]['changed_day'] = [
- 'title' => $this->t('Updated day'),
- 'help' => $this->t('Date in the form of DD (01 - 31).'),
- 'argument' => [
- 'field' => 'changed',
- 'id' => 'date_day',
- ],
- ];
-
- $data[$base_table]['changed_week'] = [
- 'title' => $this->t('Updated week'),
- 'help' => $this->t('Date in the form of WW (01 - 53).'),
- 'argument' => [
- 'field' => 'changed',
- 'id' => 'date_week',
- ],
- ];
-
- return $data;
- }
-
-}
diff --git a/modules/workflow/workflow.api.php b/modules/workflow/workflow.api.php
deleted file mode 100644
index c5da5f4..0000000
--- a/modules/workflow/workflow.api.php
+++ /dev/null
@@ -1,431 +0,0 @@
- $workflow->label()]);
- $attributes = ['alt' => $alt, 'title' => $alt];
- $operations['workflow_access_form'] = [
- 'title' => t('Access'),
- 'weight' => 50,
- 'url' => \Drupal\Core\Url::fromRoute('entity.workflow_type.access_form', ['workflow_type' => $workflow->id()]),
- 'query' => \Drupal::destination()->getAsArray(), // Add destination.
- ];
- return $operations;
-
- case 'state':
- /* @var $state WorkflowState */
- $state = $entity;
- break;
-
- case 'workflow_transition':
- // As of D8, below hook_workflow_operations is removed, in favour of core hooks.
- // @see EntityListBuilder::getOperations, workflow_operations, workflow.api.php.
-
- // Your module may add operations to the Entity list.
- /* @var $transition WorkflowTransitionInterface */
- $transition = $entity;
- break;
-
- default:
- break;
- }
- return $operations;
-}
-
-/**
- * Implements hook_workflow().
- *
- * NOTE: This hook may reside in the implementing module
- * or in a module.workflow.inc file.
- *
- * @param string $op
- * The current workflow operation.
- * E.g., 'transition pre', 'transition post'.
- * @param WorkflowTransitionInterface $transition
- * The transition, that contains all of the above.
- * @param UserInterface $user
- *
- * @return bool|void
- */
-function hook_workflow($op, WorkflowTransitionInterface $transition, UserInterface $user) {
- switch ($op) {
- case 'transition permitted':
- // As of version 8.x-1.x, this operation is never called to check if transition is permitted.
- // This was called in the following situations:
- // case 1. when building a workflow widget with list of available transitions;
- // case 2. when executing a transition, just before the 'transition pre';
- // case 3. when showing a 'revert state' link in a Views display.
- // Your module's implementation may return FALSE here and disallow
- // the execution, or avoid the presentation of the new State.
- // This may be user-dependent.
- // As of version 8.x-1.x:
- // case 1: use hook_workflow_permitted_state_transitions_alter();
- // case 2: use the 'transition pre' operation;
- // case 3: use the 'transition pre' operation;
- return TRUE;
-
- case 'transition revert':
- // Hook is called when showing the Transition Revert form.
- // Implement this hook if you need to control this.
- // If you return FALSE here, you will veto the transition.
-
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
- break;
-
- case 'transition pre':
- // The workflow module does nothing during this operation.
- // Implement this hook if you need to change/do something BEFORE anything
- // is saved to the database.
- // If you return FALSE here, you will veto the transition.
-
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
- break;
-
- case 'transition post':
- // In D7, this is called by Workflow Node during update of the state, directly
- // after updating the Workflow. Workflow Field does not call this,
- // since you can call a hook_entity_* event after saving the entity.
- // @see https://api.drupal.org/api/drupal/includes%21module.inc/group/hooks/7
-
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
- break;
-
- case 'transition delete':
- case 'state delete':
- case 'workflow delete':
- // These hooks are removed in D8, in favour of the core hooks:
- // - workflow_entity_predelete(EntityInterface $entity)
- // - workflow_entity_delete(EntityInterface $entity)
- // See examples at the bottom of this file.
- break;
- }
-
- return;
-}
-
-/**
- * Implements hook_workflow_history_alter().
- *
- * In D8, hook_workflow_history_alter() is removed, in favour
- * of ListBuilder::getDefaultOperations
- * and hook_workflow_operations('workflow_transition').
- *
- * Allow other modules to add Operations to the most recent history change.
- * E.g., Workflow Revert implements an 'undo' operation.
- *
- * @param array $variables
- * The current workflow history information as an array.
- * 'old_sid' - The state ID of the previous state.
- * 'old_state_name' - The state name of the previous state.
- * 'sid' - The state ID of the current state.
- * 'state_name' - The state name of the current state.
- * 'history' - The row from the workflow_transition_history table.
- * 'transition' - a WorkflowTransition object, containing all of the above.
- */
-function hook_workflow_history_alter(array &$variables) {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
- // The Workflow module does nothing with this hook.
- // For an example implementation, see the Workflow Revert add-on.
-}
-
-/**
- * Implements hook_workflow_comment_alter().
- *
- * Allow other modules to change the user comment when saving a state change.
- *
- * @param string $comment
- * The comment of the current state transition.
- * @param array $context
- * 'transition' - The current transition itself.
- */
-function hook_workflow_comment_alter(&$comment, array &$context) {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
- /* @var $transition WorkflowTransitionInterface */
- $transition = $context['transition'];
- //$comment = $transition->getOwner()->getUsername() . ' says: ' . $comment;
-}
-
-/**
- * Implements hook_workflow_permitted_state_transitions_alter().
- *
- * @param array $transitions
- * An array of allowed transitions from the current state (as provided in
- * $context). They are already filtered by the settings in Admin UI.
- * @param array $context
- * An array of relevant objects. Currently:
- * $context = array(
- * 'user' => $user,
- * 'workflow' => $workflow,
- * 'state' => $current_state,
- * 'force' => $force,
- * );
- *
- * This hook allows you to add custom filtering of allowed target states, add
- * new custom states, change labels, etc.
- * It is invoked in WorkflowState::getOptions().
- */
-function hook_workflow_permitted_state_transitions_alter(array &$transitions, array $context) {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
- $user = $context['user']; // user may have the custom role AUTHOR.
- // The following could be fetched from each transition.
- $workflow = $context['workflow'];
- $current_state = $context['state'];
- // The following could be fetched from the $user and $transition objects.
- $force = $context['force'];
-
- // Implement here own permission logic.
- foreach ($transitions as $key => $transition) {
- /* @var $transition WorkflowTransitionInterface */
- if (!$transition->isAllowed($user, $force)) {
- //unset($transitions[$key]);
- }
- }
-
- // This example creates a new custom target state.
- $values = [
- // Fixed values for new transition.
- 'wid' => $context['workflow']->id(),
- 'from_sid' => $context['state']->id(),
-
- // Custom values for new transition.
- // The ID must be an integer, due to db-table constraints.
- 'to_sid' => '998',
- 'label' => 'go to my new fantasy state',
- ];
- $new_transition = WorkflowConfigTransition::create($values);
- // $transitions[] = $new_transition;
-}
-
-
-/**********************************************************************
- * Hooks defined by core Form API: hooks to to alter the Workflow Form/Widget.
- */
-
-/**
- * Alter forms for field widgets provided by other modules.
- *
- * @param $element
- * The field widget form element as constructed by hook_field_widget_form().
- * @param $form_state
- * An associative array containing the current state of the form.
- * @param $context
- * An associative array containing the following key-value pairs, matching the
- * arguments received by hook_field_widget_form():
- * - form: The form structure to which widgets are being attached. This may be
- * a full form structure, or a sub-element of a larger form.
- * - field: The field structure.
- * - instance: The field instance structure.
- * - langcode: The language associated with $items.
- * - items: Array of default values for this field.
- * - delta: The order of this item in the array of subelements (0, 1, 2, etc).
- *
- * @see hook_field_widget_form()
- * @see hook_field_widget_WIDGET_TYPE_form_alter()
- */
-function hook_field_widget_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
- // A hook for changing any widget. Better not use it: it is called on EVERY
- // Widget. (Even though the message is only shown once.)
- // D7: This hook is introduced in Drupal 7.8.
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
- // dpm($context['widget']->getPluginId());
-}
-
-function hook_field_widget_workflow_default_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
- // A hook specific for the 'workflow_default' widget.
- // D7: This hook is introduced in Drupal 7.8.
- // D8: This name is specified in the annotation of WorkflowDefaultWidget.
- workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
- // A widget on an entity form.
- if ('workflow_default' == $context['widget']->getPluginId()) {
- // This object contains all you need. You may find it in one of two locations.
- /* @var $transition WorkflowTransitionInterface */
- /* @var $transition WorkflowTransitionInterface */
- $transition = $element['#default_value'];
-
- // An example of customizing/overriding the workflow widget.
- // Beware, until now, you must do this twice: on the widget and on the form.
- if ($transition->getOwnerId() == 1) {
- drupal_set_message('(Test/Devel message) I got you, user 1, you will never schedule again,
- and you WILL document each state change!', 'warning');
- // Let's prohibit scheduling for user 1.
- $element['workflow_scheduling']['#access'] = FALSE;
- // Let's prohibit scheduling for user 1.
- if ($element['comment']['#access'] == TRUE) {
- $element['comment']['#required'] = TRUE;
- }
- }
- }
-}
-
-/**
- * Implements hook_form_BASE_FORM_ID_alter().
- *
- * Use this hook to alter the form.
- * It is only suited if you only use View Page or Workflow Tab.
- * If you change the state on the Entity Edit page (form), you need the hook
- * hook_form_alter(). See below for more info.
- */
-function hook_form_workflow_transition_form_alter(&$form, FormStateInterface $form_state, $form_id) {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
-
- // The WorkflowTransitionForm (E.g., Workflow History tab, Block).
- // It has its own handling.
- // @todo: Populate the WorkflowTransitionForm with a Widget, so we have 1 way-of-working.
-
- // Let's take a (changeable) reference to the element.
- $workflow_element = &$form;
-
- // This object contains all you need. You may find it in one of two locations.
- /* @var $transition WorkflowTransitionInterface */
- $transition = $form['workflow_transition']['#value'];
- // dpm($transition);
-
- // An example of customizing/overriding the workflow widget.
- // Beware, until now, you must do this twice: on the widget and on the form.
- if ($transition->getOwnerId() == 1) {
- drupal_set_message('(Test/Devel message) I got you, user 1, you will never schedule again,
- and you WILL document each state change!', 'warning');
- // Let's prohibit scheduling for user 1.
- $workflow_element['workflow_scheduling']['#access'] = FALSE;
- // Let's prohibit scheduling for user 1.
- if ( $workflow_element['comment']['#access'] == TRUE) {
- $workflow_element['comment']['#required'] = TRUE;
- }
- }
-
- // Get the Entity.
- /* @var $entity \Drupal\Core\Entity\EntityInterface */
- $entity = NULL;
- //$entity = $form['workflow_entity']['#value'];
- $entity_type = 'node'; // $form['workflow_entity_type']['#value'];
- $entity_bundle = ''; // $entity->bundle();
- $sid = '';
- if ($entity) {
- $entity_type = $entity->getEntityTypeId();
- $entity_bundle = $entity->bundle();
-
- // Get the current State ID.
- $sid = workflow_node_current_state($entity, $field_name = NULL);
- // Get the State object, if needed.
- $state = WorkflowState::load($sid);
- }
-
- // Change the form, depending on the state ID.
- // In the upcoming version 7.x-2.4, States should have a machine_name, too.
- if ($entity_type == 'node' && $entity_bundle == 'MY_NODE_TYPE') {
- switch ($sid) {
- case '2':
- // Change form element, form validate and form submit for state '2'.
- break;
-
- case '3':
- // Change form element, form validate and form submit for state '3'.
- break;
- }
- }
-
-}
-
-/**
- * Implements hook_form_alter().
- *
- * Use this hook to alter the form on an Entity Form, Comment Form (Edit page).
- *
- * @see hook_form_workflow_transition_form_alter() for example code.
- */
-function hook_form_alter(&$form, FormStateInterface $form_state, $form_id) {
- if (substr($form_id, 0, 8) == 'workflow') {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
- }
-}
-
-
-/**
- * Hooks defined by core Entity: hook_entity_CRUD.
- *
- * Instead of using hook_entity_OPERATION, better use hook_ENTITY_TYPE_OPERATION.
- *
- * @see hook_entity_create(), hook_entity_update(), etc.
- * @see hook_ENTITY_TYPE_create(), hook_ENTITY_TYPE_update(), etc.
- */
-function hook_entity_predelete(EntityInterface $entity) {
- if (substr($entity->getEntityTypeId(), 0, 8) == 'workflow') {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'pre-delete' , $entity->getEntityTypeId());
- }
- switch ($entity->getEntityTypeId()) {
- case 'workflow_config_transition':
- case 'workflow_state':
- case 'workflow_type':
- // Better use hook_ENTITY_TYPE_OPERATION.
- // E.g., hook_workflow_type_predelete
- break;
- }
-}
-
-function hook_entity_delete(EntityInterface $entity) {
- if (substr($entity->getEntityTypeId(), 0, 8) == 'workflow') {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
- }
-}
-
-function hook_workflow_type_delete(EntityInterface $entity) {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
-}
-
-function hook_workflow_config_transition_delete(EntityInterface $entity) {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
-}
-
-function hook_workflow_state_delete(EntityInterface $entity) {
- // workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
-}
diff --git a/modules/workflow/workflow.field.inc b/modules/workflow/workflow.field.inc
deleted file mode 100644
index 9a10e39..0000000
--- a/modules/workflow/workflow.field.inc
+++ /dev/null
@@ -1,156 +0,0 @@
-getFormObject()->getEntity()->getType();
-
- if ($field_name == 'workflow') {
- // Make sure only 1 value can be entered in the Workflow field.
- $form['cardinality_container']['cardinality']['#default_value'] = 'number';
- $form['cardinality_container']['cardinality']['#disabled'] = TRUE;
- $form['cardinality_container']['cardinality_number']['#default_value'] = 1;
- $form['cardinality_container']['cardinality_number']['#disabled'] = TRUE;
- $form['cardinality_container']['cardinality_number']['#states'] = [];
- }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function workflow_form_field_config_edit_form_alter(&$form, FormStateInterface $form_state, $form_id) {
- $field_name = $form_state->getFormObject()->getEntity()->getType();
-
- if ($field_name == 'workflow') {
- // The Workflow field must have a value, so set to required.
- $form['required']['#default_value'] = 1;
- $form['required']['#disabled'] = TRUE;
-
- // There are alterations on the widget, too.
- // @see WorkflowDefaultWidget::formElement();
- }
-}
-
-/**
- * We will be using some default formatters and widgets from the List and Options modules.
- */
-
-/**
- * Implements hook_field_formatter_info_alter().
- *
- * The module reuses the formatters defined in list.module.
- */
-function workflow_field_formatter_info_alter(&$info) {
- $info['list_key']['field_types'][] = 'workflow';
- $info['list_default']['field_types'][] = 'workflow';
-}
-
-/**
- * Implements hook_field_widget_info_alter().
- *
- * The module does not implement widgets of its own, but reuses the
- * widgets defined in options.module.
- *
- * @see workflow_options_list()
- */
-function workflow_field_widget_info_alter(&$info) {
- $info['options_select']['field_types'][] = 'workflow';
- $info['options_buttons']['field_types'][] = 'workflow';
-}
-
-/**
- * {@inheritdoc}
- *
- * @see callback_allowed_values_function()
- *
- * deprecated: workflow_options_list --> workflow_state_allowed_values
- */
-function workflow_state_allowed_values(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE, AccountInterface $user = NULL) {
- //function callback_allowed_values_function(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE) {
- // N.B. the parameter $user is added by Workflow module.
- $allowed_options = [];
-
- $user = workflow_current_user($user); // @todo #2287057: OK?
- $field_name = $definition->getName();
-
- if ($entity) {
- // Get the allowed new states for the entity's current state.
- // @todo D8-port: overwrite getValue().
- // $sid = $value = $this->getValue();
- /* @var $state WorkflowState */
- $sid = workflow_node_current_state($entity, $field_name);
- $state = WorkflowState::load($sid);
- $allowed_options = ($state) ? $state->getOptions($entity, $field_name, $user, FALSE) : [];
- }
- else {
- // Create an empty State. This triggers to show all possible states for the Workflow.
- $wid = $definition->getSetting('workflow_type');
- if ($workflow = Workflow::load($wid)) {
- // There is no entity, E.g., on the Rules action "Set a data value".
- /* @var $state Drupal\workflow\Entity\WorkflowState */
- $state = WorkflowState::create(['wid' => $wid, 'id' => '']);
- $allowed_options = $state->getOptions(NULL, '', $user, FALSE);
- }
- }
-
- return $allowed_options;
-}
-
-
-/**
- * Creates a form element to show the current value of a Workflow state.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * The entity this field is on.
- * @param string $field_name
- * The field_name
- * @param string $current_sid
- * The current State Id.
- *
- * @return array
- * Form element, resembling the formatter of List module.
- * If state 0 is given, return an empty form element.
- */
-function workflow_state_formatter($entity, $field_name, $current_sid = '') {
- $element = [];
-
- if (!$current_sid) {
- $current_sid = workflow_node_current_state($entity, $field_name);
- }
- // Add the 'current value' formatter for this field.
- // $list_display = $instance['display']['default'];
- $list_display['type'] = 'list_default';
- // Clone the entity and restore old value, in case you want to show an
- // executed transition.
- if ($entity->$field_name->value != $current_sid) {
- $entity = clone $entity;
- $entity->$field_name->value = $current_sid;
- }
- // Generate a renderable array for the field. Use default language determination ($langcode = NULL).
- $element = $entity->$field_name->view($list_display);
-
- // @todo D8: make weight better (even better: hook_field_extra_fields).
- // Make sure the current value is before the form. (which has weight = 0.005)
- // $element['#weight'] = 0;
-
- return $element;
-}
diff --git a/modules/workflow/workflow.form.inc b/modules/workflow/workflow.form.inc
deleted file mode 100644
index a26ed43..0000000
--- a/modules/workflow/workflow.form.inc
+++ /dev/null
@@ -1,277 +0,0 @@
-getBuildInfo()['base_form_id']) && $form_state->getBuildInfo()['base_form_id'] == 'workflow_transition_form') {
- // The WorkflowTransitionForm::actions() has its own handling.
- // E.g., Workflow History tab, Block.
- return;
- }
-
- // Find the first workflow.
- // (So this won't work with multiple workflows per entity.)
- $workflow_element = _workflow_transition_form_get_first_workflow_element($form);
-
- // Quit if there is no Workflow on this page.
- if (!$workflow_element ) {
- return;
- }
-
- // Quit if there are no Workflow Action buttons.
- // (If user has only 1 workflow option, there are no Action buttons.)
- if (count($workflow_element['to_sid']['#options']) <= 1) {
- return;
- }
-
- // Find the default submit button and replace with our own action buttons.
- if (isset($form['actions']['submit'])) {
- $default_submit_action = $form['actions']['submit'];
- // @todo D8-port: on Node-form, this is not sufficient.
- unset($form['actions']['submit']);
- }
- elseif (isset($form['actions']['save'])) {
- $default_submit_action = $form['actions']['save'];
- unset($form['actions']['save']);
- }
- else {
- // @todo test: when does this happen?
- $default_submit_action = [];
- }
- if (isset($default_submit_action)) {
- $actions = _workflow_transition_form_get_action_buttons($form, $workflow_element, $default_submit_action);
- // Place the button with the other action buttons.
- $form['actions'] = isset($form['actions']) ? $form['actions'] : [];
- $form['actions'] += $actions;
- }
-}
-
-/**
- * Fetches the first workflow_element from one of the Workflow Fields.
- *
- * @param array $form
- *
- * @return array
- */
-function _workflow_transition_form_get_first_workflow_element(&$form) {
- $workflow_element = [];
-
- // Find the first workflow.
- // (So this won't work with multiple workflows per entity.)
- foreach (\Drupal\Core\Render\Element::children($form) as $key) {
- if (isset($form[$key]['widget'][0]['#default_value'])) {
- $transition = $form[$key]['widget'][0]['#default_value'];
- if (is_object($transition) && $transition instanceof WorkflowTransitionInterface ) {
- $workflow_element = $form[$key]['widget'][0];
- break;
- }
- }
- }
- return $workflow_element;
-}
-
-/**
- * Returns the action buttons from the options widget.
- *
- * @param array $form
- * @param array $workflow_element
- * @param array $default_submit_action
- *
- * @return array $actions
- */
-function _workflow_transition_form_get_action_buttons(array $form, array $workflow_element, array $default_submit_action) {
- $actions = [];
- $current_sid = $workflow_element['to_sid']['#default_value'];
- /* @var $transition WorkflowTransitionInterface */
- $transition = $workflow_element['workflow_transition']['#value'];
- $field_name = $transition->getFieldName();
-
- // Find the default submit button and add our action buttons before it.
- // Get the min weight for our buttons.
- $option_weight = isset($default_submit_action['#weight']) ? $default_submit_action['#weight'] : 0;
- $option_weight = $option_weight - count($workflow_element['to_sid']['#options']);
- $min_weight = $option_weight;
- foreach ($workflow_element['to_sid']['#options'] as $sid => $option_name) {
- // Make the workflow button act exactly like the original submit button.
-
- $same_state_button = ($sid == $current_sid);
- $workflow_submit_action = $default_submit_action;
- // Add target State ID and Field name, to set correct value in validate_buttons callback.
- $workflow_submit_action['#workflow'] = [
- 'field_name' => $field_name,
- 'to_sid' => $sid,
- ];
- // Keep option order. Put current state first.
- $workflow_submit_action['#weight'] = ($same_state_button) ? $min_weight : ++$option_weight;
- // Add/Overwrite some other settings.
- $workflow_submit_action['#access'] = TRUE;
- $workflow_submit_action['#value'] = $option_name;
- // Use one drop button, instead of several action buttons.
- if ('dropbutton' == _workflow_use_action_buttons()) {
- $workflow_submit_action['#dropbutton'] = 'save';
- }
- $workflow_submit_action['#attributes'] = ($same_state_button) ? ['class' => ['form-save-default-button']] : [];
- $workflow_submit_action['#button_type'] = ($same_state_button) ? 'primary' : ''; // @todo: works for node form and workflow tab, not for workflow block.
- //$workflow_submit_action['#executes_submit_callback'] = TRUE;
- // Add class to workflow button.
- $workflow_submit_action['#attributes']['class'][] = Html::getClass('workflow_button_' . $option_name);
- // Append the form's #validate function, or it won't be called upon submit,
- // because the workflow buttons have its own #validate.
- $workflow_submit_action['#validate'] = [];
- $workflow_submit_action['#validate'][] = '_workflow_transition_form_validate_buttons';
- if (isset($default_submit_action['#validate'])) {
- $workflow_submit_action['#validate'] = $default_submit_action['#validate'];
- }
- elseif (isset($form['#validate'])) {
- $workflow_submit_action['#validate'] = $form['#validate'];
- }
- // Append the submit-buttons's #submit function, or it won't be called upon submit.
- if (isset($default_submit_action['#submit'])) {
- $workflow_submit_action['#submit'] = $default_submit_action['#submit'];
- }
- elseif (isset($form['#submit'])) {
- $workflow_submit_action['#submit'] = $form['#submit'];
- }
-
- // Hide the same-state button in some cases.
- if ($same_state_button) {
- if (isset($form['#form_id']) && substr($form['#form_id'], 0, 24) == 'workflow_transition_form') {
- // Hide same-state-button on the transition-form (that is:
- // view page or workflow history tab) if there is nothing to do.
- // However, a Transition may be fieldable.
- if ($form['comment']['#access'] == FALSE) {
- $workflow_submit_action['#access'] = FALSE;
- }
- }
- elseif (isset($form['#id']) && $form['#id'] == 'comment-form') {
- // On comment-form, the button must stay, since you can comment to same state.
- }
- else {
- // On a entity edit page, the button must stay.
- }
- }
-
- // Place the button with the other action buttons.
- $actions['workflow_' . $sid] = $workflow_submit_action;
- }
-
- return $actions;
-}
-
-/**
- * Get the Workflow parameter from the button, pressed by the user.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The form state.
- * @return array
- * A $field_name => $to_sid array.
- */
-function _workflow_transition_form_get_triggering_button(\Drupal\Core\Form\FormStateInterface $form_state) {
- $result = ['field_name' => '', 'to_sid' => ''];
-
- $triggering_element = $form_state->getTriggeringElement();
- if (isset($triggering_element['#workflow'])) {
- $result['field_name'] = $triggering_element['#workflow']['field_name'];
- $result['to_sid'] = $triggering_element['#workflow']['to_sid'];
- }
-
- return $result;
-}
-
-/**
- * Submit callback function for the Workflow Form / DefaultWidget.
- *
- * Validate form data for 'time' element.
- * @param $element
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * @param $form
- */
-function _workflow_transition_form_element_validate_time($element, \Drupal\Core\Form\FormStateInterface &$form_state, $form) {
- if (!strtotime($element['#value'])) {
- $form_state->setError($element, t('Please enter a valid value for time.'));
- }
-}
-
-/**
- * Submit callback function for the Workflow Form / DefaultWidget.
- *
- * This is only used when using action buttons in the widget.
- * It sets the new state to proper
- * element and sets a submit function if needed, making sure the action is
- * executed, influencing function core/includes/form.inc/form_execute_handlers().
- * (While constructing the Workflow form, we were not yet aware of the submit
- * buttons of the complete form. We try to correct this here, without adding
- * another hook_form_alter. We guess the first button is the Save button.
- */
-function _workflow_transition_form_validate_buttons($form, \Drupal\Core\Form\FormStateInterface &$form_state) {
- // Retrieve the data from the form.
- $transition = $form_state->getValue('workflow_transition');
- if ($transition) {
- // On WorkflowTransitionForm :
- // D7: $form_state['input']['to_sid'] = $new_sid;
- // D7: $form_state['values'][$field_name][$langcode][0]['to_sid'] = $new_sid;
-
- $values = $form_state->getValues();
-
- $to_sid = $form_state->getTriggeringElement()['#workflow']['to_sid'];
- $values['to_sid'] = $to_sid;
-
- // Update the form_state.
- $form_state->setValues($values);
- }
- else {
- // On edit form : See $form_state->getTriggeringElement() in WorkflowDefaultWidget;
- }
-
-}
diff --git a/modules/workflow/workflow.info.yml b/modules/workflow/workflow.info.yml
deleted file mode 100644
index 537e7d7..0000000
--- a/modules/workflow/workflow.info.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 'Workflow'
-description: 'Defines a field type with Workflows, containing customizable state transitions.'
-package: Workflow
-type: module
-# core: 8.x
-# version: VERSION
-
-dependencies:
- - field
- - options
- - user
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/workflow.install b/modules/workflow/workflow.install
deleted file mode 100644
index 0f1a489..0000000
--- a/modules/workflow/workflow.install
+++ /dev/null
@@ -1,109 +0,0 @@
- 'edit-modules-workflow']);
- $message = t('Thanks for using Workflow. To maintain workflows,
- install the Workflow UI module . To start using
- a Workflow, add a Workflow Field to your entity.',
- [':url' => $url->toString()]
- );
- drupal_set_message($message);
-}
-
-/**
- * Implements hook_uninstall().
- */
-function workflow_uninstall() {
-// \Drupal::config('workflow.settings')->clear('workflow_states_per_page')->save(); // @FIXME
-}
-
-/**
- * Implements hook_requirements().
- *
- * Let admins know that Workflow is in use.
- *
- * @todo: extend workflow_requirements() for use with Workflow Field API.
- *
- * @param $phase
- * @return array
- */
-function workflow_requirements($phase) {
- $requirements = [];
- switch ($phase) {
- case 'install':
- break;
-
- case 'update':
- break;
-
- case 'runtime':
-// workflow_debug(__FILE__), __FUNCTION__, __LINE__, $form_id); // @todo D8-port: still test this snippet.
-
- /*
- // Show info on admin/reports/status.
- $type_list = 'Not yet determined.';
-
- // $types = db_query('SELECT wid, type FROM {workflow_type_map} WHERE wid <> 0 ORDER BY type')->fetchAllKeyed();
- // If there are no types, then just bail.
- if (count($types) == 0) {
- return;
- }
- // Let's make it look nice.
- if (count($types) == 1) {
- $type_list = current($types);
- } else {
- $last = array_pop($types);
- if (count($types) > 2) {
- $type_list = implode(', ', $types) . ', and ' . $last;
- } else {
- $type_list = current($types) . ' and ' . $last;
- }
- }
- */
-
- /*
- $requirements['workflow'] = array(
- 'title' => $t('Workflow'),
- 'value' => $t('Workflow is active on the @types content types.', array('@types' => $type_list)),
- 'severity' => REQUIREMENT_OK,
- );
- */
- break;
-
- }
-
- return $requirements;
-}
-
-/**
- * Implements hook_schema().
- *
- * The D8-schema's have moved to:
- * - Workflow annotation (it is a Config Entity now);
- * - WorkfowState annotation (it is a Config Entity now);
- * - WorkfowConfigTransition annotation (it is a Config Entity now);
- * - WorkflowTransition::baseFieldDefinitions();
- * - WorkflowScheduledTransition::baseFieldDefinitions().
- */
-function workflow_schema() {
- return $schema = [];
-}
-
-/**
- * Drupal 8 updates.
- */
-
-/**
- * Update from version beta1 to beta2 are not possible. Please re-install this module.
- */
-function workflow_update_8001(&$sandbox) {
- drupal_set_message("Update from version beta1 to beta2 is not possible. Please re-install this module.");
-}
diff --git a/modules/workflow/workflow.links.task.yml b/modules/workflow/workflow.links.task.yml
deleted file mode 100644
index 46ea561..0000000
--- a/modules/workflow/workflow.links.task.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-#workflow.entities:
-# class: \Drupal\Core\Menu\LocalTaskDefault
-# deriver: \Drupal\workflow\Plugin\Derivative\WorkflowLocalTask
-
-#entity.workflow_type.canonical:
-# route_name: entity.workflow_type.canonical
-# base_route: entity.workflow_type.edit_form
-# title: 'Edit'
-# weight: -5
-entity.workflow_type.edit_form:
- route_name: entity.workflow_type.canonical
- base_route: entity.workflow_type.edit_form
- title: 'Edit'
- weight: -5
-entity.workflow_type.delete_form:
- route_name: entity.workflow_type.delete_form
- base_route: entity.workflow_type.edit_form
- title: 'Delete'
- weight: 10
-
-# @todo D8-port: make Workflow History tab happen for every entity_type.
-# @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
-entity.node.workflow_history:
- route_name: entity.node.workflow_history
- base_route: entity.node.canonical
- title: 'Workflow'
- weight: 30
-entity.taxonomy_term.edit_form:
- route_name: entity.taxonomy_term.workflow_history
- base_route: entity.taxonomy_term.canonical
- title: 'Workflow'
- weight: 30
diff --git a/modules/workflow/workflow.module b/modules/workflow/workflow.module
deleted file mode 100644
index a382670..0000000
--- a/modules/workflow/workflow.module
+++ /dev/null
@@ -1,716 +0,0 @@
-' . t('About') . '';
- $output .= '' . t('The Workflow module adds a field to Entities to
- store field values as Workflow states. You can control "state transitions"
- and add action to specific transitions.') . '
';
- }
- return $output;
-}
-
-/**
- * Implements hook_hook_info().
- *
- * Allow adopters to place their hook implementations in either
- * their main module or in a module.workflow.inc file.
- */
-function workflow_hook_info() {
- $hooks['workflow'] = ['group' => 'workflow'];
- return $hooks;
-}
-
-/**
- * Implements hook_entity_type_build().
- *
- * @see https://www.drupal.org/node/2196275
- * "hook_entity_info() renamed to hook_entity_type_build()"
- */
-function TODO_workflow_entity_type_build(array &$entity_types) {
- workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-
- /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
- // Add a form controller for a custom entity form without overriding the
- // default entity form. To override the default entity form,
- // use hook_entity_type_alter().
- //$entity_types['node']->setFormClass('mymodule_foo', 'Drupal\mymodule\NodeFooFormController');
-}
-
-/**********************************************************************
- *
- * CRUD hooks.
- *
- */
-
-/**
- * Implements hook_user_cancel().
- *
- * Update tables for deleted account, move account to user 0 (anon.)
- * ALERT: This may cause previously non-Anonymous posts to suddenly
- * be accessible to Anonymous.
- */
-function workflow_user_cancel($edit, $account, $method) {
- \Drupal::service('workflow.manager')->cancelUser($edit, $account, $method);
-}
-
-/**
- * Implements hook_user_delete().
- */
-function workflow_user_delete($account) {
- \Drupal::service('workflow.manager')->deleteUser($account);
-}
-
-/**
- * Implements hook_ENTITY_TYPE_insert().
- *
- * Is called when adding a new Workflow type.
- * The technical name for the Workflow entity is 'workflow_type'.
- */
-function workflow_workflow_type_insert(EntityInterface $entity) {
- \Drupal::service('workflow.manager')->participateUserRoles($entity);
-}
-
-/**
- * Implements hook_entity_insert().
- */
-function workflow_entity_insert(EntityInterface $entity) {
- // Execute updates in hook_presave() to revert executions,
- // Execute inserts in hook_insert, to have the Entity ID determined.
- _workflow_execute_transitions($entity);
-}
-
-/**
- * Implements hook_entity_presave().
- */
-function workflow_entity_presave(EntityInterface $entity) {
- if (!$entity->isNew()) {
- // Avoid a double call by hook_entity_presave and hook_entity_insert.
- _workflow_execute_transitions($entity);
- }
-}
-
-/**
- * Execute transitions. if prohibited, restore original field value.
- * - insert: use hook_insert(), to have the Entity ID determined when saving transitions.
- * - update: use hook_presave() to revert executions,
- * - so, do not use hook_update().
- */
-function _workflow_execute_transitions(EntityInterface $entity) {
- // Avoid this hook on workflow objects.
- if (in_array($entity->getEntityTypeId(), [
- 'workflow_type',
- 'workflow_state',
- 'workflow_config_transition',
- 'workflow_transition',
- 'workflow_scheduled_transition',
- ])) {
- return;
- }
-
- // Execute/save the transitions fom the widgets in the entity form.
- \Drupal::service('workflow.manager')->executeTransitionsOfEntity($entity);
-}
-
-/**
- * Implements hook_entity_delete().
- *
- * Delete the corresponding workflow table records.
- */
-function workflow_entity_delete(EntityInterface $entity) {
- // @todo D8: test with multiple workflows.
- if (get_class($entity) == 'Drupal\field\Entity\FieldConfig'
- || get_class($entity) == 'Drupal\field\Entity\FieldStorageConfig') {
- // A Workflow Field is removed from an entity.
- $field_config = $entity;
- $entity_type = $field_config->get('entity_type');
- $field_name = $field_config->get('field_name');
- foreach (WorkflowScheduledTransition::loadMultipleByProperties($entity_type, [], [], $field_name) as $scheduled_transition) {
- /** @var $scheduled_transition WorkflowTransitionInterface */
- $scheduled_transition->delete();
- }
- foreach (WorkflowTransition::loadMultipleByProperties($entity_type, [], [], $field_name) as $transition) {
- /** @var $transition WorkflowTransitionInterface */
- $transition->delete();
- }
- }
- elseif (!in_array($entity->getEntityTypeId(), [
- 'workflow_type',
- 'workflow_state',
- 'workflow_config_transition',
- 'workflow_transition',
- 'workflow_scheduled_transition',
- ])) {
- // A 'normal' entity is deleted.
- foreach ($fields = _workflow_info_fields($entity) as $field_id => $field_storage) {
- /** @var $field_storage FieldStorageConfig */
- $entity_type = $field_storage->getTargetEntityTypeId();
- $entity_id = $entity->id();
- $field_name = $field_storage->get('field_name');
- foreach (WorkflowScheduledTransition::loadMultipleByProperties($entity_type, [$entity_id], [], $field_name) as $scheduled_transition) {
- /** @var $scheduled_transition WorkflowTransitionInterface */
- $scheduled_transition->delete();
- }
- foreach (WorkflowTransition::loadMultipleByProperties($entity_type, [$entity_id], [], $field_name) as $transition) {
- /** @var $transition WorkflowTransitionInterface */
- $transition->delete();
- }
- }
- }
-}
-
-/**
- * Implements hook_cron().
- *
- * Given a time frame, execute all scheduled transitions.
- */
-function workflow_cron() {
- \Drupal::service('workflow.manager')->executeScheduledTransitionsBetween(0, \Drupal::time()->getRequestTime());
-}
-
-/**
- * Business related functions, the API.
- */
-
-/**
- * @param WorkflowTransitionInterface $transition
- * @param bool $force
- * @return
- *
- * @deprecated D8: @see WorkflowManager::executeTransition().
- */
-function workflow_execute_transition(WorkflowTransitionInterface $transition, $force = FALSE) {
- // Execute transition and update the attached entity.
- return \Drupal::service('workflow.manager')->executeTransition($transition, $force);
-}
-
-/**
- * Functions to get an options list (to show in a Widget).
- * To be used in non-OO modules, like workflow_rules, workflow_views.
- *
- * The naming convention is workflow_get__names.
- * (A bit different from 'user_role_names'.)
- * Can be used for hook_allowed_values from list.module.
- * Todo: move to \Drupal::entityManager::getEntityTypeLabels($group = FALSE).
- * - user_role
- * - workflow
- * - workflow_state
- * - sid
- */
-
-/**
- * Retrieves the names of roles matching specified conditions.
- *
- * deprecated D8: workflow_get_roles --> workflow_get_user_role_names
- *
- * Usage:
- * D7: $roles = workflow_get_user_role_names('participate in workflow');
- * D8: $type_id = $workflow->id();
- * D8: $roles = workflow_get_user_role_names("create $type_id workflow_transition");
- *
- * @param string $permission
- * (optional) A string containing a permission. If set, only roles
- * containing that permission are returned. Defaults to NULL, which
- * returns all roles.
- * Normal usage for filtering roles that are enabled in a workflow_type
- * would be: $permission = 'create $type_id transition'.
- *
- * @return array
- * Array of role names keyed by role ID, including the 'author' role.
- */
-function workflow_get_user_role_names($permission) {
- static $roles = NULL;
-
- if (!$roles[$permission]) {
- // Copied from AccountForm::form().
- $roles[$permission] = array_map(['\Drupal\Component\Utility\Html', 'escape'],
- [
- WORKFLOW_ROLE_AUTHOR_RID => '(' . t(WORKFLOW_ROLE_AUTHOR_NAME) . ')'
- ] + user_role_names(FALSE, $permission));
- }
-
- return $roles[$permission];
-}
-
-/**
- * Get an options list for workflow states.
- *
- * @param mixed $wid
- * The Workflow ID.
- * @param bool $grouped
- * Indicates if the value must be grouped per workflow.
- * This influence the rendering of the select_list options.
- * @param bool $all
- * Indicates to return all (TRUE) or active (FALSE) states of a workflow.
- *
- * @return array
- * An array of $sid => state->label(), grouped per Workflow.
- */
-function workflow_get_workflow_state_names($wid = '', $grouped = FALSE, $all = FALSE) {
- $options = [];
-
- // @todo: implement $add parameter.
- //
- // @todo: follow Options pattern
- // @see callback_allowed_values_function()
- // @see options_allowed_values()
-
-
- // Get the (user-dependent) options.
- // Since this function is only used in UI, it is save to use the global $user.
- $user = workflow_current_user();
-
- /** @var $workflows Workflow[] */
- $workflows = Workflow::loadMultiple($wid ? [$wid] : NULL);
- // Do not group if only 1 Workflow is configured or selected.
- $grouped = count($workflows) == 1 ? FALSE : $grouped;
-
- foreach ($workflows as $wid => $workflow) {
- /** @var $state WorkflowState */
- $state = WorkflowState::create(['wid' => $wid]);
- $workflow_options = $state->getOptions(NULL, '', $user, FALSE);
- if (!$grouped) {
- $options += $workflow_options;
- }
- else {
- // Make a group for each Workflow.
- $options[$workflow->label()] = $workflow_options;
- }
- }
-
- return $options;
-}
-
-/**
- * Get an options list for workflows. Include an initial empty value
- * if requested. Validate each workflow, and generate a message if not complete.
- *
- * @param bool $required
- * Indicates if the resulting list contains a options value.
- * @return array
- * An array of $wid => workflow->label().
- */
-function workflow_get_workflow_names($required = TRUE) {
- $options = [];
-
- if (!$required) {
- $options[''] = t('- Select a value -');
- }
- foreach (Workflow::loadMultiple() as $wid => $workflow) {
- /** @var $workflow Workflow */
- if ($workflow->isValid()) {
- $options[$wid] = $workflow->label();
- }
- }
-
- return $options;
-}
-
-/**
- * Gets an Options list of field names.
- *
- * @param null $entity
- * @param string $entity_type
- * @param string $entity_bundle
- * @param string $field_name
- * @return array
- */
-function workflow_get_workflow_field_names($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name = '') {
- $result = [];
- foreach (_workflow_info_fields($entity, $entity_type, $entity_bundle, $field_name) as $definition) {
- $field_name = $definition->getName();
- $result[$field_name] = $definition->getName();
- }
- return $result;
-}
-
-/**
- * Helper function, to get the label of a given State Id.
- *
- * @param $sid
- *
- * @return string
- *
- * deprecated: workflow_get_sid_label() --> workflow_get_sid_name()
- */
-function workflow_get_sid_name($sid) {
-
- if (empty($sid)) {
- $label = 'No state';
- }
- /** @noinspection PhpAssignmentInConditionInspection */
- elseif ($state = WorkflowState::load($sid)) {
- $label = $state->label();
- }
- else {
- $label = 'Unknown state';
- }
- return t($label);
-}
-
-/**
- * Determines the Workflow field_name of an entity.
- * If an entity has multiple workflows, only returns the first one.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * The entity at hand.
- * @param string $field_name
- * The field name. If given, will be passed as return value.
- *
- * @return string
- */
-function workflow_get_field_name(\Drupal\Core\Entity\EntityInterface $entity, $field_name = '') {
- if (!$entity) {
- // $entity may be empty on Entity Add page.
- $field_name = '';
- }
- elseif (!$field_name) {
- $fields = _workflow_info_fields($entity);
- $field = reset($fields);
- /** @var $field \Drupal\field\Entity\FieldStorageConfig */
- $field_name = $field->getName();
- }
-
- return $field_name;
-}
-
-/**
- * Helper function to get the entity from a route.
- *
- * This is a hack. It should be solved by using $routematch.
- *
- * @param \Drupal\Core\Entity\EntityInterface|null $entity
- *
- * @return \Drupal\Core\Entity\EntityInterface
- */
-function workflow_url_get_entity(EntityInterface $entity = NULL) {
- if (!$entity) {
- $route_match = \Drupal::routeMatch();
- // On node pages, we'd get an object.
- $entity = $route_match->getParameter('node');
- if ($entity && is_object($entity)) {
- return $entity;
- }
- if ($entity && !is_object($entity)) {
- // On workflow tab, we'd get an id.
- $entity = \Drupal\node\Entity\Node::load($entity);
- return $entity;
- }
-
- // It was not a Node, try a Term.
- if (!$entity) {
- // On term pages, we get objects, or id's.
- $entity = $route_match->getParameter('taxonomy_term');
- if ($entity && is_object($entity)) {
- return $entity;
- }
- elseif ($entity && !is_object($entity)) {
- $entity = \Drupal\taxonomy\Entity\Term::load($entity);
- }
- }
-
- if (!$entity) {
- // We may be on a entity add page/
- // Or we may be on a page of some unknown entity.
- }
-
- }
-
- return $entity;
-}
-
-/**
- * Helper function to get the field name from a route.
- *
- * For now only used for ../{entity_id}/workflow history tab.
- *
- * @return string|null $field_name
- */
-function workflow_url_get_field_name() {
- /** @var $route_match \Drupal\Core\Routing\RouteMatchInterface */
- $route_match = \Drupal::routeMatch();
- $field_name = $route_match->getParameter('field_name');
- return $field_name;
-}
-
-/**
- * Helper function to get the entity from a route.
- *
- * @return mixed|string
- */
-function workflow_url_get_operation() {
- $url = \Drupal\Core\Url::fromRoute('');
- // The last part of the path is the operation: edit, workflow, devel.
- $url_parts = explode('/', $url->toString());
- $operation = array_pop($url_parts);
- // Except for view pages.
- if (is_numeric($operation) || $operation == 'view') {
- $operation = '';
- }
- return $operation;
-}
-
-/**
- * Functions to get the state of an entity.
- */
-
-/**
- * Wrapper function to get a UserInterface object.
- * We use UserInterface to check permissions.
- *
- * @param \Drupal\Core\Session\AccountInterface|null $account
- *
- * @return \Drupal\user\UserInterface
- */
-function workflow_current_user(\Drupal\Core\Session\AccountInterface $account = NULL) {
- $account = ($account) ? $account : \Drupal::currentUser();
- return \Drupal\user\Entity\User::load($account->id());
-}
-
-/**
- * Gets the current state ID of a given entity.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * @param string $field_name
- *
- * @return string $current_sid
- *
- * @deprecated : use \Drupal::service('workflow.manager')->getCurrentStateId()
- */
-function workflow_node_current_state(\Drupal\Core\Entity\EntityInterface $entity, $field_name = '') {
- return \Drupal::service('workflow.manager')->getCurrentStateId($entity, $field_name);
-}
-
-/**
- * Gets the previous state ID of a given entity.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * @param string $field_name
- *
- * @return string $previous_sid
- *
- * @deprecated : use \Drupal::service('workflow.manager')->getPreviousStateId()
- */
-function workflow_node_previous_state($entity, $field_name = '') {
- return \Drupal::service('workflow.manager')->getPreviousStateId($entity, $field_name);
-}
-
-/**
- * Get a specific workflow, given an entity type. Only one workflow is possible per node type.
- *
- * @param string $entity_bundle
- * An entity bundle.
- * @param string $entity_type
- * An entity type. This is passed when also the Field API must be checked.
- *
- * @return Workflow
- * A Workflow object, or FALSE if no workflow is retrieved.
- *
- * Caveat: gives undefined results with multiple workflows per entity.
- *
- * @todo: support multiple workflows per entity.
- */
-function workflow_get_workflows_by_type($entity_bundle, $entity_type) {
-
- static $map = [];
-
- if (!isset($map[$entity_type][$entity_bundle])) {
- $wid = FALSE;
- $map[$entity_type][$entity_bundle] = FALSE;
- if (!$wid && isset($entity_type)) {
- foreach (_workflow_info_fields(NULL, $entity_type, $entity_bundle) as $field_info) {
- $wid = $field_info->getSetting('workflow_type');
- }
- }
-
- // Set the cache with a workflow object.
- if ($wid) {
- // $wid can be numeric or named.
- $workflow = Workflow::load($wid);
- $map[$entity_type][$entity_bundle] = $workflow;
- }
- }
- return $map[$entity_type][$entity_bundle];
-}
-
-/**
- * Gets the workflow field names, if not known already.
- *
- * @param EntityInterface $entity
- * Object to work with. May be empty, e.g., on menu build.
- * @param string $entity_type
- * Entity type of object. Optional, but required if $entity provided.
- * @param string $entity_bundle
- * Bundle of entity. Optional.
- * @param string $field_name
- * Field name. Optional.
- *
- * @return Drupal\field\Entity\FieldStorageConfig[]
- * An array of FieldStorageConfig objects.
- */
-function _workflow_info_fields($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name = '') {
- $field_info = [];
-
- // Figure out the $entity's bundle and id.
- if ($entity) {
- $entity_type = $entity->getEntityTypeId();
- $entity_bundle = $entity->bundle();
- }
- else {
- // Entity type and bundle should be specified.
- }
-
- $field_list = Drupal::entityManager()->getFieldMapByFieldType('workflow');
- foreach ($field_list as $e_type => $data) {
- if (!$entity_type || ($entity_type == $e_type)) {
- foreach ($data as $f_name => $value) {
- if (!$entity_bundle || isset($value['bundles'][$entity_bundle])) {
- if (!$field_name || ($field_name == $f_name)) {
- // Do not use the field_name as ID, but the unique .
- // since you cannot share the same field on multiple entity_types (unlike D7).
- $field_config = \Drupal\field\Entity\FieldStorageConfig::loadByName($e_type, $f_name);
- $field_info[$field_config->id()] = $field_config;
- }
- }
- }
- }
- }
- return $field_info;
-}
-
-/**
- * Helper function for D8-port: Get some info on screen.
- * @see workflow_devel-module
- *
- * Usage:
- * workflow_debug( __FILE__, __FUNCTION__, __LINE__, '', ''); // @todo D8-port: still test this snippet.
- *
- * @param string $class_name
- * @param string $function_name
- * @param string $line
- * @param string $value1
- * @param string $value2
- */
-function workflow_debug($class_name, $function_name, $line = '', $value1 = '', $value2 = '') {
- $debug_switch = FALSE;
-// $debug_switch = TRUE;
-
- if (!$debug_switch) {
- return;
- }
-
- $class_name_elements = explode( "\\", $class_name);
- $output = 'Testing... function ' . end($class_name_elements) . '::' . $function_name . '/' . $line;
- if ($value1) {
- $output .= ' = ' . $value1;
- }
- if ($value2) {
- $output .= ' > ' . $value2;
- }
- drupal_set_message($output, 'warning', TRUE);
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @param string $url
- * @return Workflow
- */
-function workflow_url_get_workflow($url = '' ) {
- /** @var $workflows \Drupal\workflow\Entity\Workflow[] */
- static $workflows = [];
-
- // For some reason, $_SERVER is not allowed as default.
- $url = ($url == '') ? $_SERVER['REQUEST_URI'] : $url;
-
- // The URL may have prefixes: /
- // ex.1: /en/admin/config/workflow/workflow/MY_WORKFLOW/states
- // ex.2: /admin/config/workflow/workflow/MY_WORKFLOW/states
- $base_url = '/config/workflow/workflow/';
- $string = substr($url, strpos($url, $base_url) + strlen($base_url));
- $wid = explode('/', $string)[0];
- if (!isset($workflows[$wid])) {
- $workflows[$wid] = Workflow::load($wid);
- }
-
- return $workflows[$wid];
-}
-
-
-/**
- * Helper function to determine the title of the page.
- *
- * Used in file workflow_ui.routing.yml.
- *
- * @return \Drupal\Core\StringTranslation\TranslatableMarkup
- */
-function workflow_url_get_title() {
- $label = '';
-
- // Get the Workflow from the page.
- /** @var $workflow \Drupal\workflow\Entity\Workflow */
- if ($workflow = workflow_url_get_workflow()) {
- $label = $workflow->label();
- }
-
- $title = t('Edit @entity %label', ['@entity' => 'Workflow', '%label' => $label]);
- return $title;
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @param string $url
- * @return mixed
- */
-function workflow_url_get_form_type($url = '' ) {
- // For some reason, $_SERVER is not allowed as default.
- $url = ($url == '') ? $_SERVER['REQUEST_URI'] : $url;
-
- $base_url = '/config/workflow/workflow/';
- $string = substr($url, strpos($url, $base_url) + strlen($base_url));
- $type = explode('/', $string)[1];
- return $type;
-}
diff --git a/modules/workflow/workflow.permissions.yml b/modules/workflow/workflow.permissions.yml
deleted file mode 100644
index 8313460..0000000
--- a/modules/workflow/workflow.permissions.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Permissions are declared in Workflow (not Workflow UI) so other contrib
-# modules can make use of it.
-
-administer workflow:
- title: 'Administer workflows'
- description: 'Administer all Workflow configurations and settings.'
- restrict access: true
-
-permission_callbacks:
- - \Drupal\workflow\WorkflowPermissions::workflowTypePermissions
diff --git a/modules/workflow/workflow.routing.yml b/modules/workflow/workflow.routing.yml
deleted file mode 100644
index 2e12465..0000000
--- a/modules/workflow/workflow.routing.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-# All other routes for Workflow maintenance are declared in Workflow UI.
-
-### Workflow CRUD
-entity.workflow_type.collection:
- path: '/admin/config/workflow/workflow'
- defaults:
- _entity_list: 'workflow_type'
-# _controller: '\workflow\EntityWorkflowUIController::adminOverview'
- _title: 'Workflows'
- requirements:
- _permission: 'administer workflow'
-
-entity.workflow_type.canonical:
- path: '/admin/config/workflow/workflow/{workflow_type}'
- defaults:
- _entity_form: 'workflow_type.edit'
- _title: 'Edit Workflow'
- _title_callback: 'workflow_url_get_title'
- requirements:
- _permission: 'administer workflow'
-# _entity_access: 'workflow.update'
-
-entity.workflow_type.add_form:
- path: '/admin/config/workflow/workflow/add'
- defaults:
- _entity_form: 'workflow_type.add'
- _title: 'Add Workflow'
- requirements:
- _permission: 'administer workflow'
-# _entity_access: 'workflow.update'
-
-entity.workflow_type.edit_form:
- path: '/admin/config/workflow/workflow/{workflow_type}'
- defaults:
- _entity_form: 'workflow_type.edit'
- _title: 'Edit Workflow'
- _title_callback: 'workflow_url_get_title'
- requirements:
- _permission: 'administer workflow'
-# _entity_access: 'workflow.update'
-
-entity.workflow_type.delete_form:
- path: '/admin/config/workflow/workflow/{workflow_type}/delete'
- defaults:
- _entity_form: 'workflow_type.delete'
- _title: 'Delete Workflow'
- requirements:
- _permission: 'administer workflow'
-# _entity_access: 'workflow.update'
-
-### Workflow Executed Transition CRUD
-entity.workflow_transition.canonical:
- path: '/workflow_transition/{workflow_transition}'
- defaults:
- # Calls the view controller, defined in the annotation of the contact entity
- # _entity_view: 'workflow_transition'
- _title: 'Workflow transition'
- #requirements:
- # Calls the access controller of the entity, $operation 'view'
- # _entity_access: 'workflow_transition.view'
-
-entity.workflow_transition.edit_form:
- path: '/workflow_transition/{workflow_transition}/edit'
- defaults:
- _entity_form: 'workflow_transition.edit'
- _title: 'Edit Workflow transition'
- options:
- _admin_route: TRUE
- requirements:
- _entity_access: 'workflow_transition.update'
-
-entity.workflow_transition.delete_form:
- path: '/workflow_transition/{workflow_transition}/delete'
- defaults:
- _entity_form: 'workflow_transition.delete'
- _title: 'Delete Workflow transition'
- options:
- _admin_route: TRUE
- requirements:
- _entity_access: 'workflow_transition.delete'
-
-### Workflow Scheduled Transition CRUD
-entity.workflow_scheduled_transition.canonical:
- path: '/workflow_transition/{workflow_transition}'
- defaults:
- # Calls the view controller, defined in the annotation of the contact entity
- # _entity_view: 'workflow_transition'
- _title: 'Workflow transition'
- #requirements:
- # Calls the access controller of the entity, $operation 'view'
- # _entity_access: 'workflow_transition.view'
-
-entity.workflow_scheduled_transition.edit_form:
- path: '/workflow_transition/{workflow_transition}/edit'
- defaults:
- _entity_form: 'workflow_transition.edit'
- _title: 'Edit Workflow transition'
- options:
- _admin_route: TRUE
- requirements:
- _entity_access: 'workflow_transition.update'
-
-entity.workflow_scheduled_transition.delete_form:
- path: '/workflow_transition/{workflow_transition}/delete'
- defaults:
- _entity_form: 'workflow_transition.delete'
- _title: 'Delete Workflow transition'
- options:
- _admin_route: TRUE
- requirements:
- _entity_access: 'workflow_transition.delete'
-
-### The Workflow Transition History List (Tab)
-# @todo D8-port: make Workflow History tab happen for every entity_type.
-# @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
-# A route for showing the Workflow history tab.
-entity.node.workflow_history:
- path: '/node/{node}/workflow/{field_name}'
- defaults:
- _title: 'Workflow history'
- _controller: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyOverview'
- field_name: ~
- requirements:
- _custom_access: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyAccess'
- _module_dependencies: 'node'
- options:
- _admin_route: TRUE
- parameters:
- entity:
- type: entity:{entity_type}
-
-entity.taxonomy_term.workflow_history:
- path: '/taxonomy/term/{taxonomy_term}/workflow/{field_name}'
- defaults:
- _title: 'Workflow history'
- _controller: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyOverview'
- field_name: ~
- requirements:
- _custom_access: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyAccess'
- _module_dependencies: 'taxonomy'
- options:
- parameters:
- entity:
- type: entity:{entity_type}
diff --git a/modules/workflow/workflow.services.yml b/modules/workflow/workflow.services.yml
deleted file mode 100644
index 11489db..0000000
--- a/modules/workflow/workflow.services.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
- workflow.manager:
- class: Drupal\workflow\Entity\WorkflowManager
- arguments: ['@entity_type.manager', '@entity.query', '@config.factory', '@string_translation', '@module_handler', '@current_user']
-
-# workflow.route_subscriber:
-# class: Drupal\workflow\Routing\RouteSubscriber
-# arguments: ['@entity.manager']
-# tags:
-# - { name: event_subscriber }
diff --git a/modules/workflow/workflow.views.inc b/modules/workflow/workflow.views.inc
deleted file mode 100644
index d238554..0000000
--- a/modules/workflow/workflow.views.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-getSettings();
-
- foreach ($data as $table_name => $table_data) {
- foreach ($table_data as $field_name => $field_data) {
- if (isset($field_data['filter']) && $field_name != 'delta') {
- $data[$table_name][$field_name]['filter']['wid'] = (array_key_exists('workflow_type', $settings)) ? $settings['workflow_type'] : '';
- $data[$table_name][$field_name]['filter']['id'] = 'workflow_state';
- }
- }
- }
-
- return $data;
-}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..ce29746
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,15 @@
+
+
+
+
+
+ ./test/
+
+
+
diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php
new file mode 100644
index 0000000..a75e4d3
--- /dev/null
+++ b/scripts/composer/ScriptHandler.php
@@ -0,0 +1,100 @@
+locateRoot(getcwd());
+ $drupalRoot = $drupalFinder->getDrupalRoot();
+
+ $dirs = [
+ 'modules',
+ 'profiles',
+ 'themes',
+ ];
+
+ // Required for unit testing
+ foreach ($dirs as $dir) {
+ if (!$fs->exists($drupalRoot . '/'. $dir)) {
+ $fs->mkdir($drupalRoot . '/'. $dir);
+ $fs->touch($drupalRoot . '/'. $dir . '/.gitkeep');
+ }
+ }
+
+ // Prepare the settings file for installation
+ if (!$fs->exists($drupalRoot . '/sites/default/settings.php') and $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {
+ $fs->copy($drupalRoot . '/sites/default/default.settings.php', $drupalRoot . '/sites/default/settings.php');
+ require_once $drupalRoot . '/core/includes/bootstrap.inc';
+ require_once $drupalRoot . '/core/includes/install.inc';
+ $settings['config_directories'] = [
+ CONFIG_SYNC_DIRECTORY => (object) [
+ 'value' => Path::makeRelative($drupalFinder->getComposerRoot() . '/config/sync', $drupalRoot),
+ 'required' => TRUE,
+ ],
+ ];
+ drupal_rewrite_settings($settings, $drupalRoot . '/sites/default/settings.php');
+ $fs->chmod($drupalRoot . '/sites/default/settings.php', 0666);
+ $event->getIO()->write("Create a sites/default/settings.php file with chmod 0666");
+ }
+
+ // Create the files directory with chmod 0777
+ if (!$fs->exists($drupalRoot . '/sites/default/files')) {
+ $oldmask = umask(0);
+ $fs->mkdir($drupalRoot . '/sites/default/files', 0777);
+ umask($oldmask);
+ $event->getIO()->write("Create a sites/default/files directory with chmod 0777");
+ }
+ }
+
+ /**
+ * Checks if the installed version of Composer is compatible.
+ *
+ * Composer 1.0.0 and higher consider a `composer install` without having a
+ * lock file present as equal to `composer update`. We do not ship with a lock
+ * file to avoid merge conflicts downstream, meaning that if a project is
+ * installed with an older version of Composer the scaffolding of Drupal will
+ * not be triggered. We check this here instead of in drupal-scaffold to be
+ * able to give immediate feedback to the end user, rather than failing the
+ * installation after going through the lengthy process of compiling and
+ * downloading the Composer dependencies.
+ *
+ * @see https://github.com/composer/composer/pull/5035
+ */
+ public static function checkComposerVersion(Event $event) {
+ $composer = $event->getComposer();
+ $io = $event->getIO();
+
+ $version = $composer::VERSION;
+
+ // The dev-channel of composer uses the git revision as version number,
+ // try to the branch alias instead.
+ if (preg_match('/^[0-9a-f]{40}$/i', $version)) {
+ $version = $composer::BRANCH_ALIAS_VERSION;
+ }
+
+ // If Composer is installed through git we have no easy way to determine if
+ // it is new enough, just display a warning.
+ if ($version === '@package_version@' || $version === '@package_branch_alias_version@') {
+ $io->writeError('You are running a development version of Composer. If you experience problems, please update Composer to the latest stable version. ');
+ }
+ elseif (Comparator::lessThan($version, '1.0.0')) {
+ $io->writeError('Drupal-project requires Composer version 1.0.0 or higher. Please update your Composer before continuing .');
+ exit(1);
+ }
+ }
+
+}
diff --git a/sites/default/config/.htaccess b/sites/default/config/.htaccess
new file mode 100644
index 0000000..91883a3
--- /dev/null
+++ b/sites/default/config/.htaccess
@@ -0,0 +1,23 @@
+# Deny all requests from Apache 2.4+.
+
+ Require all denied
+
+
+# Deny all requests from Apache 2.0-2.2.
+
+ Deny from all
+ # Turn off all options we don't need.
+Options None
+Options +FollowSymLinks
+
+# Set the catch-all handler to prevent scripts from being executed.
+SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+
+ # Override the handler again if we're run later in the evaluation list.
+ SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
+
+
+# If we know how to do it safely, disable the PHP engine entirely.
+
+ php_flag engine off
+
\ No newline at end of file
diff --git a/sites/default/config/README.txt b/sites/default/config/README.txt
new file mode 100644
index 0000000..e2f9754
--- /dev/null
+++ b/sites/default/config/README.txt
@@ -0,0 +1 @@
+This directory structure contains the staging config for your site.
diff --git a/themes/bootstrap/.csslintrc b/themes/bootstrap/.csslintrc
deleted file mode 100644
index b4e65db..0000000
--- a/themes/bootstrap/.csslintrc
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "adjoining-classes": false,
- "box-sizing": true,
- "box-model": false,
- "bulletproof-font-face": true,
- "compatible-vendor-prefixes": true,
- "display-property-grouping": false,
- "duplicate-background-images": true,
- "duplicate-properties": true,
- "empty-rules": true,
- "errors": true,
- "fallback-colors": false,
- "floats": false,
- "font-sizes": true,
- "font-faces": true,
- "gradients": true,
- "ids": false,
- "import": true,
- "important": false,
- "known-properties": true,
- "outline-none": false,
- "order-alphabetical": false,
- "overqualified-elements": false,
- "qualified-headings": false,
- "regex-selectors": true,
- "rules-count": true,
- "selector-max": true,
- "selector-max-approaching": true,
- "shorthand": true,
- "star-property-hack": true,
- "text-indent": true,
- "underscore-property-hack": true,
- "unique-headings": false,
- "universal-selector": true,
- "unqualified-attributes": true,
- "vendor-prefix": false,
- "zero-units": true
-}
diff --git a/themes/bootstrap/.githooks.js.hbs b/themes/bootstrap/.githooks.js.hbs
deleted file mode 100644
index 0051ae9..0000000
--- a/themes/bootstrap/.githooks.js.hbs
+++ /dev/null
@@ -1,83 +0,0 @@
-var exec = require('sync-exec');
-var exit = 0;
-var glob = require("glob");
-var globOptions = {
- ignore: [
- 'bower_components/**/*',
- 'node_modules/**/*'
- ]
-};
-
-var pkg = require('../../package');
-// Change to \{{ hook }} once that variable is available.
-// @see https://github.com/wecodemore/grunt-githooks/pull/40
-var hooks = pkg.githooks && pkg.githooks['{{ task }}'];
-if (hooks) {
- var ret, hook, files, commands, staged, matchAll;
- var filesMatched = [];
-
- // Iterate over all hook definitions.
- for (var h in hooks) {
- hook = hooks[h];
- commands = hook.commands || [];
- staged = hook.staged === void 0 ? false : !!hook.staged;
- matchAll = hook.matchAll === void 0 ? true : !!hook.matchAll;
-
- // Iterate over all files in a hook definition.
- if (hook.files) {
- // Expand all file paths using glob (for pattern matching).
- if (typeof hook.files === 'string') {
- files = glob.sync(hook.files, globOptions) || [];
- }
- if (Array.isArray(hook.files)) {
- files = [];
- for (var f = 0; f < hook.files.length; f++) {
- files = [].concat(files, glob.sync(hook.files[f], globOptions) || []);
- }
- }
-
- // All files must either be staged or modified for the entire
- // hook definition command(s) to be executed.
- for (f in files) {
- var file = files[f];
- if (file) {
- // Only continue if file has been staged or modified.
- ret = exec((staged ? 'git diff --name-only --cached ' + file : 'git diff HEAD@{1} --stat -- ' + file));
- exit = ret.status;
- if (exit === 0 && ret.stdout !== '') {
- filesMatched.push(file);
- }
- else if (matchAll && (exit > 0 || ret.stdout === '')) {
- console.log(ret.stdout);
- filesMatched = [];
- break;
- }
- }
- }
- }
-
- // Iterate over all commands that should be executed for matched files.
- if (filesMatched.length) {
- if (typeof commands === 'string') {
- commands = [commands];
- }
- for (var c in commands) {
- var command = commands[c];
- console.log("\033[4;35mgit: {{ task }}\033[0;35m\n>> " + command + "\033[0m\n");
- ret = exec(command);
- console.log(ret.stdout);
- exit = ret.status;
- if (exit > 0) {
- break;
- }
- }
- }
-
- // Display any errors.
- if (exit > 0 && ret && ret.stderr) {
- console.log(ret.stderr);
- }
- }
-}
-
-process.exit(exit);
diff --git a/themes/bootstrap/.gitignore b/themes/bootstrap/.gitignore
deleted file mode 100644
index 1b5b477..0000000
--- a/themes/bootstrap/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-# OS
-.DS_Store
-
-# Applications & Tools
-.idea
-bower_components
-config.codekit
-node_modules
-npm-debug.log
-
-# Project Specific
-.libraries
-lib
-starterkits/*/bootstrap
diff --git a/themes/bootstrap/Gruntfile.js b/themes/bootstrap/Gruntfile.js
deleted file mode 100644
index 3eb8f83..0000000
--- a/themes/bootstrap/Gruntfile.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var path = require('path');
-
-module.exports = function (grunt) {
- // Record grunt task execution times. Must be first.
- require('time-grunt')(grunt);
-
- // Register the "default" task.
- grunt.registerTask('default', ['compile']);
-
- // Register the "install" task.
- grunt.registerTask('install', 'Installs or re-installs this grunt project. Read more in: docs/project/grunt.md.', ['githooks', 'sync', 'clean-vendor-dirs']);
-
- // Load custom tasks.
- grunt.task.loadTasks('grunt');
-
- // Load npm installed 'grunt-*' tasks and configurations.
- require('load-grunt-config')(grunt, {
- configPath: path.join(process.cwd(), 'grunt', 'config')
- });
-};
diff --git a/themes/bootstrap/LICENSE.txt b/themes/bootstrap/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/themes/bootstrap/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/themes/bootstrap/README.md b/themes/bootstrap/README.md
deleted file mode 100644
index 3da7f7f..0000000
--- a/themes/bootstrap/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# Bootstrap
-
-> Sleek, intuitive, and powerful mobile first front-end framework for faster and
-> easier web development. Bootstrap has become one of the most popular front-end
-> frameworks and open source projects in the world.
-
-This base theme bridges the gap between Drupal and the [Bootstrap Framework].
-
-### Features
-- [jsDelivr CDN](http://www.jsdelivr.com) for "out-of-the-box" styling and
- faster page load times.
-- [Bootswatch](http://bootswatch.com) theme support, if using the CDN.
-- Glyphicons support via [Icon API](https://www.drupal.org/project/icon).
-- Extensive integration and template/preprocessor overrides for most of the
- [Bootstrap Framework] CSS, Components and JavaScript
-- Theme settings to further enhance the Drupal Bootstrap integration:
- - [Breadcrumbs](http://getbootstrap.com/components/#breadcrumbs)
- - [Navbar](http://getbootstrap.com/components/#navbar)
- - [Popovers](http://getbootstrap.com/javascript/#popovers)
- - [Tooltips](http://getbootstrap.com/javascript/#tooltips)
- - [Wells](http://getbootstrap.com/components/#wells) (per region)
-
-### Documentation
-Visit the project's [official documentation site](http://drupal-bootstrap.org)
-or the markdown files inside the `./docs` directory.
-
-### Supported modules
-
-**Drupal 8**
-- [Bootstrap Layouts](https://www.drupal.org/project/bootstrap_layouts)
-
-**Drupal 7**
-- [Bootstrap Core](https://www.drupal.org/project/bootstrap_core)
-- [jQuery Update](https://www.drupal.org/project/jquery_update)
-- [Icon API](https://www.drupal.org/project/icon)
-- [Picture](https://www.drupal.org/project/picture)
-- [Views](https://www.drupal.org/project/views) _(partial support)_
-- [Webform](https://www.drupal.org/project/webform) _(partial support)_
-
-### 5 Year Evolution (gource)
-https://youtu.be/Cvq6MPJp2dI
-
-[Bootstrap Framework]: http://getbootstrap.com
diff --git a/themes/bootstrap/autoload-fix.php b/themes/bootstrap/autoload-fix.php
deleted file mode 100644
index 0fe2369..0000000
--- a/themes/bootstrap/autoload-fix.php
+++ /dev/null
@@ -1,19 +0,0 @@
-listInfo();
-}
-catch (\Exception $e) {
- // Intentionally left blank.
-}
diff --git a/themes/bootstrap/bootstrap.api.php b/themes/bootstrap/bootstrap.api.php
deleted file mode 100644
index 6346320..0000000
--- a/themes/bootstrap/bootstrap.api.php
+++ /dev/null
@@ -1,63 +0,0 @@
- dt('Generates markdown documentation for the Drupal based code.'),
- 'arguments' => [
- 'type' => 'The specific type of documentation to generate, defaults to "all". Can be: "all", "settings".',
- ],
- 'aliases' => ['bs-docs'],
- ];
- return $items;
-}
-
-/**
- * Generates markdown documentation.
- *
- * @param string $type
- */
-function drush_bootstrap_generate_docs($type = 'all') {
- $types = $type === 'all' ? ['settings'] : [$type];
- foreach ($types as $type) {
- $function = "_drush_bootstrap_generate_docs_$type";
- if (function_exists($function)) {
- $ret = $function(Bootstrap::getTheme('bootstrap'));
- if ($ret) {
- drush_log('Successfully generated documentation for: ' . $type, 'success');
- }
- else {
- drush_log('Unable to generate documentation for: ' . $type, 'error');
- }
- }
- else {
- drush_log('Invalid documentation type: ' . $type, 'error');
- }
- }
-}
-
-/**
- * Generates settings documentation.
- *
- * @param \Drupal\bootstrap\Theme $bootstrap
- * The theme instance of the Drupal Bootstrap base theme.
- */
-function _drush_bootstrap_generate_docs_settings(Theme $bootstrap) {
- $output[] = '';
- $output[] = '';
- $output[] = '';
- $output[] = '# Theme Settings';
- $output[] = '';
- $output[] = 'To override a setting, open `./config/install/THEMENAME.settings.yml` and add the following:';
- $output[] = '';
- $output[] = '```yaml';
- $output[] = '# Settings';
- $output[] = '';
- $output[] = 'settings:';
- $output[] = ' SETTING_NAME: SETTING_VALUE';
- $output[] = '```';
-
- // Determine the groups.
- $groups = [];
- foreach ($bootstrap->getSettingPlugin() as $setting) {
- // Only get the first two groups (we don't need 3rd, or more, levels).
- $_groups = array_slice($setting->getGroups(), 0, 2, FALSE);
- if (!$_groups) {
- continue;
- }
- $groups[implode(' > ', $_groups)][] = $setting->getPluginDefinition();
- }
-
- // Generate a table of each group's settings.
- foreach ($groups as $group => $settings) {
- $output[] = '';
- $output[] = '---';
- $output[] = '';
- $output[] = "### $group";
- $output[] = '';
- $output[] = '';
- $output[] = ' Setting name Description and default value ';
- foreach ($settings as $definition) {
- $output[] = ' ';
- $output[] = ' ' . $definition['id'] . ' ';
- $output[] = ' ';
- $output[] = ' ' . str_replace('"e;', '"', $definition['description']) . '
';
- $output[] = ' ' . Yaml::encode([$definition['id'] => $definition['defaultValue']]) . ' ';
- $output[] = ' ';
- }
- $output[] = ' ';
- $output[] = '
';
- }
-
- // Ensure we have link references at the bottom.
- $output[] = '';
- $output[] = '[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap';
- $output[] = '[Bootstrap Framework]: http://getbootstrap.com';
-
- // Save the generated output to the appropriate file.
- return file_put_contents(realpath($bootstrap->getPath() . '/docs/Theme-Settings.md'), implode("\n", $output)) !== FALSE;
-}
diff --git a/themes/bootstrap/bootstrap.info.yml b/themes/bootstrap/bootstrap.info.yml
deleted file mode 100644
index 5038409..0000000
--- a/themes/bootstrap/bootstrap.info.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-# core: 8.x
-type: theme
-base theme: false
-
-name: 'Bootstrap'
-description: 'Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.'
-package: 'Bootstrap'
-
-regions:
- navigation: 'Navigation'
- navigation_collapsible: 'Navigation (Collapsible)'
- header: 'Top Bar'
- highlighted: 'Highlighted'
- help: 'Help'
- content: 'Content'
- sidebar_first: 'Primary'
- sidebar_second: 'Secondary'
- footer: 'Footer'
- page_top: 'Page top'
- page_bottom: 'Page bottom'
-
-libraries:
- - 'bootstrap/theme'
-
-libraries-extend:
- core/drupal.ajax:
- - bootstrap/drupal.ajax
- core/drupal.autocomplete:
- - bootstrap/drupal.autocomplete
- core/drupal.form:
- - bootstrap/drupal.form
- core/drupal.progress:
- - bootstrap/drupal.progress
- core/drupal.states:
- - bootstrap/drupal.states
- core/drupal.tabledrag:
- - bootstrap/drupal.tabledrag
- image_widget_crop/cropper.integration:
- - bootstrap/image_widget_crop
- views/views.ajax:
- - bootstrap/views.ajax
-
-libraries-override:
- core/drupal.batch: bootstrap/drupal.batch
- core/drupal.collapse: false
- core/drupal.dropbutton: bootstrap/dropdown
- core/drupal.vertical-tabs: bootstrap/drupal.vertical-tabs
- filter/drupal.filter: bootstrap/drupal.filter
- system/admin: false
- text/drupal.text: bootstrap/drupal.text
-
-# Remove individual stylesheets.
- system/base:
- css:
- component:
- css/components/ajax-progress.module.css: false
- css/components/autocomplete-loading.module.css: false
- css/components/tabledrag.module.css: false
-
- file/drupal.file:
- css:
- theme:
- css/file.admin.css: false
-
- filter/drupal.filter.admin:
- css:
- theme:
- css/filter.admin.css: false
-
- node/drupal.node.preview:
- css:
- theme:
- css/node.preview.css: false
-
-# The following are dynamic library overrides based on certain critera,
-# usually a theme setting.
-#
-# @see \Drupal\bootstrap\Plugin\Alter\LibraryInfo::alter()
-#
-# core/drupal.dialog: bootstrap/drupal.dialog
-# core/drupal.dialog.ajax: bootstrap/drupal.dialog.ajax
-
-# Information added by Drupal.org packaging script on 2017-09-25
-version: '8.x-3.6'
-core: '8.x'
-project: 'bootstrap'
-datestamp: 1506357855
diff --git a/themes/bootstrap/bootstrap.libraries.yml b/themes/bootstrap/bootstrap.libraries.yml
deleted file mode 100644
index b98efe0..0000000
--- a/themes/bootstrap/bootstrap.libraries.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-attributes:
- js:
- js/attributes.js: {}
- dependencies:
- - core/jquery
- - core/underscore
-
-drupal.bootstrap:
- js:
- js/drupal.bootstrap.js: {}
- dependencies:
- - core/jquery
- - core/drupal
- - core/drupalSettings
-
-# Create a library placeholder for livereload.
-# This is altered dynamically based on the set URL.
-# @see \Drupal\bootstrap\Plugin\Alter\LibraryInfo::alter
-livereload:
- js:
- livereload.js: {}
-
-theme:
- js:
- js/theme.js: {}
- dependencies:
- - bootstrap/drupal.bootstrap
- - bootstrap/attributes
-
-theme-settings:
- js:
- js/theme-settings.js: {}
- dependencies:
- - core/jquery
- - core/jquery.once
- - core/drupal
- - core/drupalSettings
-
-dropdown:
- js:
- js/dropdown.js: {}
- dependencies:
- - bootstrap/theme
-
-modal:
- js:
- js/modal.js: {}
- dependencies:
- - bootstrap/theme
-
-popover:
- js:
- js/popover.js: {}
- dependencies:
- - bootstrap/theme
-
-tooltip:
- js:
- js/tooltip.js: {}
- dependencies:
- - bootstrap/theme
-
-# libraries-extend
-drupal.ajax:
- js:
- js/misc/ajax.js: {}
-
-drupal.autocomplete:
- js:
- js/misc/autocomplete.js: {}
-
-drupal.form:
- js:
- js/misc/form.js: {}
- dependencies:
- - bootstrap/theme
-
-drupal.progress:
- js:
- js/misc/progress.js: {}
-
-drupal.states:
- js:
- js/misc/states.js: {}
-
-drupal.tabledrag:
- js:
- js/misc/tabledrag.js: {}
-
-image_widget_crop:
- js:
- js/modules/image_widget_crop/ImageWidgetCrop.js: {}
-
-views.ajax:
- js:
- js/modules/views/ajax_view.js: {}
-
-# libraries-override
-drupal.batch:
- js:
- js/misc/batch.js: { cache: false }
- dependencies:
- - bootstrap/theme
- - core/drupal.ajax
- - core/drupal.progress
- - core/jquery.once
-
-drupal.dialog:
- js:
- js/misc/dialog.js: {}
- dependencies:
- - bootstrap/modal
-
-drupal.dialog.ajax:
- js:
- js/misc/dialog.ajax.js: {}
- dependencies:
- - core/drupal.ajax
- - bootstrap/drupal.dialog
-
-drupal.filter:
- version: VERSION
- js:
- js/modules/filter/filter.js: {}
- dependencies:
- - core/jquery
- - core/drupal
- - core/jquery.once
-
-drupal.text:
- js:
- js/text/text.js: {}
- dependencies:
- - core/jquery
- - core/jquery.once
- - core/drupal
-
-drupal.vertical-tabs:
- js:
- js/misc/vertical-tabs.js: {}
- dependencies:
- - bootstrap/theme
- - core/jquery.once
- - core/drupal.form
- - core/matchmedia
diff --git a/themes/bootstrap/bootstrap.theme b/themes/bootstrap/bootstrap.theme
deleted file mode 100644
index f89d6d8..0000000
--- a/themes/bootstrap/bootstrap.theme
+++ /dev/null
@@ -1,148 +0,0 @@
-.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.0/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.0/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-flatly.min.css b/themes/bootstrap/css/3.0.0/overrides-flatly.min.css
deleted file mode 100644
index aaa4346..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1 #ddd #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-journal.min.css b/themes/bootstrap/css/3.0.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-readable.min.css b/themes/bootstrap/css/3.0.0/overrides-readable.min.css
deleted file mode 100644
index 1b19300..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:15px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:15px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lora,Georgia,"Times New Roman",Times,serif;font-size:17px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:22px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-simplex.min.css b/themes/bootstrap/css/3.0.0/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-slate.min.css b/themes/bootstrap/css/3.0.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-united.min.css b/themes/bootstrap/css/3.0.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides.min.css b/themes/bootstrap/css/3.0.0/overrides.min.css
deleted file mode 100644
index 11c6067..0000000
--- a/themes/bootstrap/css/3.0.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-amelia.min.css b/themes/bootstrap/css/3.0.1/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.1/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.1/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.1/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-flatly.min.css b/themes/bootstrap/css/3.0.1/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-journal.min.css b/themes/bootstrap/css/3.0.1/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-readable.min.css b/themes/bootstrap/css/3.0.1/overrides-readable.min.css
deleted file mode 100644
index 1b19300..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:15px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:15px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lora,Georgia,"Times New Roman",Times,serif;font-size:17px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:22px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-simplex.min.css b/themes/bootstrap/css/3.0.1/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-slate.min.css b/themes/bootstrap/css/3.0.1/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.1/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-united.min.css b/themes/bootstrap/css/3.0.1/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides.min.css b/themes/bootstrap/css/3.0.1/overrides.min.css
deleted file mode 100644
index 23376fc..0000000
--- a/themes/bootstrap/css/3.0.1/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-amelia.min.css b/themes/bootstrap/css/3.0.2/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.2/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.2/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.2/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-flatly.min.css b/themes/bootstrap/css/3.0.2/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-journal.min.css b/themes/bootstrap/css/3.0.2/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-readable.min.css b/themes/bootstrap/css/3.0.2/overrides-readable.min.css
deleted file mode 100644
index 1b19300..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:15px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:15px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lora,Georgia,"Times New Roman",Times,serif;font-size:17px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:22px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-simplex.min.css b/themes/bootstrap/css/3.0.2/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-slate.min.css b/themes/bootstrap/css/3.0.2/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.2/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-united.min.css b/themes/bootstrap/css/3.0.2/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-yeti.min.css b/themes/bootstrap/css/3.0.2/overrides-yeti.min.css
deleted file mode 100644
index 23376fc..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides.min.css b/themes/bootstrap/css/3.0.2/overrides.min.css
deleted file mode 100644
index 23376fc..0000000
--- a/themes/bootstrap/css/3.0.2/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-amelia.min.css b/themes/bootstrap/css/3.0.3/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.3/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.3/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.3/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-flatly.min.css b/themes/bootstrap/css/3.0.3/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-journal.min.css b/themes/bootstrap/css/3.0.3/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-readable.min.css b/themes/bootstrap/css/3.0.3/overrides-readable.min.css
deleted file mode 100644
index 99acc49..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#5cb85c}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-simplex.min.css b/themes/bootstrap/css/3.0.3/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-slate.min.css b/themes/bootstrap/css/3.0.3/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.3/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-united.min.css b/themes/bootstrap/css/3.0.3/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-yeti.min.css b/themes/bootstrap/css/3.0.3/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides.min.css b/themes/bootstrap/css/3.0.3/overrides.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.0.3/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-amelia.min.css b/themes/bootstrap/css/3.1.0/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.1.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.1.0/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.1.0/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-flatly.min.css b/themes/bootstrap/css/3.1.0/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-journal.min.css b/themes/bootstrap/css/3.1.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-lumen.min.css b/themes/bootstrap/css/3.1.0/overrides-lumen.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-readable.min.css b/themes/bootstrap/css/3.1.0/overrides-readable.min.css
deleted file mode 100644
index 99acc49..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#5cb85c}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-simplex.min.css b/themes/bootstrap/css/3.1.0/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-slate.min.css b/themes/bootstrap/css/3.1.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.1.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-superhero.min.css b/themes/bootstrap/css/3.1.0/overrides-superhero.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-united.min.css b/themes/bootstrap/css/3.1.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-yeti.min.css b/themes/bootstrap/css/3.1.0/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides.min.css b/themes/bootstrap/css/3.1.0/overrides.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-amelia.min.css b/themes/bootstrap/css/3.1.1/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-cerulean.min.css b/themes/bootstrap/css/3.1.1/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-cosmo.min.css b/themes/bootstrap/css/3.1.1/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-cyborg.min.css b/themes/bootstrap/css/3.1.1/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-darkly.min.css b/themes/bootstrap/css/3.1.1/overrides-darkly.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-flatly.min.css b/themes/bootstrap/css/3.1.1/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-journal.min.css b/themes/bootstrap/css/3.1.1/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-lumen.min.css b/themes/bootstrap/css/3.1.1/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-readable.min.css b/themes/bootstrap/css/3.1.1/overrides-readable.min.css
deleted file mode 100644
index 14dcf59..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-simplex.min.css b/themes/bootstrap/css/3.1.1/overrides-simplex.min.css
deleted file mode 100644
index 5614d1b..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-slate.min.css b/themes/bootstrap/css/3.1.1/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-spacelab.min.css b/themes/bootstrap/css/3.1.1/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-superhero.min.css b/themes/bootstrap/css/3.1.1/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-united.min.css b/themes/bootstrap/css/3.1.1/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-yeti.min.css b/themes/bootstrap/css/3.1.1/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides.min.css b/themes/bootstrap/css/3.1.1/overrides.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.1/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-amelia.min.css b/themes/bootstrap/css/3.2.0/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.2.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.2.0/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.2.0/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-darkly.min.css b/themes/bootstrap/css/3.2.0/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-flatly.min.css b/themes/bootstrap/css/3.2.0/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-journal.min.css b/themes/bootstrap/css/3.2.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-lumen.min.css b/themes/bootstrap/css/3.2.0/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-paper.min.css b/themes/bootstrap/css/3.2.0/overrides-paper.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-readable.min.css b/themes/bootstrap/css/3.2.0/overrides-readable.min.css
deleted file mode 100644
index 14dcf59..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-sandstone.min.css b/themes/bootstrap/css/3.2.0/overrides-sandstone.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-simplex.min.css b/themes/bootstrap/css/3.2.0/overrides-simplex.min.css
deleted file mode 100644
index 5614d1b..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-slate.min.css b/themes/bootstrap/css/3.2.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.2.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-superhero.min.css b/themes/bootstrap/css/3.2.0/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-united.min.css b/themes/bootstrap/css/3.2.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-yeti.min.css b/themes/bootstrap/css/3.2.0/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides.min.css b/themes/bootstrap/css/3.2.0/overrides.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.2.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-amelia.min.css b/themes/bootstrap/css/3.3.0/overrides-amelia.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.0/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.0/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-darkly.min.css b/themes/bootstrap/css/3.3.0/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-flatly.min.css b/themes/bootstrap/css/3.3.0/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-journal.min.css b/themes/bootstrap/css/3.3.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-lumen.min.css b/themes/bootstrap/css/3.3.0/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-paper.min.css b/themes/bootstrap/css/3.3.0/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-readable.min.css b/themes/bootstrap/css/3.3.0/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.0/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-simplex.min.css b/themes/bootstrap/css/3.3.0/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-slate.min.css b/themes/bootstrap/css/3.3.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-superhero.min.css b/themes/bootstrap/css/3.3.0/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-united.min.css b/themes/bootstrap/css/3.3.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-yeti.min.css b/themes/bootstrap/css/3.3.0/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides.min.css b/themes/bootstrap/css/3.3.0/overrides.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.3.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.1/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.1/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.1/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-darkly.min.css b/themes/bootstrap/css/3.3.1/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-flatly.min.css b/themes/bootstrap/css/3.3.1/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-journal.min.css b/themes/bootstrap/css/3.3.1/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-lumen.min.css b/themes/bootstrap/css/3.3.1/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-paper.min.css b/themes/bootstrap/css/3.3.1/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-readable.min.css b/themes/bootstrap/css/3.3.1/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.1/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-simplex.min.css b/themes/bootstrap/css/3.3.1/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-slate.min.css b/themes/bootstrap/css/3.3.1/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.1/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-superhero.min.css b/themes/bootstrap/css/3.3.1/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-united.min.css b/themes/bootstrap/css/3.3.1/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-yeti.min.css b/themes/bootstrap/css/3.3.1/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides.min.css b/themes/bootstrap/css/3.3.1/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.1/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.2/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.2/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.2/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-darkly.min.css b/themes/bootstrap/css/3.3.2/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-flatly.min.css b/themes/bootstrap/css/3.3.2/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-journal.min.css b/themes/bootstrap/css/3.3.2/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-lumen.min.css b/themes/bootstrap/css/3.3.2/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-paper.min.css b/themes/bootstrap/css/3.3.2/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-readable.min.css b/themes/bootstrap/css/3.3.2/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.2/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-simplex.min.css b/themes/bootstrap/css/3.3.2/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-slate.min.css b/themes/bootstrap/css/3.3.2/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.2/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-superhero.min.css b/themes/bootstrap/css/3.3.2/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-united.min.css b/themes/bootstrap/css/3.3.2/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-yeti.min.css b/themes/bootstrap/css/3.3.2/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides.min.css b/themes/bootstrap/css/3.3.2/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.2/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.4/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.4/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.4/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-darkly.min.css b/themes/bootstrap/css/3.3.4/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-flatly.min.css b/themes/bootstrap/css/3.3.4/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-journal.min.css b/themes/bootstrap/css/3.3.4/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-lumen.min.css b/themes/bootstrap/css/3.3.4/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-paper.min.css b/themes/bootstrap/css/3.3.4/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-readable.min.css b/themes/bootstrap/css/3.3.4/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.4/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-simplex.min.css b/themes/bootstrap/css/3.3.4/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-slate.min.css b/themes/bootstrap/css/3.3.4/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.4/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-superhero.min.css b/themes/bootstrap/css/3.3.4/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-united.min.css b/themes/bootstrap/css/3.3.4/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-yeti.min.css b/themes/bootstrap/css/3.3.4/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides.min.css b/themes/bootstrap/css/3.3.4/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.4/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.5/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.5/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.5/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-darkly.min.css b/themes/bootstrap/css/3.3.5/overrides-darkly.min.css
deleted file mode 100644
index 83a0383..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#303030;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#375a7f;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-flatly.min.css b/themes/bootstrap/css/3.3.5/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-journal.min.css b/themes/bootstrap/css/3.3.5/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-lumen.min.css b/themes/bootstrap/css/3.3.5/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-paper.min.css b/themes/bootstrap/css/3.3.5/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-readable.min.css b/themes/bootstrap/css/3.3.5/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.5/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-simplex.min.css b/themes/bootstrap/css/3.3.5/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-slate.min.css b/themes/bootstrap/css/3.3.5/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.5/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-superhero.min.css b/themes/bootstrap/css/3.3.5/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-united.min.css b/themes/bootstrap/css/3.3.5/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-yeti.min.css b/themes/bootstrap/css/3.3.5/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides.min.css b/themes/bootstrap/css/3.3.5/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.5/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.6/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.6/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.6/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-darkly.min.css b/themes/bootstrap/css/3.3.6/overrides-darkly.min.css
deleted file mode 100644
index 83a0383..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#303030;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#375a7f;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-flatly.min.css b/themes/bootstrap/css/3.3.6/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-journal.min.css b/themes/bootstrap/css/3.3.6/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-lumen.min.css b/themes/bootstrap/css/3.3.6/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-paper.min.css b/themes/bootstrap/css/3.3.6/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-readable.min.css b/themes/bootstrap/css/3.3.6/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.6/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-simplex.min.css b/themes/bootstrap/css/3.3.6/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-slate.min.css b/themes/bootstrap/css/3.3.6/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.6/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-superhero.min.css b/themes/bootstrap/css/3.3.6/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-united.min.css b/themes/bootstrap/css/3.3.6/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-yeti.min.css b/themes/bootstrap/css/3.3.6/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides.min.css b/themes/bootstrap/css/3.3.6/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.6/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.7/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.7/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.7/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-darkly.min.css b/themes/bootstrap/css/3.3.7/overrides-darkly.min.css
deleted file mode 100644
index 83a0383..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#303030;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#375a7f;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-flatly.min.css b/themes/bootstrap/css/3.3.7/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-journal.min.css b/themes/bootstrap/css/3.3.7/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-lumen.min.css b/themes/bootstrap/css/3.3.7/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-paper.min.css b/themes/bootstrap/css/3.3.7/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-readable.min.css b/themes/bootstrap/css/3.3.7/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.7/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-simplex.min.css b/themes/bootstrap/css/3.3.7/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-slate.min.css b/themes/bootstrap/css/3.3.7/overrides-slate.min.css
deleted file mode 100644
index ec0b1ed..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #000;border-top:1px solid #000}.file>span:first-child{border-left:1px solid #000}.file>span:last-child{border-right:1px solid #000}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.7/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-superhero.min.css b/themes/bootstrap/css/3.3.7/overrides-superhero.min.css
deleted file mode 100644
index bb50002..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-united.min.css b/themes/bootstrap/css/3.3.7/overrides-united.min.css
deleted file mode 100644
index bc4c0eb..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#E95420;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#E95420;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#E95420;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#E95420}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#E95420;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-yeti.min.css b/themes/bootstrap/css/3.3.7/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides.min.css b/themes/bootstrap/css/3.3.7/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.7/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/README.md b/themes/bootstrap/css/README.md
deleted file mode 100644
index b87b91e..0000000
--- a/themes/bootstrap/css/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# **DO NOT MANUALLY MODIFY THE CSS FILES LOCATED IN THIS DIRECTORY AND BELOW**
-
-This entire folder is automatically generated by the maintainers of this project
-using `grunt` upon commit. The source of these files is:
-`starterkits/less/less/overrides.less`
-
-Read MAINTAINERS.md for a more comprehensive overview of this topic.
diff --git a/themes/bootstrap/css/images/required.svg b/themes/bootstrap/css/images/required.svg
deleted file mode 100644
index f7882d6..0000000
--- a/themes/bootstrap/css/images/required.svg
+++ /dev/null
@@ -1 +0,0 @@
-Change Records
-
-
-Optionally, you can insert any additional verbiage here.
-However, if it is long, it should really be a change record.
-
-
-Notes
-
-
-Changes since ():
-
-New Features
-
-
-Bug Fixes
-
-```
-
-### Create a Release Node
-
-{.alert.alert-info} **NOTE:** This project currently relies on the
-[Drush Git Release Notes](https://www.drupal.org/project/grn) tool to
-automatically generate the the bulk of the release notes. This does, however,
-requires maintainers to do the following extra steps. This entire process will
-eventually be converted into a fully automated grunt task. Until then, please
-download and install this tool and follow the remaining steps.
-
-1. Create a [tag in git](https://www.drupal.org/node/1066342) that follows the
- previous version and push it to the repository.
-2. Create a [project release node](https://www.drupal.org/node/1068944) for this
- newly created tag.
-3. _(Skip this step if this is a new "alpha/beta" release)_ In a separate tab,
- go to this project's [releases](https://www.drupal.org/node/259843/release)
- page. Open and edit the previous release node. It should have followed the
- release note template. If it has, copy and paste its contents into the new
- release node body.
-4. In a separate tab, go to the [change records](https://www.drupal.org/list-changes/bootstrap)
- for this project and filter by the new official release version
- ("alpha/beta/RC" releases should always use the next "official" version for
- their change records). If there are no change records, then remove this
- section. Otherwise, copy and paste the entire table into the template
- (replacing any existing one, if necessary).
-5. Generate a list of issues/commits by executing the following from the root
- of the project:
-
- `drush release-notes --commit-count`
- (e.g. `drush release-notes 7.x-3.0 7.x-3.1 --commit-count`)
-
- If this is a follow-up "alpha/beta/RC" release, always use the last
- "alpha/beta/RC" release version instead. This will allow for a quicker
- parsing of the list to merge into the previously copied release notes:
-
- `drush release-notes --commit-count`
- (e.g. `drush release-notes 7.x-3.1-beta2 7.x-3.1-beta3 --commit-count`)
-
-6. Copy the entire generated output into the template, just under where the
- "Change Records" section would be, replacing only the commit count (do not
- replace the "since last {offical} version").
-7. Go though each item (``) that contains an issue link, ignoring duplicates
- and standalone verbiage (direct commits). Move (cut and paste) these items
- into the appropriate "New Features" or "Bug Fixes" sections.
-8. Once complete the generated list should be empty (e.g. ``), remove it.
-9. Save the release node.
diff --git a/themes/bootstrap/docs/README.md b/themes/bootstrap/docs/README.md
deleted file mode 100644
index a42d478..0000000
--- a/themes/bootstrap/docs/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-# Drupal Bootstrap Documentation
-
-{.lead} The official documentation site for the [Drupal Bootstrap] base theme
-
-The majority of this site is automatically generated from source files
-located through out the project's repository. Topics are extracted from Markdown
-files and the rest is extracted from embedded PHP comments.
-
----
-
-## Topics
-
-Below are some topics to help get you started using the [Drupal Bootstrap] base
-theme. They are ordered based on the level one typically progresses while using
-a base theme like this.
-
-#### @link contributing Contributing @endlink
-
-#### @link getting_started Getting Started @endlink
-
-#### @link theme_settings Theme Settings @endlink
-
-#### @link sub_theming Sub-Theming @endlink
-- @link sub_theming_cdn CDN Starterkit @endlink
-- @link sub_theming_less Less Starterkit @endlink
-- @link sub_theming_sass Sass Starterkit @endlink
-
-#### @link templates Templates @endlink
-
-#### @link utility Utilities @endlink
-
-#### @link plugins Plugin System @endlink
-- @link plugins_alter @BootstrapAlter @endlink
-- @link plugins_form @BootstrapForm @endlink
-- @link plugins_preprocess @BootstrapPreprocess @endlink
-- @link plugins_prerender @BootstrapPrerender @endlink
-- @link plugins_process @BootstrapProcess @endlink
-- @link plugins_provider @BootstrapProvider @endlink
-- @link plugins_setting @BootstrapSetting @endlink
-- @link plugins_update @BootstrapUpdate @endlink
-
-#### @link maintainers Project Maintainers @endlink
-
----
-
-## Terminology
-
-The term **"bootstrap"** can be used excessively through out this project's
-documentation. For clarity, we will always attempt to use this word verbosely
-in one of the following ways:
-
-- **[Drupal Bootstrap]** refers to the Drupal base theme project.
-- **[Bootstrap Framework](http://getbootstrap.com)** refers to the external
- front end framework.
-- **[drupal_bootstrap](https://api.drupal.org/apis/drupal_bootstrap)** refers
- to Drupal's bootstrapping process or phase.
-
-When referring to files inside the [Drupal Bootstrap] project directory, they
-will always start with `./bootstrap` and continue to specify the full path to
-the file or directory inside it. For example, the file that is responsible for
-displaying the text on this page is located at `./bootstrap/docs/README.md`.
-
-When referring to files inside a sub-theme, they will always start with
-`./THEMENAME/`, where `THEMENAME` is the machine name of your sub-theme. They
-will continue to specify the full path to the file or directory inside it. For
-example, the primary file Drupal uses to determine if a theme
-exists is: `./THEMENAME/THEMENAME.info.yml`.
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
diff --git a/themes/bootstrap/docs/Sub-Theming.md b/themes/bootstrap/docs/Sub-Theming.md
deleted file mode 100644
index 605315f..0000000
--- a/themes/bootstrap/docs/Sub-Theming.md
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-# Sub-Theming
-
-If you haven't already installed the Drupal Bootstrap theme, read
-the @link getting_started Getting Started @endlink topic. Below
-are instructions on how to create a [Drupal Bootstrap] based sub-theme.
-There are several different variations on how to accomplish this task, but this
-topic will focus on the two primarily and most common ways.
-
-{.alert.alert-warning} **Warning** You should never modify any theme or sub-theme that
-is packaged and released from Drupal.org, such as Drupal Bootstrap. If you
-do, all changes you have made will be lost once that theme is updated. Instead,
-you should create a subtheme from one of the provided starterkits (this is
-considered a best practice). Once you've done that, you can override CSS,
-templates, and theme processing.
-
-#### Choose a Starterkit {#starterkit}
-
-- @link sub_theming_cdn CDN Starterkit @endlink - uses the "out-of-the-box"
- CSS and JavaScript files served by the [jsDelivr CDN].
-- @link sub_theming_less Less Starterkit @endlink - uses the [Bootstrap Framework]
- [Less] source files and a local [Less] preprocessor.
-- @link sub_theming_sass Sass Starterkit @endlink - uses the [Bootstrap Framework]
- [Sass] source files and a local [Sass] preprocessor.
-
-Once you've selected one of the above starterkits, here's how to install it:
-
-1. Copy over one of the starterkits you have chosen from the
- `./bootstrap/starterkits` directory into the `themes` directory.
-2. Rename the directory to a unique machine readable name. This is your sub-theme's
- "machine name". When referring to files inside a sub-theme, they will always
- start with `./THEMENAME/`, where `THEMENAME` is the machine name of your
- sub-theme. They will continue to specify the full path to the file or
- directory inside it. For example, the primary file Drupal uses to determine
- if a theme exists is: `./THEMENAME/THEMENAME.info.yml`.
-3. Rename `./THEMENAME/THEMENAME.starterkit.yml` to match
- `./THEMENAME/THEMENAME.info.yml`. Also, rename `./THEMENAME/THEMENAME.libraries.yml`
- and `./THEMENAME/THEMENAME.theme` as well.
-4. Open `./THEMENAME/THEMENAME.info.yml` and change the name, description and any
- other properties to suite your needs. Make sure to rename the library name as
- well: `- THEMENAME/global-styling`.
-5. Rename the sub-theme configuration files, located at:
- `./THEMENAME/config/install/THEMENAME.settings.yml` and
- `./THEMENAME/config/schema/THEMENAME.schema.yml`.
-6. Open `./THEMENAME/config/schema/THEMENAME.schema.yml` and rename
- `- THEMENAME.settings:` and `'THEMETITLE settings'`
-
-{.alert.alert-warning} **WARNING:** Ensure that the `.starterkit` suffix is
-not present on your sub-theme's `.info.yml` filename. This suffix is simply a stop
-gap measure to ensure that the bundled starter kit sub-theme cannot be enabled
-or used directly. This helps people unfamiliar with Drupal avoid modifying the
-starter kit sub-theme directly and instead forces them to create a new sub-theme
-to modify.
-
-#### Enable Your New Sub-theme {#enable}
-In your Drupal site, navigate to `admin/appearance` and click the `Enable and
-set default` link next to your newly created sub-theme. Now that you've enabled
-your starterkit, please refer to the starterkit's documentation page to customize.
-
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
-[Bootstrap Framework]: http://getbootstrap.com
-[jsDelivr CDN]: http://www.jsdelivr.com
-[Less]: http://lesscss.org
-[Sass]: http://sass-lang.com
diff --git a/themes/bootstrap/docs/Templates.md b/themes/bootstrap/docs/Templates.md
deleted file mode 100644
index 83b0a72..0000000
--- a/themes/bootstrap/docs/Templates.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-# Templates
-
-List of theme templates used in the Drupal Bootstrap base theme.
diff --git a/themes/bootstrap/docs/Theme-Settings.md b/themes/bootstrap/docs/Theme-Settings.md
deleted file mode 100644
index be6d014..0000000
--- a/themes/bootstrap/docs/Theme-Settings.md
+++ /dev/null
@@ -1,603 +0,0 @@
-
-
-
-# Theme Settings
-
-To override a setting, open `./config/install/THEMENAME.settings.yml` and add the following:
-
-```yaml
-# Settings
-
-settings:
- SETTING_NAME: SETTING_VALUE
-```
-
----
-
-### Advanced
-
-
- Setting name Description and default value
-
- include_deprecated
-
- Enabling this setting will include any deprecated.php file found in your theme or base themes.
- include_deprecated: 0
-
-
-
- suppress_deprecated_warnings
-
- Enable this setting if you wish to suppress deprecated warning messages. WARNING: Suppressing these messages does not "fix" the problem and you will inevitably encounter issues when they are removed in future updates. Only use this setting in extreme and necessary circumstances.
- suppress_deprecated_warnings: 0
-
-
-
-
-
----
-
-### Advanced > CDN (Content Delivery Network)
-
-
- Setting name Description and default value
-
- cdn_provider
-
- Choose between jsdelivr or a custom cdn source.
- cdn_provider: jsdelivr
-
-
-
- cdn_custom_css
-
- It is best to use https protocols here as it will allow more flexibility if the need ever arises.
- cdn_custom_css: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.css'
-
-
-
- cdn_custom_css_min
-
- Additionally, you can provide the minimized version of the file. It will be used instead if site aggregation is enabled.
- cdn_custom_css_min: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.min.css'
-
-
-
- cdn_custom_js
-
- It is best to use https protocols here as it will allow more flexibility if the need ever arises.
- cdn_custom_js: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.js'
-
-
-
- cdn_custom_js_min
-
- Additionally, you can provide the minimized version of the file. It will be used instead if site aggregation is enabled.
- cdn_custom_js_min: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.min.js'
-
-
-
- cdn_jsdelivr_version
-
- Choose the Bootstrap version from jsdelivr
- cdn_jsdelivr_version: 3.3.7
-
-
-
- cdn_jsdelivr_theme
-
- Choose the example Bootstrap Theme provided by Bootstrap or one of the Bootswatch themes.
- cdn_jsdelivr_theme: bootstrap
-
-
-
-
-
----
-
-### Components > Breadcrumbs
-
-
- Setting name Description and default value
-
- breadcrumb
-
- Show or hide the Breadcrumbs
- breadcrumb: '1'
-
-
-
- breadcrumb_home
-
- If your site has a module dedicated to handling breadcrumbs already, ensure this setting is enabled.
- breadcrumb_home: 0
-
-
-
- breadcrumb_title
-
- If your site has a module dedicated to handling breadcrumbs already, ensure this setting is disabled.
- breadcrumb_title: 1
-
-
-
-
-
----
-
-### Components > Navbar
-
-
- Setting name Description and default value
-
- navbar_inverse
-
- Select if you want the inverse navbar style.
- navbar_inverse: 0
-
-
-
- navbar_position
-
- Determines where the navbar is positioned on the page.
- navbar_position: ''
-
-
-
-
-
----
-
-### Components > Region Wells
-
-
- Setting name Description and default value
-
- region_wells
-
- Enable the .well, .well-sm or .well-lg classes for specified regions.
- region_wells:
- navigation: ''
- navigation_collapsible: ''
- header: ''
- highlighted: ''
- help: ''
- content: ''
- sidebar_first: ''
- sidebar_second: well
- footer: ''
-
-
-
-
-
----
-
-### General > Buttons
-
-
- Setting name Description and default value
-
- button_colorize
-
- Adds classes to buttons based on their text value.
- button_colorize: 1
-
-
-
- button_iconize
-
- Adds icons to buttons based on the text value
- button_iconize: 1
-
-
-
- button_size
-
- Defines the Bootstrap Buttons specific size
- button_size: ''
-
-
-
-
-
----
-
-### General > Container
-
-
- Setting name Description and default value
-
- fluid_container
-
- Uses the .container-fluid class instead of .container.
- fluid_container: 0
-
-
-
-
-
----
-
-### General > Forms
-
-
- Setting name Description and default value
-
- forms_has_error_value_toggle
-
- If an element has a .has-error class attached to it, enabling this will automatically remove that class when a value is entered.
- forms_has_error_value_toggle: 1
-
-
-
- forms_required_has_error
-
- If an element in a form is required, enabling this will always display the element with a .has-error class. This turns the element red and helps in usability for determining which form elements are required to submit the form.
- forms_required_has_error: 0
-
-
-
- forms_smart_descriptions
-
- Convert descriptions into tooltips (must be enabled) automatically based on certain criteria. This helps reduce the, sometimes unnecessary, amount of noise on a page full of form elements.
- forms_smart_descriptions: 1
-
-
-
- forms_smart_descriptions_allowed_tags
-
- Prevents descriptions from becoming tooltips by checking for HTML not in the list above (i.e. links). Separate by commas. To disable this filtering criteria, leave an empty value.
- forms_smart_descriptions_allowed_tags: 'b, code, em, i, kbd, span, strong'
-
-
-
- forms_smart_descriptions_limit
-
- Prevents descriptions from becoming tooltips by checking the character length of the description (HTML is not counted towards this limit). To disable this filtering criteria, leave an empty value.
- forms_smart_descriptions_limit: '250'
-
-
-
-
-
----
-
-### General > Images
-
-
- Setting name Description and default value
-
- image_responsive
-
- Images in Bootstrap 3 can be made responsive-friendly via the addition of the .img-responsive class. This applies max-width: 100%; and height: auto; to the image so that it scales nicely to the parent element.
- image_responsive: 1
-
-
-
- image_shape
-
- Add classes to an <img> element to easily style images in any project.
- image_shape: ''
-
-
-
-
-
----
-
-### General > Tables
-
-
- Setting name Description and default value
-
- table_bordered
-
- Add borders on all sides of the table and cells.
- table_bordered: 0
-
-
-
- table_condensed
-
- Make tables more compact by cutting cell padding in half.
- table_condensed: 0
-
-
-
- table_hover
-
- Enable a hover state on table rows.
- table_hover: 1
-
-
-
- table_responsive
-
- Makes tables responsive by wrapping them in .table-responsive to make them scroll horizontally up to small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.
- table_responsive: 1
-
-
-
- table_striped
-
- Add zebra-striping to any table row within the <tbody>.
- table_striped: 1
-
-
-
-
-
----
-
-### JavaScript > Modals
-
-
- Setting name Description and default value
-
- modal_enabled
-
- Enabling this will replace core's jQuery UI Dialog implementations with modals from the Bootstrap Framework.
- modal_enabled: 1
-
-
-
- modal_animation
-
- Apply a CSS fade transition to modals.
- modal_animation: 1
-
-
-
- modal_backdrop
-
- Includes a modal-backdrop element. Alternatively, specify static for a backdrop which doesn't close the modal on click.
- modal_backdrop: 'true'
-
-
-
- modal_keyboard
-
- Closes the modal when escape key is pressed.
- modal_keyboard: 1
-
-
-
- modal_show
-
- Shows the modal when initialized.
- modal_show: 1
-
-
-
- modal_size
-
- Defines the modal size between the default, modal-sm and modal-lg.
- modal_size: ''
-
-
-
-
-
----
-
-### JavaScript > Popovers
-
-
- Setting name Description and default value
-
- popover_enabled
-
- Elements that have the data-toggle="popover" attribute set will automatically initialize the popover upon page load. WARNING: This feature can sometimes impact performance. Disable if pages appear to hang after initial load.
- popover_enabled: 1
-
-
-
- popover_animation
-
- Apply a CSS fade transition to the popover.
- popover_animation: 1
-
-
-
- popover_container
-
- Appends the popover to a specific element. Example: body. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.
- popover_container: body
-
-
-
- popover_content
-
- Default content value if data-content or data-target attributes are not present.
- popover_content: ''
-
-
-
- popover_delay
-
- The amount of time to delay showing and hiding the popover (in milliseconds). Does not apply to manual trigger type.
- popover_delay: '0'
-
-
-
- popover_html
-
- Insert HTML into the popover. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.
- popover_html: 0
-
-
-
- popover_placement
-
- Where to position the popover. When auto is specified, it will dynamically reorient the popover. For example, if placement is auto left, the popover will display to the left when possible, otherwise it will display right.
- popover_placement: right
-
-
-
- popover_selector
-
- If a selector is provided, tooltip objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added.
- popover_selector: ''
-
-
-
- popover_title
-
- Default title value if title attribute isn't present.
- popover_title: ''
-
-
-
- popover_trigger
-
- How a popover is triggered.
- popover_trigger: click
-
-
-
- popover_trigger_autoclose
-
- Will automatically close the current popover if a click occurs anywhere else other than the popover element.
- popover_trigger_autoclose: 1
-
-
-
-
-
----
-
-### JavaScript > Tooltips
-
-
- Setting name Description and default value
-
- tooltip_enabled
-
- Elements that have the data-toggle="tooltip" attribute set will automatically initialize the tooltip upon page load. WARNING: This feature can sometimes impact performance. Disable if pages appear to "hang" after initial load.
- tooltip_enabled: 1
-
-
-
- tooltip_animation
-
- Apply a CSS fade transition to the tooltip.
- tooltip_animation: 1
-
-
-
- tooltip_container
-
- Appends the tooltip to a specific element. Example: body.
- tooltip_container: body
-
-
-
- tooltip_delay
-
- The amount of time to delay showing and hiding the tooltip (in milliseconds). Does not apply to manual trigger type.
- tooltip_delay: '0'
-
-
-
- tooltip_html
-
- Insert HTML into the tooltip. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.
- tooltip_html: 0
-
-
-
- tooltip_placement
-
- Where to position the tooltip. When auto is specified, it will dynamically reorient the tooltip. For example, if placement is auto left, the tooltip will display to the left when possible, otherwise it will display right.
- tooltip_placement: 'auto left'
-
-
-
- tooltip_selector
-
- If a selector is provided, tooltip objects will be delegated to the specified targets.
- tooltip_selector: ''
-
-
-
- tooltip_trigger
-
- How a tooltip is triggered.
- tooltip_trigger: hover
-
-
-
-
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
-[Bootstrap Framework]: http://getbootstrap.com
diff --git a/themes/bootstrap/docs/Utility.md b/themes/bootstrap/docs/Utility.md
deleted file mode 100644
index 6f90812..0000000
--- a/themes/bootstrap/docs/Utility.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-# Utilities
-
-List of theme utility helper classes used in the Drupal Bootstrap base theme.
diff --git a/themes/bootstrap/docs/plugins/Alter.md b/themes/bootstrap/docs/plugins/Alter.md
deleted file mode 100644
index e3c5aad..0000000
--- a/themes/bootstrap/docs/plugins/Alter.md
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-# @BootstrapAlter
-
-- [Pre-requisite](#prerequisite)
-- [Supported alter hooks](#supported)
-- [Form alter hooks](#form)
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Pre-requisite {#prerequisite}
-
-Due to the nature of how Drupal alter hooks work, there is no "catch all" alter
-hook (like for forms with hook_form_alter). That means for you to use this
-plugin, it must be invoked from inside each and every alter hook that lives in
-`THEMENAME.theme`.
-
-Luckily you don't have to worry about invoking the plugin directly. Instead,
-all you have to do is call the `Bootstrap::alter` helper method and pass the
-alter function name and parameters as arguments:
-
-```php
-use Drupal\bootstrap\Bootstrap;
-
-/**
- * Implements hook_some_hook_alter().
- */
-function THEMENAME_some_hook_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
- Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-```
-
-## Supported alter hooks {#supported}
-
-This base theme implements several of the most commonly used alter hooks in
-themes and are automatically supported out-of-the-box.
-
-Once a base theme has implemented an alter hook, like mentioned above, all
-subsequent sub-themes will have the ability to implement a plugin for that
-alter hook directly. All you have to do is simply create the plugin file in
-`./THEMENAME/src/Plugin/Alter`. No need to implement any code in
-`THEMENAME.theme`:
-
-- `hook_bootstrap_colorize_text_alter`
-- `hook_bootstrap_iconize_text_alter`
-- `hook_element_info_alter`
-- `hook_js_settings_alter`
-- `hook_library_info_alter`
-- `hook_page_attachments_alter`
-- `hook_theme_registry_alter`
-- `hook_theme_suggestions_alter`
-
-{.alert.alert-info}**Note:** if you do not see an alter hook here that you think
-_should_ be here, please
-[create an issue](https://www.drupal.org/node/add/project-issue/bootstrap)
-
-## Form alter hooks {#form}
-
-You were probably thinking: "Hey, where's `hook_form_alter`? Didn't you _just_
-mention that above?"
-
-As we all know, forms can be a tad more involved than just a simple "alter" and
-we figured that we'd give you a little more power behind what you can actually
-do with them. So if you're interested in those, please go see:
-
-@link plugins_form @BootstrapForm @endlink
-
-While, yes technically, `hook_form_system_theme_settings_alter` could also
-fall under the form plugin, we decided to take those a step further as well, see:
-
-
-@link plugins_setting @BootstrapSetting @endlink
-
-## Create a plugin {#create}
-
-We'll use `PageAttachments` implemented by this base theme as an example of
-how to add a library from your sub-theme to every page request.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Alter/PageAttachments.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Alter\PageAttachments.
- */
-
-namespace Drupal\THEMENAME\Plugin\Alter;
-
-use Drupal\bootstrap\Annotation\BootstrapAlter;
-
-/**
- * Implements hook_page_attachments_alter().
- *
- * @ingroup plugins_alter
- *
- * @BootstrapAlter("page_attachments")
- */
-class PageAttachments extends \Drupal\bootstrap\Plugin\Alter\PageAttachments {
-
- /**
- * {@inheritdoc}
- */
- public function alter(&$attachments, &$context1 = NULL, &$context2 = NULL) {
- // Call the parent method from the base theme, if applicable (which it is
- // in this case because Bootstrap actually implements this alter).
- parent::alter($attachments, $context1, $context2);
-
- // Add your custom library.
- $attachments['#attached']['library'][] = 'THEMENAME/my_library';
- }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapAlter` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapAlter` plugin!
diff --git a/themes/bootstrap/docs/plugins/Form.md b/themes/bootstrap/docs/plugins/Form.md
deleted file mode 100644
index 20ff1f9..0000000
--- a/themes/bootstrap/docs/plugins/Form.md
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-# @BootstrapForm
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-We'll use `SearchBlockForm` implemented by this base theme as an example of
-how to remove `#input_group_button` from `search_block_form`.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Form/SearchBlockForm.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Form\SearchBlockForm.
- */
-
-namespace Drupal\THEMENAME\Plugin\Form;
-
-use Drupal\bootstrap\Annotation\BootstrapForm;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * @ingroup plugins_form
- *
- * @BootstrapForm("search_block_form")
- */
-class SearchBlockForm extends \Drupal\bootstrap\Plugin\Form\SearchBlockForm {
-
- /**
- * {@inheritdoc}
- */
- public function alterForm(array &$form, FormStateInterface $form_state, $form_id = NULL) {
- // Call the parent method from the base theme, if applicable (which it is
- // in this case because Bootstrap actually implements this alter).
- parent::alterForm($form, $form_state, $form_id);
-
- // Disable #input_group_button the normal way:
- $form['keys']['#input_group_button'] = FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
- // This method is the same as above, except the the $form argument passed is
- // an instance of \Drupal\bootstrap\Utility\Element for easier manipulation.
- // Using this method is preferable and considered "Best Practice".
-
- // Disable #input_group_button using the $form Element object:
- // $form->keys->setProperty('input_group_button', FALSE);
- }
-
- /**
- * {@inheritdoc}
- */
- public static function submitForm(array &$form, FormStateInterface $form_state) {
- // This method is automatically called when the form is submitted.
- }
-
- /**
- * {@inheritdoc}
- */
- public static function submitFormElement(Element $form, FormStateInterface $form_state) {
- // This method is the same as above, except the the $form argument passed is
- // an instance of \Drupal\bootstrap\Utility\Element for easier manipulation.
- // Using this method is preferable and considered "Best Practice".
- }
-
- /**
- * {@inheritdoc}
- */
- public static function validateForm(array &$form, FormStateInterface $form_state) {
- // This method is automatically called when the form is validated.
- }
-
- /**
- * {@inheritdoc}
- */
- public static function validateFormElement(Element $form, FormStateInterface $form_state) {
- // This method is the same as above, except the the $form argument passed is
- // an instance of \Drupal\bootstrap\Utility\Element for easier manipulation.
- // Using this method is preferable and considered "Best Practice".
- }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapForm` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapForm` plugin!
diff --git a/themes/bootstrap/docs/plugins/Preprocess.md b/themes/bootstrap/docs/plugins/Preprocess.md
deleted file mode 100644
index 69ee076..0000000
--- a/themes/bootstrap/docs/plugins/Preprocess.md
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-# @BootstrapPreprocess
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-We'll use `Page` implemented by this base theme as an example of how to add
-custom classes for the `page.html.twig` template that should only be added
-under certain conditions.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Preprocess/Page.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Preprocess\Page.
- */
-
-namespace Drupal\THEMENAME\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "page" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("page")
- */
-class Page extends \Drupal\bootstrap\Plugin\Preprocess\Page {
-
- // It should be noted that you do not need all three methods here.
- // This is to just show you the different examples of how this plugin
- // works and how they can be tailored to your needs.
-
- /**
- * {@inheritdoc}
- */
- public function preprocess(array &$variables, $hook, array $info) {
- $value = isset($variables['element']['child']['#value']) ? $variables['element']['child']['#value'] : FALSE;
- if (_some_module_condition($value)) {
- $variables['attributes']['class'][] = 'my-theme-class';
- $variables['attributes']['class'][] = 'another-theme-class';
- $key = array_search('page', $variables['attributes']['class']);
- if ($key !== FALSE) {
- unset($variables['attributes']['class'][$key]);
- }
- }
-
- // If you are extending and overriding a preprocess method from the base
- // theme, it is imperative that you also call the parent (base theme) method
- // at some point in the process, typically after you have finished with your
- // preprocessing.
- parent::preprocess($variables, $hook, $info);
- }
-
- /**
- * {@inheritdoc}
- */
- public function preprocessVariables(Variables $variables) {
- // This method is almost identical to the one above, but it introduces the
- // Variables utility class in the base theme. This class has a plethora of
- // helpful methods to quickly modify common tasks when you're in a
- // preprocess function. It also acts like the normal $variables array when
- // you need it to in instances of accessing nested content or in loop
- // structures like foreach.
- $value = isset($variables['element']['child']['#value']) ? $variables['element']['child']['#value'] : FALSE;
- if (_some_module_condition($value)) {
- $variables->addClass(['my-theme-class', 'another-theme-class'])->removeClass('page');
- }
- parent::preprocessVariables($variables);
- }
-
- /**
- * {@inheritdoc}
- */
- protected function preprocessElement(Element $element, Variables $variables) {
- // This method is only ever invoked if either $variables['element'] or
- // $variables['elements'] exists. These keys are usually only found in forms
- // or render arrays when there is a #type being used. This introduces the
- // Element utility class in the base theme. It too has a bucket-load of
- // features, specific to the unique characteristics of render arrays with
- // their "properties" (keys starting with #). This will quickly allow you to
- // access some of the nested element data and reduce the overhead required
- // for commonly used logic.
- $value = $element->child->getProperty('value', FALSE);
- if (_some_module_condition($value)) {
- $variables->addClass(['my-theme-class', 'another-theme-class'])->removeClass('page');
- }
- parent::preprocessElement($element, $variables);
- }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapPreprocess` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapPreprocess` plugin!
diff --git a/themes/bootstrap/docs/plugins/Prerender.md b/themes/bootstrap/docs/plugins/Prerender.md
deleted file mode 100644
index f4db973..0000000
--- a/themes/bootstrap/docs/plugins/Prerender.md
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-# @BootstrapPrerender
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-We'll use `Link` implemented by this base theme as an example of how to add
-custom classes and an icon to make the link look like a Bootstrap button. This
-example will only work if the link is passed some sort of `#context` when the
-render array is built, like the following:
-
-```php
-$build['my_button'] = [
- '#type' => 'link',
- '#title' => t('Download'),
- '#url' => \Drupal\Core\Url::fromUserInput('/download', ['query' => ['item' => '1234']]),
- '#context' => [
- 'downloadButton' => TRUE,
- ],
-];
-```
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Prerender/Link.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Prerender\Link.
- */
-
-namespace Drupal\THEMENAME\Plugin\Prerender;
-
-use Drupal\bootstrap\Annotation\BootstrapConstant;
-use Drupal\bootstrap\Annotation\BootstrapPrerender;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-
-/**
- * Pre-render callback for the "link" element type.
- *
- * @ingroup plugins_prerender
- *
- * @BootstrapPrerender("link",
- * action = @BootstrapConstant(
- * "\Drupal\bootstrap\Bootstrap::CALLBACK_PREPEND"
- * )
- * )
- *
- * @see \Drupal\Core\Render\Element\Link::preRenderLink()
- */
-class Link extends \Drupal\bootstrap\Plugin\Prerender\Link {
-
- // It should be noted that you do not need both methods here.
- // This is to just show you the different examples of how this plugin
- // works and how it can be tailored to your needs.
-
- /**
- * {@inheritdoc}
- */
- public static function preRender(array $element) {
- $context = isset($element['#context']) ? $element['#context'] : [];
-
- // Make downloadButton links into buttons.
- if (!empty($context['downloadButton'])) {
- $element['#icon'] = Bootstrap::glyphicon('download-alt');
- $element['#attributes']['class'][] = 'btn';
- $element['#attributes']['class'][] = 'btn-primary';
- $element['#attributes']['class'][] = 'btn-lg';
- }
-
- // You must always return the element in this method, as well as call
- // the parent method when sub-classing this method. It invokes preRenderElement().
- return parent::preRender($element);
- }
-
- /**
- * {@inheritdoc}
- */
- public static function preRenderElement(Element $element) {
- $context = $element->getProperty('context', []);
-
- // Make downloadButton links into buttons.
- // Same as above, just a little cleaner with the Element utility class.
- if (!empty($context['downloadButton'])) {
- $element->addClass(['btn', 'btn-primary', 'btn-lg'])->setIcon(Bootstrap::glyphicon('download-alt'));
- }
-
- // You don't always have to call the parent method when sub-classing, but
- // it is generally recommended that you do (otherwise the icon that was
- // just added wouldn't work).
- parent::preRenderElement($element);
- }
-
-}
-
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapPrerender` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapPrerender` plugin!
diff --git a/themes/bootstrap/docs/plugins/Process.md b/themes/bootstrap/docs/plugins/Process.md
deleted file mode 100644
index 432f6bb..0000000
--- a/themes/bootstrap/docs/plugins/Process.md
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-# @BootstrapProcess
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-{.alert.alert-warning}**Note:** This plugin is _not_ a re-implementation of the
-D7 `hook_process_HOOK` for theme hooks in anyway. That layer was removed from
-the theme system in D8 and for good reason (see:
-[Remove the process layer](https://www.drupal.org/node/1843650)). This plugin
-is about automatically adding a `#process` callback for a form element `#type`.
-This is especially useful when dealing with core elements that have implemented
-their own callbacks; either to alter their output or remove entirely.
-
-We'll use `TextFormat` implemented by this base theme as an example of how to
-override the class entirely and remove this base theme's over-simplification
-for the "format tips" section.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Process/TextFormat.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Process\TextFormat.
- */
-
-namespace Drupal\THEMENAME\Plugin\Process;
-
-use Drupal\bootstrap\Annotation\BootstrapProcess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Processes the "text_format" element.
- *
- * @ingroup plugins_process
- *
- * @BootstrapProcess("text_format")
- *
- * @see \Drupal\filter\Element\TextFormat::processFormat()
- */
-class TextFormat extends \Drupal\bootstrap\Plugin\Process\TextFormat {
-
- // It should be noted that you do not need both methods here.
- // This is to just show you the different examples of how this plugin
- // works and how it can be tailored to your needs.
-
- /**
- * {@inheritdoc}
- */
- public static function process(array $element, FormStateInterface $form_state, array &$complete_form) {
- // You must return the element immediately if this is TRUE.
- if (!empty($element['#bootstrap_ignore_process'])) {
- return $element;
- }
-
- // Technically this isn't the method that we need to achieve our goal.
- // But showing it just for example sake.
-
- // You must always return the element in this method, as well as call
- // the parent method when sub-classing this method, it invokes processElement();
- return parent::process($element, $form_state, $complete_form);
- }
-
- /**
- * {@inheritdoc}
- */
- public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
- // Normally, we'd call the parent method here. But this is actually an
- // instance where we know we don't want to use the alterations made by
- // the base theme. So we just comment it out and leave the method empty.
- // parent::processElement($element, $form_state, $complete_form);
- }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapProcess` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapProcess` plugin!
diff --git a/themes/bootstrap/docs/plugins/Provider.md b/themes/bootstrap/docs/plugins/Provider.md
deleted file mode 100644
index 17697c1..0000000
--- a/themes/bootstrap/docs/plugins/Provider.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-# @BootstrapProvider
-
-This plugin is a little too complex to explain (for now). If you would like to
-help expand this documentation, please [create an issue](https://www.drupal.org/node/add/project-issue/bootstrap).
-
-See the existing classes below on examples of how to implement your own.
diff --git a/themes/bootstrap/docs/plugins/README.md b/themes/bootstrap/docs/plugins/README.md
deleted file mode 100644
index e86f07a..0000000
--- a/themes/bootstrap/docs/plugins/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-# Plugin System
-
-- [Overview](#overview)
-- [Helpful Tips](#helpful-tips)
-
----
-
-## Overview {#overview}
-
-The [Drupal Bootstrap] base theme handles some very complex theme registry
-alterations and annotated plugin discoveries to assist with the organization
-and maintenance of its source code.
-
-By leveraging OOP (object oriented programming) with PHP namespacing and
-Drupal's autoloading, we garner the ability to include files only when a
-theme hook is actually invoked. This allows the base theme to reduce its per
-page PHP memory footprint as much as possible. It also allows for easier
-maintenance and organization with as much customization this base theme
-implements.
-
-The data and display logic of the [Drupal Bootstrap] base theme has been
-divided into what we call the "Plugin System". It's nearly identical to the
-other plugin system(s) found through out Drupal, with the exception that these
-plugins are not bound to the container in any way.
-
-This is, in part, due to the fact that themes are not allowed to participate in
-container construction since a theme could vary from page to page (in theory).
-So, instead, this base theme implements its own annotated discovery plugins
-to leverage the powerful inheritance capabilities of PHP class instances.
-
-All of these plugins can be found in the following directories and are discussed,
-in length, below in their respective sub-topics:
-- `./bootstrap/src/Plugin/Alter`
-- `./bootstrap/src/Plugin/Form`
-- `./bootstrap/src/Plugin/Preprocess`
-- `./bootstrap/src/Plugin/Prerender`
-- `./bootstrap/src/Plugin/Process`
-- `./bootstrap/src/Plugin/Provider`
-- `./bootstrap/src/Plugin/Setting`
-- `./bootstrap/src/Plugin/Update`
-
-While sub-themes are not required to do so, they can easily emulate this same
-type of file structure/workflow and take advantage of this base theme's unique
-ability and power. All you have to do is make sure you extend from this base
-theme's implementation, if it exists.
-
-Rest assured though, there is no need to structure your sub-theme this way. If
-you feel more comfortable storing everything in your sub-theme's
-`THEMENAME.theme` file and invoking the "normal" Drupal hooks, please feel free
-to do so. It will not impact your sub-theme one way or the other.
-
-It is, however, highly recommended that you at least read through this a bit to
-gain some understanding on how this base theme structures its PHP and template
-components. This will allow you to more easily copy stuff over to your
-sub-theme, should the need arise.
-
-## Helpful tips {#helpful-tips}
-
-All plugins, except those that only have static methods, have the active Theme
-object available to them: e.g. `$this->theme`. This will allow you to do things
-like get a theme setting very, very easily: e.g.
-`$this->theme->getSetting('button_size')`.
-
-A helpful primer on Annotation-based plugins can be found at:
-https://www.drupal.org/node/1882526
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
diff --git a/themes/bootstrap/docs/plugins/Setting.md b/themes/bootstrap/docs/plugins/Setting.md
deleted file mode 100644
index d0200c6..0000000
--- a/themes/bootstrap/docs/plugins/Setting.md
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-# @BootstrapSetting
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-- [Public Methods](#methods)
-
-## Create a plugin {#create}
-
-We will use `SkipLink` as our first `@BootstrapSetting` plugin to create. In
-this example we want our sub-theme to specify a different skip link anchor id
-to change in the Theme Settings interface altering the default of
-`#main-content`.
-
-Replace all of the following instances of `THEMENAME` with the actual machine
-name of your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Setting/THEMENAME/Accessibility/SkipLink.php`
-with the following contents:
-
-```php
-Read more about skip links.)",
- arguments = { ":link" = "http://drupal.org/node/467976" }),
- * groups = {
- * "THEMENAME" = "THEMETITLE",
- * "accessibility" = @Translation("Accessibility"),
- * },
- * )
- */
-class SkipLink extends SettingBase {}
-```
-
-Helpfully Bootstrap adds a global `theme` variable added to every template
-in `Bootstrap::preprocess()`.
-
-This variable can now simply be called in the `html.html.twig` file with the
-following contents:
-
-```twig
-
- {{ 'Skip to main content'|t }}
-
-```
-
-In addition, the `page.html.twig` file will also need to be adjusted for this to
-work properly with the new anchor id.
-
-```twig
-}
- */
- Drupal.bootstrap.eventMap = {
- Event: /^(?:load|unload|abort|error|select|change|submit|reset|focus|blur|resize|scroll)$/,
- MouseEvent: /^(?:click|dblclick|mouse(?:down|enter|leave|up|over|move|out))$/,
- KeyboardEvent: /^(?:key(?:down|press|up))$/,
- TouchEvent: /^(?:touch(?:start|end|move|cancel))$/
- };
-
- /**
- * Simulates a native event on an element in the browser.
- *
- * Note: This is a pretty complete modern implementation. If things are quite
- * working the way you intend (in older browsers), you may wish to use the
- * jQuery.simulate plugin. If it's available, this method will defer to it.
- *
- * @see https://github.com/jquery/jquery-simulate
- *
- * @param {HTMLElement} element
- * A DOM element to dispatch event on.
- * @param {String} type
- * The type of event to simulate.
- * @param {Object} [options]
- * An object of options to pass to the event constructor. Typically, if
- * an event is being proxied, you should just pass the original event
- * object here. This allows, if the browser supports it, to be a truly
- * simulated event.
- */
- Drupal.bootstrap.simulate = function (element, type, options) {
- // Defer to the jQuery.simulate plugin, if it's available.
- if (typeof $.simulate === 'function') {
- new $.simulate(element, type, options);
- return;
- }
- var event;
- var ctor;
- for (var name in Drupal.bootstrap.eventMap) {
- if (Drupal.bootstrap.eventMap[name].test(type)) {
- ctor = name;
- break;
- }
- }
- if (!ctor) {
- throw new SyntaxError('Only rudimentary HTMLEvents, KeyboardEvents and MouseEvents are supported: ' + type);
- }
- var opts = {bubbles: true, cancelable: true};
- if (ctor === 'KeyboardEvent' || ctor === 'MouseEvent') {
- $.extend(opts, {ctrlKey: !1, altKey: !1, shiftKey: !1, metaKey: !1});
- }
- if (ctor === 'MouseEvent') {
- $.extend(opts, {button: 0, pointerX: 0, pointerY: 0, view: window});
- }
- if (options) {
- $.extend(opts, options);
- }
- if (typeof window[ctor] === 'function') {
- event = new window[ctor](type, opts);
- element.dispatchEvent(event);
- }
- else if (document.createEvent) {
- event = document.createEvent(ctor);
- event.initEvent(type, opts.bubbles, opts.cancelable);
- element.dispatchEvent(event);
- }
- else if (typeof element.fireEvent === 'function') {
- event = $.extend(document.createEventObject(), opts);
- element.fireEvent('on' + type, event);
- }
- else if (typeof element[type]) {
- element[type]();
- }
- };
-
- /**
- * Provide jQuery UI like ability to get/set options for Bootstrap plugins.
- *
- * @param {string|object} key
- * A string value of the option to set, can be dot like to a nested key.
- * An object of key/value pairs.
- * @param {*} [value]
- * (optional) A value to set for key.
- *
- * @returns {*}
- * - Returns nothing if key is an object or both key and value parameters
- * were provided to set an option.
- * - Returns the a value for a specific setting if key was provided.
- * - Returns an object of key/value pairs of all the options if no key or
- * value parameter was provided.
- *
- * @see https://github.com/jquery/jquery-ui/blob/master/ui/widget.js
- *
- * @todo This isn't fully working since Bootstrap plugins don't allow
- * methods to return values.
- */
- Drupal.bootstrap.option = function (key, value) {
- var options = key;
- var parts, curOption, i;
-
- // Don't return a reference to the internal hash.
- if (arguments.length === 0) {
- return $.extend({}, this.options);
- }
-
- // Handle a specific option.
- if (typeof key === "string") {
- // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
- options = {};
- parts = key.split(".");
- key = parts.shift();
- if (parts.length) {
- curOption = options[key] = $.extend({}, this.options[key]);
- for (i = 0; i < parts.length - 1; i++) {
- curOption[parts[i]] = curOption[parts[i]] || {};
- curOption = curOption[parts[i]];
- }
- key = parts.pop();
- if (arguments.length === 1) {
- return curOption[key] === undefined ? null : curOption[key];
- }
- curOption[key] = value;
- }
- else {
- if (arguments.length === 1) {
- return this.options[key] === undefined ? null : this.options[key];
- }
- options[key] = value;
- }
- }
-
- // Set the new option(s).
- for (key in options) {
- if (!options.hasOwnProperty(key)) continue;
- this.options[key] = options[key];
- }
- return this;
- };
-
-})(window.jQuery, window.Drupal, window.drupalSettings);
diff --git a/themes/bootstrap/js/misc/ajax.js b/themes/bootstrap/js/misc/ajax.js
deleted file mode 100644
index 2fb1b0d..0000000
--- a/themes/bootstrap/js/misc/ajax.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * @file
- * Extends methods from core/misc/ajax.js.
- */
-
-(function ($, window, Drupal, drupalSettings) {
-
- /**
- * Attempts to find the closest glyphicon progress indicator.
- *
- * @param {jQuery|Element} element
- * A DOM element.
- *
- * @returns {jQuery}
- * A jQuery object.
- */
- Drupal.Ajax.prototype.findGlyphicon = function (element) {
- return $(element).closest('.form-item').find('.ajax-progress.glyphicon')
- };
-
- /**
- * Starts the spinning of the glyphicon progress indicator.
- *
- * @param {jQuery|Element} element
- * A DOM element.
- * @param {string} [message]
- * An optional message to display (tooltip) for the progress.
- *
- * @returns {jQuery}
- * A jQuery object.
- */
- Drupal.Ajax.prototype.glyphiconStart = function (element, message) {
- var $glyphicon = this.findGlyphicon(element);
- if ($glyphicon[0]) {
- $glyphicon.addClass('glyphicon-spin');
-
- // Add any message as a tooltip to the glyphicon.
- if (drupalSettings.bootstrap.tooltip_enabled) {
- $glyphicon
- .removeAttr('data-toggle')
- .removeAttr('data-original-title')
- .removeAttr('title')
- .tooltip('destroy')
- ;
-
- if (message) {
- $glyphicon.attr('data-toggle', 'tooltip').attr('title', message).tooltip();
- }
- }
-
- // Append a message for screen readers.
- if (message) {
- $glyphicon.parent().append('' + message + '
');
- }
- }
- return $glyphicon;
- };
-
- /**
- * Stop the spinning of a glyphicon progress indicator.
- *
- * @param {jQuery|Element} element
- * A DOM element.
- */
- Drupal.Ajax.prototype.glyphiconStop = function (element) {
- var $glyphicon = this.findGlyphicon(element);
- if ($glyphicon[0]) {
- $glyphicon.removeClass('glyphicon-spin');
- if (drupalSettings.bootstrap.tooltip_enabled) {
- $glyphicon
- .removeAttr('data-toggle')
- .removeAttr('data-original-title')
- .removeAttr('title')
- .tooltip('destroy')
- ;
- }
- }
- };
-
- /**
- * Sets the throbber progress indicator.
- */
- Drupal.Ajax.prototype.setProgressIndicatorThrobber = function () {
- var $element = $(this.element);
-
- // Find an existing glyphicon progress indicator.
- var $glyphicon = this.glyphiconStart($element, this.progress.message);
- if ($glyphicon[0]) {
- this.progress.element = $glyphicon.parent();
- this.progress.glyphicon = true;
- return;
- }
-
- // Otherwise, add a glyphicon throbber after the element.
- if (!this.progress.element) {
- this.progress.element = $(Drupal.theme('ajaxThrobber'));
- }
- if (this.progress.message) {
- this.progress.element.after('' + this.progress.message + '
');
- }
-
- // If element is an input DOM element type (not :input), append after.
- if ($element.is('input')) {
- $element.after(this.progress.element);
- }
- // Otherwise append the throbber inside the element.
- else {
- $element.append(this.progress.element);
- }
- };
-
-
- /**
- * Handler for the form redirection completion.
- *
- * @param {Array.} response
- * @param {number} status
- */
- Drupal.Ajax.prototype.success = function (response, status) {
- if (this.progress.element) {
-
- // Stop a glyphicon throbber.
- if (this.progress.glyphicon) {
- this.glyphiconStop(this.progress.element);
- }
- // Remove the progress element.
- else {
- this.progress.element.remove();
- }
-
- // Remove any message set.
- this.progress.element.parent().find('.message').remove();
- }
-
- // --------------------------------------------------------
- // Everything below is from core/misc/ajax.js.
- // --------------------------------------------------------
-
- if (this.progress.object) {
- this.progress.object.stopMonitoring();
- }
- $(this.element).prop('disabled', false);
-
- // Save element's ancestors tree so if the element is removed from the dom
- // we can try to refocus one of its parents. Using addBack reverse the
- // result array, meaning that index 0 is the highest parent in the hierarchy
- // in this situation it is usually a
- {% endfor %}
-
-{% endif %}
diff --git a/themes/bootstrap/templates/bootstrap/item-list--dropdown.html.twig b/themes/bootstrap/templates/bootstrap/item-list--dropdown.html.twig
deleted file mode 100644
index a9cee12..0000000
--- a/themes/bootstrap/templates/bootstrap/item-list--dropdown.html.twig
+++ /dev/null
@@ -1,42 +0,0 @@
-{#
-/**
- * @file
- * Theme override for an item list.
- *
- * Available variables:
- * - alignment: (optional) The alignment of the dropdown menu.
- * - items: A list of items. Each item contains:
- * - attributes: HTML attributes to be applied to each list item.
- * - value: The content of the list element.
- * - title: The title of the list.
- * - list_type: The tag for list element ("ul" or "ol").
- * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
- * - attributes: HTML attributes to be applied to the list.
- * - empty: A message to display when there are no items. Allowed value is a
- * string or render array.
- * - context: A list of contextual data associated with the list. May contain:
- * - list_style: The custom list style.
- *
- * @ingroup templates
- *
- * @see template_preprocess_item_list()
- */
-#}
-{%
- set classes = [
- 'dropdown-menu',
- alignment == 'left' ? 'dropdown-menu-left',
- alignment == 'right' ? 'dropdown-menu-right',
- ]
-%}
-{% if items or empty -%}
- {%- if items -%}
- <{{ list_type }}{{ attributes.addClass(classes) }} role="menu">
- {%- for item in items -%}
- {{ item.value }}
- {%- endfor -%}
-
- {%- else -%}
- {{- empty -}}
- {%- endif -%}
-{%- endif %}
diff --git a/themes/bootstrap/templates/field/field-multiple-value-form.html.twig b/themes/bootstrap/templates/field/field-multiple-value-form.html.twig
deleted file mode 100644
index 5c645f7..0000000
--- a/themes/bootstrap/templates/field/field-multiple-value-form.html.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for an individual form element.
- *
- * Available variables for all fields:
- * - multiple: Whether there are multiple instances of the field.
- *
- * Available variables for single cardinality fields:
- * - elements: Form elements to be rendered.
- *
- * Available variables when there are multiple fields.
- * - table: Table of field items.
- * - description: Description text for the form element.
- * - button: "Add another item" button.
- *
- * @ingroup templates
- *
- * @see template_preprocess_field_multiple_value_form()
- */
-#}
-{% if multiple %}
-
-{% else %}
- {% for element in elements %}
- {{ element }}
- {% endfor %}
-{% endif %}
diff --git a/themes/bootstrap/templates/field/field.html.twig b/themes/bootstrap/templates/field/field.html.twig
deleted file mode 100644
index 10e842f..0000000
--- a/themes/bootstrap/templates/field/field.html.twig
+++ /dev/null
@@ -1,81 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a field.
- *
- * To override output, copy the "field.html.twig" from the templates directory
- * to your theme's directory and customize it, just like customizing other
- * Drupal templates such as page.html.twig or node.html.twig.
- *
- * Instead of overriding the theming for all fields, you can also just override
- * theming for a subset of fields using
- * @link themeable Theme hook suggestions. @endlink For example,
- * here are some theme hook suggestions that can be used for a field_foo field
- * on an article node type:
- * - field--node--field-foo--article.html.twig
- * - field--node--field-foo.html.twig
- * - field--node--article.html.twig
- * - field--field-foo.html.twig
- * - field--text-with-summary.html.twig
- * - field.html.twig
- *
- * Available variables:
- * - attributes: HTML attributes for the containing element.
- * - label_hidden: Whether to show the field label or not.
- * - title_attributes: HTML attributes for the title.
- * - label: The label for the field.
- * - multiple: TRUE if a field can contain multiple items.
- * - items: List of all the field items. Each item contains:
- * - attributes: List of HTML attributes for each item.
- * - content: The field item's content.
- * - entity_type: The entity type to which the field belongs.
- * - field_name: The name of the field.
- * - field_type: The type of the field.
- * - label_display: The display settings for the label.
- *
- * @ingroup templates
- *
- * @see template_preprocess_field()
- */
-#}
-{%
- set classes = [
- 'field',
- 'field--name-' ~ field_name|clean_class,
- 'field--type-' ~ field_type|clean_class,
- 'field--label-' ~ label_display,
- ]
-%}
-{%
- set title_classes = [
- 'field--label',
- label_display == 'visually_hidden' ? 'sr-only',
- ]
-%}
-
-{% if label_hidden %}
- {% if multiple %}
-
- {% for item in items %}
- {{ item.content }}
- {% endfor %}
-
- {% else %}
- {% for item in items %}
- {{ item.content }}
- {% endfor %}
- {% endif %}
-{% else %}
-
- {{ label }}
- {% if multiple %}
-
- {% endif %}
- {% for item in items %}
-
{{ item.content }}
- {% if icon_only %}
- {{ icon }}
-
- {{ link }}
- {{ file_size }}
-
- {% else %}
- {% if icon_position == 'after' %}
- {{ link }} {{ file_size }} {{ icon }}
- {% else %}
- {{ icon }} {{ link }} {{ file_size }}
- {% endif %}
- {% endif %}
-
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/file/file-upload-help.html.twig b/themes/bootstrap/templates/file/file-upload-help.html.twig
deleted file mode 100644
index daee893..0000000
--- a/themes/bootstrap/templates/file/file-upload-help.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-/**
- * @file
- * Theme override to display help text for file fields.
- *
- * Available variables:
- * - description: The normal description for this field, specified by the user.
- * - descriptions: Lines of help text for uploading a file.
- * - popover: Markup to display the descriptions as a popover instead.
- *
- * @ingroup templates
- *
- * @see template_preprocess_file_upload_help()
- */
-#}
-{% if description %}
- {{ description }}
-
- {{ data.preview }}
-
-
- {# Render widget data without the image preview that was output already. #}
- {{ data|without('preview') }}
-
-
-{% else %}
-
- {{ data }}
-
-{% endif %}
diff --git a/themes/bootstrap/templates/filter/filter-tips.html.twig b/themes/bootstrap/templates/filter/filter-tips.html.twig
deleted file mode 100644
index 8495b84..0000000
--- a/themes/bootstrap/templates/filter/filter-tips.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a set of filter tips.
- *
- * Available variables:
- * - tips: A pre-constructed list of tips.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\FilterTips::preprocessVariables()
- */
-#}
-{{ tips }}
diff --git a/themes/bootstrap/templates/filter/text-format-wrapper.html.twig b/themes/bootstrap/templates/filter/text-format-wrapper.html.twig
deleted file mode 100644
index 31ee45c..0000000
--- a/themes/bootstrap/templates/filter/text-format-wrapper.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a text format-enabled form element.
- *
- * Available variables:
- * - children: Text format element children.
- * - description: Text format element description.
- * - attributes: HTML attributes for the containing element.
- * - aria_description: Flag for whether or not an ARIA description has been
- * added to the description container.
- *
- * @see template_preprocess_text_format_wrapper()
- */
-#}
-
- {{ children }}
- {% if description %}
- {%
- set classes = [
- 'help-block',
- aria_description ? 'description',
- ]
- %}
-
{{ description }}
- {{ content }}
-
diff --git a/themes/bootstrap/templates/input/datetime-wrapper.html.twig b/themes/bootstrap/templates/input/datetime-wrapper.html.twig
deleted file mode 100644
index 3a392c9..0000000
--- a/themes/bootstrap/templates/input/datetime-wrapper.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation of a datetime form wrapper.
- *
- * Available variables:
- * - content: The form element to be output, usually a datelist, or datetime.
- * - title: The title of the form element.
- * - title_attributes: HTML attributes for the title wrapper.
- * - description: Description text for the form element.
- * - required: An indicator for whether the associated form element is required.
- *
- * @ingroup templates
- *
- * @see template_preprocess_datetime_wrapper()
- */
-#}
-{%
- set title_classes = [
- 'control-label',
- required ? 'form-required',
- ]
-%}
-{% if title %}
- {{ title }}
-{% endif %}
-{{ content }}
-{% if description %}
- {{ description }}
-{% endif %}
diff --git a/themes/bootstrap/templates/input/form-element-label.html.twig b/themes/bootstrap/templates/input/form-element-label.html.twig
deleted file mode 100644
index bc82bf5..0000000
--- a/themes/bootstrap/templates/input/form-element-label.html.twig
+++ /dev/null
@@ -1,48 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a form element label.
- *
- * Available variables:
- * - element: an input element.
- * - title: The label's text.
- * - title_display: Elements title_display setting.
- * - description: element description.
- * - required: An indicator for whether the associated form element is required.
- * - is_checkbox: Whether the label is outputted in checkbox context.
- * - is_radio: Whether the label is outputted in radio button context.
- * - attributes: A list of HTML attributes for the label.
- *
- * @ingroup templates
- *
- * @see template_preprocess_form_element_label()
- */
-#}
-{%-
- set classes = [
- 'control-label',
- title_display == 'after' ? 'option',
- title_display == 'invisible' and not (is_checkbox or is_radio) ? 'sr-only',
- required ? 'js-form-required',
- required ? 'form-required',
- ]
--%}
-{% if title is not empty and title_display == 'invisible' and (is_checkbox or is_radio) -%}
- {#
- Clear but preserve label text as attribute (e.g. for screen readers) for
- checkboxes/radio buttons when it actually should be invisible.
- #}
- {%- set attributes = attributes.setAttribute('title', title) -%}
- {%- set title = null -%}
-{%- endif -%}
-{#
-Labels for single checkboxes/radios contain the element itself and thus have
-always to be rendered regardless of whether they have a title or not.
-#}
-{%- if title is not empty or is_checkbox or is_radio -%}
- {{ element }}{{ title }}
- {%- if description -%}
- {{ description }}
- {%- endif -%}
-
-{%- endif -%}
diff --git a/themes/bootstrap/templates/input/form-element.html.twig b/themes/bootstrap/templates/input/form-element.html.twig
deleted file mode 100644
index 7d1d2e8..0000000
--- a/themes/bootstrap/templates/input/form-element.html.twig
+++ /dev/null
@@ -1,101 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a form element.
- *
- * Available variables:
- * - attributes: HTML attributes for the containing element.
- * - errors: (optional) Any inline error messages to display for this form
- * element; may not be set.
- * - has_error: (optional) Flag indicating whether to add the "has_error"
- * Bootstrap class for this form element.
- * - required: The required marker, or empty if the associated form element is
- * not required.
- * - type: The type of the element.
- * - name: The name of the element.
- * - label: A rendered label element.
- * - label_display: Label display setting. It can have these values:
- * - before: The label is output before the element. This is the default.
- * The label includes the #title and the required marker, if #required.
- * - after: The label is output after the element. For example, this is used
- * for radio and checkbox #type elements. If the #title is empty but the
- * field is #required, the label will contain only the required marker.
- * - invisible: Labels are critical for screen readers to enable them to
- * properly navigate through forms but can be visually distracting. This
- * property hides the label for everyone except screen readers.
- * - attribute: Set the title attribute on the element to create a tooltip but
- * output no label element. This is supported only for checkboxes and radios
- * in \Drupal\Core\Render\Element\CompositeFormElementTrait::preRenderCompositeFormElement().
- * It is used where a visual label is not needed, such as a table of
- * checkboxes where the row and column provide the context. The tooltip will
- * include the title and required marker.
- * - description: (optional) A list of description properties containing:
- * - content: A description of the form element, may not be set.
- * - attributes: (optional) A list of HTML attributes to apply to the
- * description content wrapper. Will only be set when description is set.
- * - description_display: Description display setting. It can have these values:
- * - before: The description is output before the element.
- * - after: The description is output after the element. This is the default
- * value.
- * - invisible: The description is output after the element, hidden visually
- * but available to screen readers.
- * - disabled: True if the element is disabled.
- * - title_display: Title display setting.
- *
- * @ingroup templates
- *
- * @see template_preprocess_form_element()
- */
-#}
-{%
- set classes = [
- 'form-item',
- 'js-form-item',
- 'form-type-' ~ type|clean_class,
- 'js-form-type-' ~ type|clean_class,
- 'form-item-' ~ name|clean_class,
- 'js-form-item-' ~ name|clean_class,
- title_display not in ['after', 'before'] ? 'form-no-label',
- disabled == 'disabled' ? 'form-disabled',
- is_form_group ? 'form-group',
- is_radio ? 'radio',
- is_checkbox ? 'checkbox',
- is_autocomplete ? 'form-autocomplete',
- has_error ? 'error has-error'
- ]
-%}{%
- set description_classes = [
- 'description',
- 'help-block',
- description_display == 'invisible' ? 'visually-hidden',
- ]
-%}
-
- {% if label_display in ['before', 'invisible'] %}
- {{ label }}
- {% endif %}
-
- {% if description_display == 'before' and description.content %}
-
- {{ description.content }}
-
- {% endif %}
-
- {{ children }}
-
- {% if label_display == 'after' %}
- {{ label }}
- {% endif %}
-
- {% if errors %}
-
- {{ errors }}
-
- {% endif %}
-
- {% if description_display in ['after', 'invisible'] and description.content %}
-
- {{ description.content }}
-
- {% endif %}
-
diff --git a/themes/bootstrap/templates/input/input--button--split.html.twig b/themes/bootstrap/templates/input/input--button--split.html.twig
deleted file mode 100644
index c7d6f01..0000000
--- a/themes/bootstrap/templates/input/input--button--split.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "input--button.html.twig" %}
-{#
-/**
- * @file
- * Theme suggestion for "button__split" input form element.
- *
- * Available variables:
- * - attributes: A list of HTML attributes for the input element.
- * - children: Optional additional rendered elements.
- * - icon: An icon.
- * - icon_only: Flag to display only the icon and not the label.
- * - icon_position: Where an icon should be displayed.
- * - label: button label.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- * - type: The type of input.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\InputButton
- * @see \Drupal\bootstrap\Plugin\Preprocess\Input
- * @see template_preprocess_input()
- */
-#}
-{% spaceless %}
- {%
- set classes = [
- 'btn',
- type == 'submit' ? 'js-form-submit',
- icon and icon_position and not icon_only ? 'icon-' ~ icon_position,
- ]
- %}
- {% block input %}
- {% if icon_only %}
-
- {{ label }}
- {{ icon }}
-
- {% else %}
- {% if icon_position == 'after' %}
- {{ label }}{{ icon }}{{ children }}
- {% else %}
- {{ icon }}{{ label }}{{ children }}
- {% endif %}
- {% endif %}
- {%
- set classes = [
- 'btn',
- 'dropdown-toggle',
- ]
- %}
-
- {{ 'Toggle Dropdown'|t }}
-
- {{ children }}
- {% endblock %}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/input--button.html.twig b/themes/bootstrap/templates/input/input--button.html.twig
deleted file mode 100644
index 7166b1a..0000000
--- a/themes/bootstrap/templates/input/input--button.html.twig
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends "input.html.twig" %}
-{#
-/**
- * @file
- * Theme suggestion for "button" input form element.
- *
- * Available variables:
- * - attributes: A list of HTML attributes for the input element.
- * - children: Optional additional rendered elements.
- * - icon: An icon.
- * - icon_only: Flag to display only the icon and not the label.
- * - icon_position: Where an icon should be displayed.
- * - label: button label.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- * - type: The type of input.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\InputButton
- * @see \Drupal\bootstrap\Plugin\Preprocess\Input
- * @see template_preprocess_input()
- */
-#}
-{% spaceless %}
- {%
- set classes = [
- 'btn',
- type == 'submit' ? 'js-form-submit',
- icon and icon_position and not icon_only ? 'icon-' ~ icon_position,
- ]
- %}
- {% block input %}
- {% if icon and icon_only %}
-
- {{ label }}
- {{ icon }}
-
- {% else %}
- {% if icon_position == 'after' %}
- {{ label }}{{ icon }}{{ children }}
- {% else %}
- {{ icon }}{{ label }}{{ children }}
- {% endif %}
- {% endif %}
- {{ children }}
- {% endblock %}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/input--form-control.html.twig b/themes/bootstrap/templates/input/input--form-control.html.twig
deleted file mode 100644
index 5694480..0000000
--- a/themes/bootstrap/templates/input/input--form-control.html.twig
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "input.html.twig" %}
-{#
-/**
- * @file
- * Default theme implementation for an 'input__textfield' #type form element.
- *
- * Available variables:
- * - attributes: A list of HTML attributes for the input element.
- * - children: Optional additional rendered elements.
- * - icon: An icon.
- * - input_group: Flag to display as an input group.
- * - icon_position: Where an icon should be displayed.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- * - type: The type of input.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\Input
- * @see template_preprocess_input()
- */
-#}
-{% spaceless %}
- {%
- set classes = [
- 'form-control',
- ]
- %}
- {% block input %}
-
- {% endif %}
-
- {% if prefix %}
- {{ prefix }}
- {% endif %}
-
- {% block input %}
-
- {% endif %}
-
- {{ children }}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/select.html.twig b/themes/bootstrap/templates/input/select.html.twig
deleted file mode 100644
index 8d75f0e..0000000
--- a/themes/bootstrap/templates/input/select.html.twig
+++ /dev/null
@@ -1,61 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a select element.
- *
- * Available variables:
- * - attributes: HTML attributes for the select tag.
- * - input_group: Flag to display as an input group.
- * - options: The option element children.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- *
- * @ingroup templates
- *
- * @see template_preprocess_select()
- */
-#}
-{% spaceless %}
- {% if input_group %}
-
- {% endif %}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/textarea.html.twig b/themes/bootstrap/templates/input/textarea.html.twig
deleted file mode 100644
index 3b8d5c8..0000000
--- a/themes/bootstrap/templates/input/textarea.html.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{#
-/**
- * @file
- * Bootstrap theme implementation for a 'textarea' #type form element.
- *
- * Available variables
- * - wrapper_attributes: A list of HTML attributes for the wrapper element.
- * - attributes: A list of HTML attributes for the textarea element.
- * - resizable: An indicator for whether the textarea is resizable.
- * - required: An indicator for whether the textarea is required.
- * - value: The textarea content.
- *
- * @ingroup templates
- *
- * @see template_preprocess_textarea()
- */
-#}
-{%
- set classes = [
- 'form-textarea',
- 'form-control',
- resizable ? 'resize-' ~ resizable,
- required ? 'required',
- ]
-%}
-
- {{ value }}
-
diff --git a/themes/bootstrap/templates/menu/menu--account.html.twig b/themes/bootstrap/templates/menu/menu--account.html.twig
deleted file mode 100644
index d66d5cb..0000000
--- a/themes/bootstrap/templates/menu/menu--account.html.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a menu.
- *
- * Available variables:
- * - menu_name: The machine name of the menu.
- * - items: A nested list of menu items. Each menu item contains:
- * - attributes: HTML attributes for the menu item.
- * - below: The menu item child items.
- * - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
- * - localized_options: Menu link localized options.
- *
- * @ingroup templates
- */
-#}
-{% import _self as menus %}
-
-{#
- We call a macro which calls itself to render the full tree.
- @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, attributes, 0) }}
-
-{% macro menu_links(items, attributes, menu_level) %}
- {% import _self as menus %}
- {% if items %}
- {% if menu_level == 0 %}
-
- {% else %}
-
- {% endif %}
- {% for item in items %}
- {%
- set item_classes = [
- item.is_expanded? 'expanded',
- item.is_expanded and menu_level == 0 ? 'dropdown',
- item.in_active_trail ? 'active',
- ]
- %}
- {% if menu_level == 0 and item.is_expanded %}
-
- {{ item.title }}
- {% else %}
-
- {{ link(item.title, item.url) }}
- {% endif %}
- {% if item.below %}
- {{ menus.menu_links(item.below, attributes.removeClass('nav', 'navbar-nav', 'navbar-right'), menu_level + 1) }}
- {% endif %}
-
- {% endfor %}
-
- {% endif %}
-{% endmacro %}
diff --git a/themes/bootstrap/templates/menu/menu--main.html.twig b/themes/bootstrap/templates/menu/menu--main.html.twig
deleted file mode 100644
index 20f5a85..0000000
--- a/themes/bootstrap/templates/menu/menu--main.html.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a menu.
- *
- * Available variables:
- * - menu_name: The machine name of the menu.
- * - items: A nested list of menu items. Each menu item contains:
- * - attributes: HTML attributes for the menu item.
- * - below: The menu item child items.
- * - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
- * - localized_options: Menu link localized options.
- *
- * @ingroup templates
- */
-#}
-{% import _self as menus %}
-
-{#
- We call a macro which calls itself to render the full tree.
- @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, attributes, 0) }}
-
-{% macro menu_links(items, attributes, menu_level) %}
- {% import _self as menus %}
- {% if items %}
- {% if menu_level == 0 %}
-
- {% else %}
-
- {% endif %}
- {% for item in items %}
- {%
- set item_classes = [
- item.is_expanded? 'expanded',
- item.is_expanded and menu_level == 0 ? 'dropdown',
- item.in_active_trail ? 'active',
- ]
- %}
- {% if menu_level == 0 and item.is_expanded %}
-
- {{ item.title }}
- {% else %}
-
- {{ link(item.title, item.url) }}
- {% endif %}
- {% if item.below %}
- {{ menus.menu_links(item.below, attributes.removeClass('nav', 'navbar-nav'), menu_level + 1) }}
- {% endif %}
-
- {% endfor %}
-
- {% endif %}
-{% endmacro %}
diff --git a/themes/bootstrap/templates/menu/menu-local-task.html.twig b/themes/bootstrap/templates/menu/menu-local-task.html.twig
deleted file mode 100644
index f9b4516..0000000
--- a/themes/bootstrap/templates/menu/menu-local-task.html.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a local task link.
- *
- * Available variables:
- * - attributes: HTML attributes for the wrapper element.
- * - is_active: Whether the task item is an active tab.
- * - link: A rendered link element.
- *
- * Note: This template renders the content for each task item in
- * menu-local-tasks.html.twig.
- *
- * @ingroup templates
- *
- * @see template_preprocess_menu_local_task()
- */
-#}
-{% set classes = [
- is_active ? 'active',
-] %}
-{{ link }}
diff --git a/themes/bootstrap/templates/menu/menu-local-tasks.html.twig b/themes/bootstrap/templates/menu/menu-local-tasks.html.twig
deleted file mode 100644
index e2c9bdc..0000000
--- a/themes/bootstrap/templates/menu/menu-local-tasks.html.twig
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display primary and secondary local tasks.
- *
- * Available variables:
- * - primary: HTML list items representing primary tasks.
- * - secondary: HTML list items representing primary tasks.
- *
- * Each item in these variables (primary and secondary) can be individually
- * themed in menu-local-task.html.twig.
- *
- * @ingroup templates
- *
- * @see template_preprocess_menu_local_tasks()
- */
-#}
-{% if primary %}
- {{ 'Primary tabs'|t }}
-
-{% endif %}
-{% if secondary %}
- {{ 'Secondary tabs'|t }}
-
-{% endif %}
diff --git a/themes/bootstrap/templates/menu/menu.html.twig b/themes/bootstrap/templates/menu/menu.html.twig
deleted file mode 100644
index cbc5be8..0000000
--- a/themes/bootstrap/templates/menu/menu.html.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a menu.
- *
- * Available variables:
- * - menu_name: The machine name of the menu.
- * - items: A nested list of menu items. Each menu item contains:
- * - attributes: HTML attributes for the menu item.
- * - below: The menu item child items.
- * - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
- * - localized_options: Menu link localized options.
- *
- * @ingroup templates
- */
-#}
-{% import _self as menus %}
-
-{#
- We call a macro which calls itself to render the full tree.
- @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, attributes, 0) }}
-
-{% macro menu_links(items, attributes, menu_level) %}
- {% import _self as menus %}
- {% if items %}
- {% if menu_level == 0 %}
-
- {% else %}
-
- {% endif %}
- {% for item in items %}
- {%
- set item_classes = [
- item.is_expanded? 'expanded',
- item.is_expanded and menu_level == 0 ? 'dropdown',
- item.in_active_trail ? 'active',
- ]
- %}
- {% if menu_level == 0 and item.is_expanded %}
-
- {{ item.title }}
- {% else %}
-
- {{ link(item.title, item.url) }}
- {% endif %}
- {% if item.below %}
- {{ menus.menu_links(item.below, attributes.removeClass('nav'), menu_level + 1) }}
- {% endif %}
-
- {% endfor %}
-
- {% endif %}
-{% endmacro %}
diff --git a/themes/bootstrap/templates/node/node.html.twig b/themes/bootstrap/templates/node/node.html.twig
deleted file mode 100644
index b39e178..0000000
--- a/themes/bootstrap/templates/node/node.html.twig
+++ /dev/null
@@ -1,102 +0,0 @@
-{#
-/**
- * @file
- * Theme override to display a node.
- *
- * Available variables:
- * - node: The node entity with limited access to object properties and methods.
- Only "getter" methods (method names starting with "get", "has", or "is")
- and a few common methods such as "id" and "label" are available. Calling
- other methods (such as node.delete) will result in an exception.
- * - label: The title of the node.
- * - content: All node items. Use {{ content }} to print them all,
- * or print a subset such as {{ content.field_example }}. Use
- * {{ content|without('field_example') }} to temporarily suppress the printing
- * of a given child element.
- * - author_picture: The node author user entity, rendered using the "compact"
- * view mode.
- * - metadata: Metadata for this node.
- * - date: Themed creation date field.
- * - author_name: Themed author name field.
- * - url: Direct URL of the current node.
- * - display_submitted: Whether submission information should be displayed.
- * - attributes: HTML attributes for the containing element.
- * The attributes.class element may contain one or more of the following
- * classes:
- * - node: The current template type (also known as a "theming hook").
- * - node--type-[type]: The current node type. For example, if the node is an
- * "Article" it would result in "node--type-article". Note that the machine
- * name will often be in a short form of the human readable label.
- * - node--view-mode-[view_mode]: The View Mode of the node; for example, a
- * teaser would result in: "node--view-mode-teaser", and
- * full: "node--view-mode-full".
- * The following are controlled through the node publishing options.
- * - node--promoted: Appears on nodes promoted to the front page.
- * - node--sticky: Appears on nodes ordered above other non-sticky nodes in
- * teaser listings.
- * - node--unpublished: Appears on unpublished nodes visible only to site
- * admins.
- * - title_attributes: Same as attributes, except applied to the main title
- * tag that appears in the template.
- * - content_attributes: Same as attributes, except applied to the main
- * content tag that appears in the template.
- * - author_attributes: Same as attributes, except applied to the author of
- * the node tag that appears in the template.
- * - title_prefix: Additional output populated by modules, intended to be
- * displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- * displayed after the main title tag that appears in the template.
- * - view_mode: View mode; for example, "teaser" or "full".
- * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'.
- * - page: Flag for the full page state. Will be true if view_mode is 'full'.
- * - readmore: Flag for more state. Will be true if the teaser content of the
- * node cannot hold the main body content.
- * - logged_in: Flag for authenticated user status. Will be true when the
- * current user is a logged-in member.
- * - is_admin: Flag for admin user status. Will be true when the current user
- * is an administrator.
- *
- * @ingroup templates
- *
- * @see template_preprocess_node()
- *
- * @todo Remove the id attribute (or make it a class), because if that gets
- * rendered twice on a page this is invalid CSS for example: two lists
- * in different view modes.
- */
-#}
-{%
- set classes = [
- node.bundle|clean_class,
- node.isPromoted() ? 'is-promoted',
- node.isSticky() ? 'is-sticky',
- not node.isPublished() ? 'is-unpublished',
- view_mode ? view_mode|clean_class,
- 'clearfix',
- ]
-%}
-
-
- {{ title_prefix }}
- {% if not page %}
-
- {{ label }}
-
- {% endif %}
- {{ title_suffix }}
-
- {% if display_submitted %}
-
- {{ author_picture }}
-
- {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
- {{ metadata }}
-
-
- {% endif %}
-
-
- {{ content }}
-
-
-
diff --git a/themes/bootstrap/templates/system/breadcrumb.html.twig b/themes/bootstrap/templates/system/breadcrumb.html.twig
deleted file mode 100644
index b161dcb..0000000
--- a/themes/bootstrap/templates/system/breadcrumb.html.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a breadcrumb trail.
- *
- * Available variables:
- * - breadcrumb: Breadcrumb trail items.
- *
- * @ingroup templates
- */
-#}
-{% if breadcrumb %}
-
- {% for item in breadcrumb %}
-
- {% if item.url %}
- {{ item.text }}
- {% else %}
- {{ item.text }}
- {% endif %}
-
- {% endfor %}
-
-{% endif %}
diff --git a/themes/bootstrap/templates/system/container.html.twig b/themes/bootstrap/templates/system/container.html.twig
deleted file mode 100644
index 915e826..0000000
--- a/themes/bootstrap/templates/system/container.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{#
-/**
- * @file
- * Theme override of a container used to wrap child elements.
- *
- * Used for grouped form items. Can also be used as a theme wrapper for any
- * renderable element, to surround it with a and HTML attributes.
- * See the @link forms_api_reference.html Form API reference @endlink for more
- * information on the #theme_wrappers render array property.
- *
- * Available variables:
- * - attributes: HTML attributes for the containing element.
- * - children: The rendered child elements of the container.
- * - has_parent: A flag to indicate that the container has one or more parent
- * containers.
- *
- * @ingroup templates
- *
- * @see template_preprocess_container()
- */
-#}
-{%
- set classes = [
- not attributes.hasClass('toolbar-menu-administration') ? 'form-group',
- has_parent ? 'js-form-wrapper',
- has_parent ? 'form-wrapper',
- ]
-%}
-
{{ children }}
- {{ head_title|safe_join(' | ') }}
-
-
-
-
-
- {{ 'Skip to main content'|t }}
-
- {{ page_top }}
- {{ page }}
- {{ page_bottom }}
-
-
- - - - - - */ - /* - - general element template - - will be implemented in the next dashboard relase - - this HTML will contain the preview of any single card present inside the dashboard - - - -
-
-
-
- {% endset %}
- {% set text %}
-
-
-
- {% endset %}
-
-
-{% endblock %}
-
-{% block panel %}
-
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/blocks.html.twig b/modules/devel/webprofiler/templates/Collector/blocks.html.twig
deleted file mode 100644
index 4146f27..0000000
--- a/modules/devel/webprofiler/templates/Collector/blocks.html.twig
+++ /dev/null
@@ -1,113 +0,0 @@
-{% block toolbar %}
- {% set icon %}
-
- 
-
-