Commit 7751ae22 authored by David Metzler's avatar David Metzler
Browse files

#2354791 Updated for sizes and some borders.

parent 93bad144
......@@ -1008,7 +1008,9 @@ class FrxEditor {
$r_link = str_replace('/', '.', $this->report_name);
$parms = $_GET;
unset($parms['q']);
$links = $this->l_icon("reports/$r_link/edit/select-data/add-data", 'plus.svg', 'Add Data', $parms);
$links = '<div class="forena-edit-links">';
$links .= $this->l_icon("reports/$r_link/edit/select-data/add-data", 'plus.svg', 'Add Data', $parms, t('Data'));
$links .= '</div>';
}
$content = array(
......@@ -1051,15 +1053,17 @@ class FrxEditor {
public function fieldLink($id, $value) {
$o = '';
if (!isset($this->field_ids[$id])) {
$m_path = drupal_get_path('module', 'forena');
$report_link = $this->report_link;
$image = array(
'path' => url("misc/configure.png"),
'path' => url("$m_path/icons/cog.svg"),
'alt' => t('Configure'),
'title' => t('Configure'),
'class' => 'forena-field-config'
);
$image = theme('image', $image);
$id = urlencode($id);
$o= l($image, "$report_link/edit/edit-field/$id", array('html' => TRUE));
$o= l($image, "$report_link/edit/edit-field/$id", array('html' => TRUE, 'attributes' => array( 'class' => 'forena-field-config')));
$this->field_ids[$id] = 1;
}
return $o;
......@@ -1078,13 +1082,13 @@ class FrxEditor {
$report_name = $this->report_name;
// Add the block or ID link
$o .= '<div class="forena-edit-links">'
. $this->l_icon("reports/$report_name/edit/select-data/add-data/$id", 'plus.svg', 'Add Detail')
. $this->l_icon("reports/$report_name/edit/select-data/add-data/$id", 'plus.svg', 'Add Detail', null, t("Data"))
. "</div>";
return $o;
}
public function l_icon($link, $name, $alt, $context=array()) {
public function l_icon($link, $name, $alt, $context=array(), $label="") {
$path = $name=='configure.png' ? 'misc' : drupal_get_path('module', 'forena') . '/icons';
$image = array(
......@@ -1094,7 +1098,7 @@ class FrxEditor {
);
$image = theme('image', $image);
$options = array('query' => $context, 'html' => TRUE);
return l($image, $link, $options);
return l($image . $label, $link, $options);
}
......@@ -1127,7 +1131,7 @@ class FrxEditor {
// Add the prepend link.
if ($block_tag) {
// If we have a block tag we're going to prepend another data block?
$o .= '<div class="forena-edit-links">' . $this->l_icon("reports/$report_name/edit/select-data/prepend-data/$id", 'plus.svg', 'Insert Data'). "</div>";
$o .= '<div class="forena-edit-links">' . $this->l_icon("reports/$report_name/edit/select-data/prepend-data/$id", 'plus.svg', 'Insert Data', null, t("Data")). "</div>";
}
else {
//$o .= '<div class="forena-edit-links">' . $this->l_icon("reports/$report_name/edit/prepend-section/$block_link/$id", 'plus.svg', 'Add Data'). "</div>";
......
......@@ -94,5 +94,18 @@ ul.forena-doclinks {
text-align: right;
}
.forena-edit-links img, .forena-editor-links img,
.forena-field-config img { height: 1.3em; vertical-align: middle; }
.forena-edit-links a, .forena-editor-links a { display: inline-block;
padding: 0.2em;
background-color: #eee;
border: solid 1px #ddd;
text-decoration: none;
font-size: 1.1em;
vertical-align: middle;
margin-bottom: 0.5em;
border-radius: .5em; }
.forena-edit-links a:hover { text-decoration: none; }
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M15.176 9.041c.045-.327.076-.658.076-.998 0-.36-.035-.71-.086-1.056l-2.275-.293c-.115-.426-.283-.827-.498-1.201l1.396-1.808c-.416-.551-.906-1.039-1.459-1.452l-1.807 1.391c-.373-.215-.774-.383-1.2-.499l-.292-2.252c-.338-.048-.677-.081-1.029-.081s-.694.033-1.032.082l-.291 2.251c-.426.116-.826.284-1.2.499l-1.805-1.391c-.552.413-1.044.901-1.459 1.452l1.395 1.808c-.215.374-.383.774-.499 1.2l-2.276.294c-.05.346-.085.696-.085 1.056 0 .34.031.671.077.998l2.285.295c.115.426.284.826.499 1.2l-1.417 1.836c.411.55.896 1.038 1.443 1.452l1.842-1.42c.374.215.774.383 1.2.498l.298 2.311c.337.047.677.08 1.025.08s.688-.033 1.021-.08l.299-2.311c.426-.115.826-.283 1.201-.498l1.842 1.42c.547-.414 1.031-.902 1.443-1.452l-1.416-1.837c.215-.373.383-.773.498-1.199l2.286-.295zm-7.174 1.514c-1.406 0-2.543-1.137-2.543-2.541 0-1.402 1.137-2.541 2.543-2.541 1.402 0 2.541 1.138 2.541 2.541 0 1.404-1.139 2.541-2.541 2.541z"/></svg>
\ No newline at end of file
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