Commit 45e0f774 authored by webchick's avatar webchick

#602522 follow-up by effulgentsia: Fix a couple of straggler missed operation link conversions.

parent 031a6876
...@@ -394,7 +394,9 @@ function image_effect_form($form, &$form_state, $style, $effect) { ...@@ -394,7 +394,9 @@ function image_effect_form($form, &$form_state, $style, $effect) {
'#value' => isset($effect['ieid']) ? t('Update effect') : t('Add effect'), '#value' => isset($effect['ieid']) ? t('Update effect') : t('Add effect'),
); );
$form['buttons']['cancel'] = array( $form['buttons']['cancel'] = array(
'#markup' => l(t('Cancel'), 'admin/config/media/image-styles/edit/' . $style['name']), '#type' => 'link',
'#title' => t('Cancel'),
'#href' => 'admin/config/media/image-styles/edit/' . $style['name'],
); );
return $form; return $form;
......
...@@ -175,7 +175,9 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) { ...@@ -175,7 +175,9 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) {
); );
$form['change_set'] = array( $form['change_set'] = array(
'#markup' => l(t('Change set'), 'admin/config/system/shortcut'), '#type' => 'link',
'#title' => t('Change set'),
'#href' => 'admin/config/system/shortcut',
'#prefix' => '<div class="shortcuts-change-set"> (', '#prefix' => '<div class="shortcuts-change-set"> (',
'#suffix' => ')</div>', '#suffix' => ')</div>',
'#weight' => -99, '#weight' => -99,
......
...@@ -524,7 +524,10 @@ function shortcut_page_build(&$page) { ...@@ -524,7 +524,10 @@ function shortcut_page_build(&$page) {
$link_text = shortcut_set_switch_access() ? t('Add to %shortcut_set shortcuts', array('%shortcut_set' => $shortcut_set->title)) : t('Add to shortcuts'); $link_text = shortcut_set_switch_access() ? t('Add to %shortcut_set shortcuts', array('%shortcut_set' => $shortcut_set->title)) : t('Add to shortcuts');
$page['add_to_shortcuts'] = array( $page['add_to_shortcuts'] = array(
'#prefix' => '<div class="add-to-shortcuts">', '#prefix' => '<div class="add-to-shortcuts">',
'#markup' => l('<span class="icon"></span><span class="text">' . $link_text . '</span>', 'admin/config/system/shortcut/' . $shortcut_set->set_name . '/add-link-inline', array('query' => $query, 'html' => TRUE)), '#type' => 'link',
'#title' => '<span class="icon"></span><span class="text">' . $link_text . '</span>',
'#href' => 'admin/config/system/shortcut/' . $shortcut_set->set_name . '/add-link-inline',
'#options' => array('query' => $query, 'html' => TRUE),
'#suffix' => '</div>', '#suffix' => '</div>',
); );
} }
...@@ -536,7 +539,12 @@ function shortcut_page_build(&$page) { ...@@ -536,7 +539,12 @@ function shortcut_page_build(&$page) {
$shortcut_set = shortcut_current_displayed_set(); $shortcut_set = shortcut_current_displayed_set();
$configure_link = NULL; $configure_link = NULL;
if (shortcut_set_edit_access($shortcut_set)) { if (shortcut_set_edit_access($shortcut_set)) {
$configure_link = array('#markup' => l(t('edit shortcuts'), 'admin/config/system/shortcut/' . $shortcut_set->set_name, array('attributes' => array('id' => 'toolbar-customize')))); $configure_link = array(
'#type' => 'link',
'#title' => t('edit shortcuts'),
'#href' => 'admin/config/system/shortcut/' . $shortcut_set->set_name,
'#options' => array('attributes' => array('id' => 'toolbar-customize')),
);
} }
$drawer = array( $drawer = array(
......
...@@ -319,7 +319,9 @@ function simpletest_result_form($form, &$form_state, $test_id) { ...@@ -319,7 +319,9 @@ function simpletest_result_form($form, &$form_state, $test_id) {
); );
$form['action']['return'] = array( $form['action']['return'] = array(
'#markup' => l(t('Return to list'), 'admin/config/development/testing'), '#type' => 'link',
'#title' => t('Return to list'),
'#href' => 'admin/config/development/testing',
); );
if (is_numeric($test_id)) { if (is_numeric($test_id)) {
......
...@@ -1762,7 +1762,9 @@ function system_date_time_settings() { ...@@ -1762,7 +1762,9 @@ function system_date_time_settings() {
// the system. // the system.
if ($type_info['locked'] == 0) { if ($type_info['locked'] == 0) {
$form['formats']['delete']['date_format_' . $type . '_delete'] = array( $form['formats']['delete']['date_format_' . $type . '_delete'] = array(
'#markup' => l(t('delete'), 'admin/config/regional/date-time/types/' . $type . '/delete'), '#type' => 'link',
'#title' => t('delete'),
'#href' => 'admin/config/regional/date-time/types/' . $type . '/delete',
); );
} }
} }
......
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