Commit 0d84b918 authored by Dries's avatar Dries

- Patch #296197 by Gabor: made the language order use drag-n-drop instead of...

- Patch #296197 by Gabor: made the language order use drag-n-drop instead of weight drop-down menus.
parent 4cbb7b75
...@@ -15,6 +15,7 @@ Drupal 7.0, xxxx-xx-xx (development version) ...@@ -15,6 +15,7 @@ Drupal 7.0, xxxx-xx-xx (development version)
hashing and authentication schemes. hashing and authentication schemes.
- Usability: - Usability:
* Implemented drag-and-drop positioning for input format listings. * Implemented drag-and-drop positioning for input format listings.
* Implemented drag-and-drop positioning for language listing.
* Implemented drag-and-drop positioning for poll options. * Implemented drag-and-drop positioning for poll options.
* Provided descriptions for user permissions. * Provided descriptions for user permissions.
* Removed comment controls for users. * Removed comment controls for users.
......
...@@ -44,7 +44,8 @@ function locale_languages_overview_form() { ...@@ -44,7 +44,8 @@ function locale_languages_overview_form() {
} }
$form['weight'][$langcode] = array( $form['weight'][$langcode] = array(
'#type' => 'weight', '#type' => 'weight',
'#default_value' => $language->weight '#default_value' => $language->weight,
'#attributes' => array('class' => 'language-order-weight'),
); );
$form['name'][$langcode] = array('#markup' => check_plain($language->name)); $form['name'][$langcode] = array('#markup' => check_plain($language->name));
$form['native'][$langcode] = array('#markup' => check_plain($language->native)); $form['native'][$langcode] = array('#markup' => check_plain($language->native));
...@@ -79,21 +80,26 @@ function theme_locale_languages_overview_form($form) { ...@@ -79,21 +80,26 @@ function theme_locale_languages_overview_form($form) {
$form['enabled'][$key]['#attributes']['disabled'] = 'disabled'; $form['enabled'][$key]['#attributes']['disabled'] = 'disabled';
} }
$rows[] = array( $rows[] = array(
array('data' => drupal_render($form['enabled'][$key]), 'align' => 'center'), 'data' => array(
check_plain($key),
'<strong>' . drupal_render($form['name'][$key]) . '</strong>', '<strong>' . drupal_render($form['name'][$key]) . '</strong>',
drupal_render($form['native'][$key]), drupal_render($form['native'][$key]),
check_plain($key),
drupal_render($form['direction'][$key]), drupal_render($form['direction'][$key]),
array('data' => drupal_render($form['enabled'][$key]), 'align' => 'center'),
drupal_render($form['site_default'][$key]), drupal_render($form['site_default'][$key]),
drupal_render($form['weight'][$key]), drupal_render($form['weight'][$key]),
l(t('edit'), 'admin/settings/language/edit/' . $key) . (($key != 'en' && $key != $default->language) ? ' ' . l(t('delete'), 'admin/settings/language/delete/' . $key) : '') l(t('edit'), 'admin/settings/language/edit/' . $key) . (($key != 'en' && $key != $default->language) ? ' ' . l(t('delete'), 'admin/settings/language/delete/' . $key) : '')
),
'class' => 'draggable'
); );
} }
} }
$header = array(array('data' => t('Enabled')), array('data' => t('Code')), array('data' => t('English name')), array('data' => t('Native name')), array('data' => t('Direction')), array('data' => t('Default')), array('data' => t('Weight')), array('data' => t('Operations'))); $header = array(array('data' => t('English name')), array('data' => t('Native name')), array('data' => t('Code')), array('data' => t('Direction')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Weight')), array('data' => t('Operations')));
$output = theme('table', $header, $rows); $output = theme('table', $header, $rows, array('id' => 'language-order'));
$output .= drupal_render($form); $output .= drupal_render($form);
drupal_add_tabledrag('language-order', 'order', 'sibling', 'language-order-weight');
return $output; return $output;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment