#337947 follow-up by Jacine: Capitalization and markup fixes for Dashboard.
parent
ba468be638
commit
f177c12db7
|
@ -1995,7 +1995,7 @@ function theme_html_tag($variables) {
|
||||||
* - title: A descriptive verb for the link, like 'Read more'
|
* - title: A descriptive verb for the link, like 'Read more'
|
||||||
*/
|
*/
|
||||||
function theme_more_link($variables) {
|
function theme_more_link($variables) {
|
||||||
return '<div class="more-link">' . t('<a href="@link" title="@title">more</a>', array('@link' => check_url($variables['url']), '@title' => $variables['title'])) . '</div>';
|
return '<div class="more-link">' . t('<a href="@link" title="@title">More</a>', array('@link' => check_url($variables['url']), '@title' => $variables['title'])) . '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -19,27 +19,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#dashboard .dashboard-region .block {
|
#dashboard .dashboard-region .block {
|
||||||
border: #ccc 1px solid;
|
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
#dashboard div.block h2 {
|
#dashboard div.block h2 {
|
||||||
padding: 3px 9px 3px 19px;
|
|
||||||
float: none;
|
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 {
|
#dashboard #disabled-blocks .block, #dashboard .block-placeholder {
|
||||||
background: #e2e1dc;
|
background: #e2e1dc;
|
||||||
padding: 6px 4px 6px 8px;
|
padding: 6px 4px 6px 8px;
|
||||||
|
@ -122,6 +108,7 @@
|
||||||
|
|
||||||
#dashboard .ui-sortable .block h2 {
|
#dashboard .ui-sortable .block h2 {
|
||||||
background: transparent url(../../misc/draggable.png) no-repeat 0 -35px;
|
background: transparent url(../../misc/draggable.png) no-repeat 0 -35px;
|
||||||
|
padding: 0 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#dashboard #disabled-blocks .block:hover h2 {
|
#dashboard #disabled-blocks .block:hover h2 {
|
||||||
|
@ -147,12 +134,3 @@
|
||||||
width: 30px;
|
width: 30px;
|
||||||
height: 1.6em;
|
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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -42,4 +42,3 @@ td.revision-current {
|
||||||
.terms-inline {
|
.terms-inline {
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2160,19 +2160,26 @@ function theme_node_recent_block($variables) {
|
||||||
$l_options = array('query' => drupal_get_destination());
|
$l_options = array('query' => drupal_get_destination());
|
||||||
foreach ($variables['nodes'] as $node) {
|
foreach ($variables['nodes'] as $node) {
|
||||||
$row = array();
|
$row = array();
|
||||||
$row[] = theme('node_recent_content', array('node' => $node));
|
$row[] = array(
|
||||||
if (node_access('update', $node)) {
|
'data' => theme('node_recent_content', array('node' => $node)),
|
||||||
$row[] = l(t('edit'), 'node/' . $node->nid . '/edit', $l_options);
|
'class' => 'title-author',
|
||||||
}
|
);
|
||||||
if (node_access('delete', $node)) {
|
$row[] = array(
|
||||||
$row[] = l(t('delete'), 'node/' . $node->nid . '/delete', $l_options);
|
'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;
|
$rows[] = $row;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($rows) {
|
if ($rows) {
|
||||||
$output = theme('table', array('rows' => $rows));
|
$output = theme('table', array('rows' => $rows));
|
||||||
$output .= '<div class="more-link">' . l(t('Show all content'), 'admin/content') . '</div>';
|
if (user_access('access content overview')) {
|
||||||
|
$output .= theme('more_link', array('url' => url('admin/content'), 'title' => t('Show more content')));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
|
|
|
@ -1017,7 +1017,33 @@ div.add-or-remove-shortcuts {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Dashboard */
|
/* Dashboard */
|
||||||
|
#dashboard .dashboard-region div.block h2 {
|
||||||
|
background: #E0E0D8;
|
||||||
|
}
|
||||||
#dashboard div.block h2 {
|
#dashboard div.block h2 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-size: 1em;
|
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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue