Skip to content
Snippets Groups Projects
Commit c6dc0eda authored by Jelle Sebreghts's avatar Jelle Sebreghts
Browse files

update to breakpoints in core

parent a638d5ba
Branches core_ui
No related tags found
No related merge requests found
......@@ -25,16 +25,6 @@ function breakpoint_ui_breakpoint_page_edit($breakpoint) {
return entity_get_form($breakpoint);
}
/**
* Page callback: Presents the breakpoint editing form.
*
* @see breakpoint_ui_menu()
*/
function breakpoint_ui_breakpoint_page_duplicate($breakpoint) {
drupal_set_title(t('<em>Duplicate breakpoint</em> @label', array('@label' => $breakpoint->label())), PASS_THROUGH);
return entity_get_form($breakpoint->duplicate());
}
/**
* Page callback: Provides the new breakpoint addition form.
*
......@@ -81,9 +71,6 @@ function breakpoint_ui_breakpoint_action_confirm_submit($form, &$form_state) {
case 'disable':
$verb = $action . 'd';
break;
case 'override':
$verb = 'overridden';
break;
case 'revert':
$verb = 'reverted';
break;
......
......@@ -25,16 +25,6 @@ function breakpoint_ui_breakpoint_group_page_edit($breakpoint_group) {
return entity_get_form($breakpoint_group);
}
/**
* Page callback: Presents the breakpoint group editing form for duplicate.
*
* @see breakpoint_ui_menu()
*/
function breakpoint_ui_breakpoint_group_page_duplicate($breakpoint_group) {
drupal_set_title(t('<em>Duplicate breakpoint group</em> @label', array('@label' => $breakpoint_group->label())), PASS_THROUGH);
return entity_get_form($breakpoint_group->duplicate());
}
/**
* Page callback: Provides the new breakpoint group addition form.
*
......@@ -80,9 +70,6 @@ function breakpoint_ui_breakpoint_group_action_confirm_submit($form, &$form_stat
case 'delete':
$verb = 'deleted';
break;
case 'override':
$verb = 'overridden';
break;
case 'revert':
$verb = 'reverted';
break;
......
......@@ -55,14 +55,6 @@ function breakpoint_ui_menu() {
'access arguments' => array('administer breakpoints'),
'file' => 'breakpoint_ui.breakpoint.admin.inc',
);
$items['admin/config/media/breakpoint/breakpoint/%breakpoint/duplicate'] = array(
'title' => 'Duplicate breakpoint',
'page callback' => 'breakpoint_ui_breakpoint_page_duplicate',
'page arguments' => array(5),
'access callback' => 'user_access',
'access arguments' => array('administer breakpoints'),
'file' => 'breakpoint_ui.breakpoint.admin.inc',
);
$items['admin/config/media/breakpoint/breakpoint/%breakpoint/%'] = array(
'title' => 'Delete',
'page callback' => 'drupal_get_form',
......@@ -99,14 +91,6 @@ function breakpoint_ui_menu() {
'access arguments' => array('administer breakpoints'),
'file' => 'breakpoint_ui.breakpoint_group.admin.inc',
);
$items['admin/config/media/breakpoint/breakpoint_group/%breakpoint_group/duplicate'] = array(
'title' => 'Duplicate breakpoint group',
'page callback' => 'breakpoint_ui_breakpoint_group_page_duplicate',
'page arguments' => array(5),
'access callback' => 'user_access',
'access arguments' => array('administer breakpoints'),
'file' => 'breakpoint_ui.breakpoint_group.admin.inc',
);
$items['admin/config/media/breakpoint/breakpoint_group/%breakpoint_group/%'] = array(
'title' => 'Delete',
'page callback' => 'drupal_get_form',
......@@ -178,7 +162,7 @@ function breakpoint_ui_breakpoint_access (Breakpoint $breakpoint, $action, $acco
return
$action != 'delete' ?
user_access('administer breakpoints', $account) :
user_access('administer breakpoints', $account) && $breakpoint->sourceType === Breakpoint::SOURCE_TYPE_CUSTOM;
user_access('administer breakpoints', $account) && $breakpoint->sourceType === Breakpoint::SOURCE_TYPE_USER_DEFINED;
}
/**
......@@ -194,7 +178,7 @@ function breakpoint_ui_breakpoint_group_access (BreakpointGroup $breakpoint_grou
return
$action != 'delete' ?
user_access('administer breakpoints', $account) :
user_access('administer breakpoints', $account) && $breakpoint_group->sourceType === Breakpoint::SOURCE_TYPE_CUSTOM;
user_access('administer breakpoints', $account) && $breakpoint_group->sourceType === Breakpoint::SOURCE_TYPE_USER_DEFINED;
}
/**
......@@ -231,7 +215,6 @@ function breakpoint_ui_entity_info_alter(&$entity_info) {
//BreakpointGroup
$entity_info['breakpoint_group']['form controller class']['default'] = 'Drupal\breakpoint_ui\BreakpointGroupFormController';
$entity_info['breakpoint_group']['form controller class']['duplicate'] = 'Drupal\breakpoint_ui\BreakpointGroupFormController';
$entity_info['breakpoint_group']['list controller class'] = 'Drupal\breakpoint_ui\BreakpointGroupListController';
$entity_info['breakpoint_group']['list path'] = 'admin/config/media/breakpoint/breakpoint_group';
$entity_info['breakpoint_group']['uri callback'] = 'breakpoint_group_uri';
......
......@@ -46,7 +46,7 @@ class BreakpointFormController extends EntityFormController {
'#default_value' => $breakpoint->mediaQuery,
'#description' => t("Media query without '@media'. Example: '(min-width: 320px)'."),
'#required' => TRUE,
'#disabled' => !$breakpoint->isEditable(),
'#disabled' => $breakpoint->sourceType !== Breakpoint::SOURCE_TYPE_USER_DEFINED,
);
$multipliers = drupal_map_assoc(config('breakpoint')->get('multipliers'));
......@@ -92,7 +92,7 @@ class BreakpointFormController extends EntityFormController {
if (!isset($breakpoint->id)) {
// Check for duplicates if user adds a new breakpoint.
// Use $form_state['values']['label'] because $breakpoint->label is empty.
$name = Breakpoint::SOURCE_TYPE_CUSTOM . '.user.' . $form_state['values']['label'];
$name = Breakpoint::SOURCE_TYPE_USER_DEFINED . '.user.' . $form_state['values']['label'];
if (entity_load('breakpoint', $name)) {
form_set_error('label', t('The breakpoint label %label is already in use.', array('%label' => $form_state['values']['label'])));
}
......
......@@ -97,7 +97,7 @@ class BreakpointGroupFormController extends EntityFormController {
'#parents' => array('breakpoints', $key, 'mediaQuery'),
'#required' => TRUE,
'#size' => 60,
'#disabled' => !$breakpoint->isEditable(),
'#disabled' => $breakpoint->sourceType !== Breakpoint::SOURCE_TYPE_USER_DEFINED,
);
$form['breakpoint_fieldset']['breakpoints'][$key]['multipliers'] = array(
'#type' => 'checkboxes',
......@@ -105,12 +105,12 @@ class BreakpointGroupFormController extends EntityFormController {
'#options' => $multipliers,
'#parents' => array('breakpoints', $key, 'multipliers'),
);
if ($breakpoint_group->isEditable()) {
if ($breakpoint->sourceType === Breakpoint::SOURCE_TYPE_USER_DEFINED) {
$form['breakpoint_fieldset']['breakpoints'][$key]['remove'] = array(
'#type' => 'submit',
'#value' => t('Remove'),
'#name' => 'breakpoint_remove_' . $weight,
'#access' => $breakpoint->sourceType === Breakpoint::SOURCE_TYPE_CUSTOM,
'#access' => $breakpoint->sourceType === Breakpoint::SOURCE_TYPE_USER_DEFINED,
'#submit' => array(
array($this, 'removeBreakpointSubmit'),
),
......@@ -141,12 +141,12 @@ class BreakpointGroupFormController extends EntityFormController {
);
// Hide remove column for read only groups.
if (!$breakpoint_group->isEditable()) {
if ($breakpoint->sourceType !== Breakpoint::SOURCE_TYPE_USER_DEFINED) {
unset($form['breakpoint_fieldset']['breakpoints']['#header']['remove']);
}
// Show add another breakpoint if the group isn't read only.
if ($breakpoint_group->isEditable()) {
if ($breakpoint->sourceType === Breakpoint::SOURCE_TYPE_USER_DEFINED) {
$options = array_diff_key(breakpoint_labels(), $breakpoint_group->breakpoints);
if (!empty($options)) {
......@@ -207,7 +207,7 @@ class BreakpointGroupFormController extends EntityFormController {
$breakpoints = $form_state['values']['breakpoints'];
foreach ($breakpoints as $breakpoint_id => $breakpoint) {
// Check if the user can edit the media query.
if ($breakpoint_group->breakpoints[$breakpoint_id]->sourceType == Breakpoint::SOURCE_TYPE_CUSTOM) {
if ($breakpoint_group->breakpoints[$breakpoint_id]->sourceType == Breakpoint::SOURCE_TYPE_USER_DEFINED) {
try {
Breakpoint::isValidMediaQuery($breakpoints[$breakpoint_id]['mediaQuery']);
}
......
......@@ -41,33 +41,9 @@ class BreakpointGroupListController extends ConfigEntityListController {
*/
public function getOperations(EntityInterface $entity) {
$operations = parent::getOperations($entity);
$uri = $entity->uri();
$operations['duplicate'] = array(
'title' => t('Duplicate'),
'href' => $uri['path'] . '/duplicate',
'options' => $uri['options'],
'weight' => 15,
);
// Theme and module breakpoint groups can be overridden/reverted.
// Custom breakpoint groups can be deleted.
if ($entity->sourceType !== Breakpoint::SOURCE_TYPE_CUSTOM) {
if ($entity->sourceType !== Breakpoint::SOURCE_TYPE_USER_DEFINED) {
unset($operations['delete']);
if (!$entity->overridden) {
$operations['override'] = array(
'title' => t('Override'),
'href' => $uri['path'] . '/override',
'options' => $uri['options'],
'weight' => 15,
);
}
else {
$operations['revert'] = array(
'title' => t('Revert'),
'href' => $uri['path'] . '/revert',
'options' => $uri['options'],
'weight' => 15,
);
}
}
return $operations;
}
......
......@@ -49,32 +49,9 @@ class BreakpointListController extends ConfigEntityListController {
'options' => $uri['options'],
'weight' => 12,
);
$operations['duplicate'] = array(
'title' => t('Duplicate'),
'href' => $uri['path'] . '/duplicate',
'options' => $uri['options'],
'weight' => 15,
);
// Theme and module breakpoint groups can be overridden/reverted.
// Custom breakpoints can be deleted.
if ($entity->sourceType !== Breakpoint::SOURCE_TYPE_CUSTOM) {
if ($entity->sourceType !== Breakpoint::SOURCE_TYPE_USER_DEFINED) {
unset($operations['delete']);
if (!$entity->overridden) {
$operations['override'] = array(
'title' => t('Override'),
'href' => $uri['path'] . '/override',
'options' => $uri['options'],
'weight' => 15,
);
}
else {
$operations['revert'] = array(
'title' => t('Revert'),
'href' => $uri['path'] . '/revert',
'options' => $uri['options'],
'weight' => 15,
);
}
}
return $operations;
}
......
......@@ -67,7 +67,7 @@ class BreakpointUIBreakpointAdminTest extends BreakpointTestBase {
$edit['mediaQuery'] = '(min-width: 600px)';
$this->drupalPost(NULL, $edit, t('Save'));
$machine_name = Breakpoint::SOURCE_TYPE_CUSTOM . '.user.' . $name;
$machine_name = Breakpoint::SOURCE_TYPE_USER_DEFINED . '.user.' . $name;
// Verify the breakpoint was saved.
$this->assertText(t('Breakpoint @breakpoint saved.', array('@breakpoint' => $label)), t('Breakpoint was saved.'), $group);
$this->assertText($machine_name, t('Breakpoint is displayed in the overview table after it was saved.'), $group);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment