Commit 782c3096 authored by catch's avatar catch

Issue #1167350 by sun, ry5n, iflista: Action links were ignored .

parent 53656a33
......@@ -1654,18 +1654,16 @@ function theme_menu_local_task($variables) {
*/
function theme_menu_local_action($variables) {
$link = $variables['element']['#link'];
$link += array(
'href' => '',
'localized_options' => array(),
);
$link['localized_options']['attributes']['class'][] = 'button';
$link['localized_options']['attributes']['class'][] = 'add';
$output = '<li>';
if (isset($link['href'])) {
$output .= l($link['title'], $link['href'], isset($link['localized_options']) ? $link['localized_options'] : array());
}
elseif (!empty($link['localized_options']['html'])) {
$output .= $link['title'];
}
else {
$output .= check_plain($link['title']);
}
$output .= "</li>\n";
$output .= l($link['title'], $link['href'], $link['localized_options']);
$output .= "</li>";
return $output;
}
......
......@@ -71,9 +71,11 @@ function testCustomBlock() {
// Confirm that the add block link appears on block overview pages.
$this->drupalGet('admin/structure/block');
$this->assertRaw(l('Add block', 'admin/structure/block/add'), 'Add block link is present on block overview page for default theme.');
$this->assertLink(t('Add block'));
$this->assertLinkByHref('admin/structure/block/add');
$this->drupalGet('admin/structure/block/list/seven');
$this->assertRaw(l('Add block', 'admin/structure/block/list/seven/add'), 'Add block link is present on block overview page for non-default theme.');
$this->assertLink(t('Add block'));
$this->assertLinkByHref('admin/structure/block/list/seven/add');
// Confirm that hidden regions are not shown as options for block placement
// when adding a new block.
......
......@@ -75,6 +75,20 @@ ul.menu {
margin-right: 0;
}
/**
* RTL Styles for link buttons and action links.
*/
.action-links li:first-child {
margin-left: auto;
margin-right: 0;
}
a.button.add:before {
margin-left: 0;
margin-right: -0.1em;
padding-left: 0.2em;
padding-right: 0;
}
/**
* RTL Styles for system messages.
*/
......
......@@ -334,6 +334,34 @@ ul.tabs {
background-color: #f5f5f5;
}
/**
* Styles for link buttons and action links.
*/
.action-links {
list-style: none;
padding: 0;
margin: 1em 0;
}
.action-links li {
display: inline-block;
margin: 0 0.3em;
}
.action-links li:first-child {
margin-left: 0; /* LTR */
}
a.button {
display: inline-block;
line-height: 160%;
padding: 0.2em 0.5em 0.3em;
text-decoration: none;
}
a.button.add:before {
content: '+';
font-weight: 900;
margin-left: -0.1em; /* LTR */
padding-right: 0.2em; /* LTR */
}
/**
* Styles for system messages.
*/
......
......@@ -1030,19 +1030,9 @@ div.tabs {
border-bottom: none;
border-radius: 5px;
}
ul.action-links {
list-style: none;
margin: 5px;
padding: 0.5em 1em;
}
ul.action-links li {
display: inline-block;
margin-left: 10px;
}
ul.action-links li a {
padding-left: 15px;
background: url(../images/add.png) no-repeat left center;
margin: 0 10px 0 0;
margin: 0;
}
/* ---------------- Messages ----------------- */
......
......@@ -709,20 +709,41 @@ select.form-select:focus {
.js input.throbbing {
background-position: 100% -16px;
}
ul.action-links {
margin: 1em 0;
padding: 0 20px 0 20px; /* LTR */
list-style-type: none;
overflow: hidden;
}
ul.action-links li {
float: left; /* LTR */
margin: 0 1em 0 0; /* LTR */
a.button.add {
background: #1078d8;
background-image: -webkit-linear-gradient(top, #419ff1, #1076d5);
background-image: -moz-linear-gradient(top, #419ff1, #1076d5);
background-image: -o-linear-gradient(top, #419ff1, #1076d5);
background-image: linear-gradient(to bottom, #419ff1, #1076d5);
border: 1px solid #0048c8;
border-radius: .4em;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .4);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .4);
color: #fff;
font-size: 1em;
line-height: normal;
margin: 0;
padding: 4px 1em;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5);
}
a.button.add:focus,
a.button.add:hover {
background-color: #419cf1;
background-image: -webkit-linear-gradient(top, #59abf3, #2a90ef);
background-image: -moz-linear-gradient(top, #59abf3, #2a90ef);
background-image: -o-linear-gradient(top, #59abf3, #2a90ef);
background-image: linear-gradient(to bottom, #59abf3, #2a90ef);
color: #fff;
}
ul.action-links a {
padding-left: 15px; /* LTR */
background: transparent url(images/add.png) no-repeat 0 center;
line-height: 30px;
a.button.add:active {
background-color: #0e69be;
background-image: -webkit-linear-gradient(top, #0e69be, #2a93ef);
background-image: -moz-linear-gradient(top, #0e69be, #2a93ef);
background-image: -o-linear-gradient(top, #0e69be, #2a93ef);
background-image: -ms-linear-gradient(top, #0e69be, #2a93ef);
background-image: linear-gradient(to bottom, #0e69be, #2a93ef);
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .25);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .25);
}
/**
......
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