diff --git a/includes/theme.inc b/includes/theme.inc index d8bec340357..3461c4a7fe3 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1995,7 +1995,7 @@ function theme_html_tag($variables) { * - title: A descriptive verb for the link, like 'Read more' */ function theme_more_link($variables) { - return ''; + return ''; } /** diff --git a/modules/dashboard/dashboard.css b/modules/dashboard/dashboard.css index 8b26f0e6250..3ddf385a451 100644 --- a/modules/dashboard/dashboard.css +++ b/modules/dashboard/dashboard.css @@ -19,27 +19,13 @@ } #dashboard .dashboard-region .block { - border: #ccc 1px solid; clear: both; } #dashboard div.block h2 { - padding: 3px 9px 3px 19px; float: none; } -#dashboard .dashboard-region div.block h2 { - background: #E0E0D8; -} - -#dashboard div.block div.content { - padding: 10px 5px 5px 5px; -} - -#dashboard div.block div.content ul.menu { - margin-left: 20px; -} - #dashboard #disabled-blocks .block, #dashboard .block-placeholder { background: #e2e1dc; padding: 6px 4px 6px 8px; @@ -122,6 +108,7 @@ #dashboard .ui-sortable .block h2 { background: transparent url(../../misc/draggable.png) no-repeat 0 -35px; + padding: 0 1em; } #dashboard #disabled-blocks .block:hover h2 { @@ -147,12 +134,3 @@ width: 30px; height: 1.6em; } - -/* Recent content block */ -#dashboard #block-node-recent table, -#dashboard #block-node-recent tr { - border: none; -} -#dashboard #block-node-recent .content { - padding: 0; -} diff --git a/modules/node/node.css b/modules/node/node.css index 173d2e52e31..c97d41ed93e 100644 --- a/modules/node/node.css +++ b/modules/node/node.css @@ -42,4 +42,3 @@ td.revision-current { .terms-inline { display: inline; } - diff --git a/modules/node/node.module b/modules/node/node.module index 7b04d24d117..e8beb19cb01 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2160,19 +2160,26 @@ function theme_node_recent_block($variables) { $l_options = array('query' => drupal_get_destination()); foreach ($variables['nodes'] as $node) { $row = array(); - $row[] = theme('node_recent_content', array('node' => $node)); - if (node_access('update', $node)) { - $row[] = l(t('edit'), 'node/' . $node->nid . '/edit', $l_options); - } - if (node_access('delete', $node)) { - $row[] = l(t('delete'), 'node/' . $node->nid . '/delete', $l_options); - } + $row[] = array( + 'data' => theme('node_recent_content', array('node' => $node)), + 'class' => 'title-author', + ); + $row[] = array( + 'data' => node_access('update', $node) ? l(t('edit'), 'node/' . $node->nid . '/edit', $l_options) : '', + 'class' => 'edit', + ); + $row[] = array( + 'data' => node_access('delete', $node) ? l(t('delete'), 'node/' . $node->nid . '/delete', $l_options) : '', + 'class' => 'delete', + ); $rows[] = $row; } if ($rows) { $output = theme('table', array('rows' => $rows)); - $output .= ''; + if (user_access('access content overview')) { + $output .= theme('more_link', array('url' => url('admin/content'), 'title' => t('Show more content'))); + } } return $output; diff --git a/themes/seven/style.css b/themes/seven/style.css index 6da7919d310..a09f043f41b 100644 --- a/themes/seven/style.css +++ b/themes/seven/style.css @@ -1017,7 +1017,33 @@ div.add-or-remove-shortcuts { } /* Dashboard */ +#dashboard .dashboard-region div.block h2 { + background: #E0E0D8; +} #dashboard div.block h2 { margin: 0; font-size: 1em; + padding: 3px 9px 3px 19px; +} +#dashboard div.block div.content { + padding: 10px 5px 5px 5px; +} +#dashboard div.block div.content ul.menu { + margin-left: 20px; +} +#dashboard .dashboard-region .block { + border: #ccc 1px solid; +} + + +/* Recent content block */ +#dashboard div#block-node-recent div.content { + padding: 0; +} +#block-node-recent table, +#block-node-recent tr { + border: none; +} +#block-node-recent .more-link { + padding: 0 5px 5px 0; }