Skip to content

Commit

Permalink
Improved tooltip for form and group label positions. Fixed error in
Browse files Browse the repository at this point in the history
notes element, no such helper as FabrikString::safeqn().
  • Loading branch information
cheesegrits committed Oct 20, 2015
1 parent 52dd014 commit f69c6c9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1205,10 +1205,14 @@ COM_FABRIK_RESPONSIVE_CLASS_HIDDEN_DESKTOP="Hidden desktop"
COM_FABRIK_FIELD_ACTION_METHOD_DROPDOWN="Dropdown"
PLG_ELEMENT_BOOTSTRAP_CLASS_DESC="Defines the width of the element when using a bootstrap template. Note: Bootstrap input-x classes will in future scale fonts and margins with the box size - select a span class for a fixed font size."
PLG_ELEMENT_BOOTSTRAP_CLASS_LABEL="Bootstrap class"
COM_FABRIK_FIELD_LABELS_ABOVE_DESC="Bootstrapped forms only - select whether the labels should be shown above the form, to the left of the form or don't show. If groups have multiple columns then if shown labels will automatically be placed above fields rather than to the left of fields."
COM_FABRIK_FIELD_LABELS_ABOVE_DESC="Bootstrapped forms only - select whether element labels should be shown above elements, to the left of elements or not shown. Can be overriden on a per group basis in Group layout settings. If groups have multiple columns then if shown labels will automatically be placed above fields rather than to the left of fields."
COM_FABRIK_FIELD_LABELS_ABOVE_LABEL="Labels position"
COM_FABRIK_FIELD_LABELS_ABOVE_DETAILS_DESC="Bootstrapped details view only - select whether the labels should be shown above the form, to the left of the form or don't show. If groups have multiple columns then if shown labels will automatically be placed above fields rather than to the left of fields."
COM_FABRIK_FIELD_LABELS_ABOVE_DETAILS_DESC="Bootstrapped details view only - select whether element labels should be shown above elements, to the left of elements or not shown. Can be overriden on a per group basis in Group layout settings. If groups have multiple columns then if shown labels will automatically be placed above fields rather than to the left of fields."
COM_FABRIK_FIELD_LABELS_ABOVE_DETAILS_LABEL="Labels position (details)"
COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_DESC="Bootstrapped forms only - select whether element labels should be shown above elements, to the left of elements or not shown. Overrides the label position setting for the form. If groups have multiple columns then if shown labels will automatically be placed above fields rather than to the left of fields."
COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_LABEL="Labels position"
COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_DETAILS_DESC="Bootstrapped details view only - select whether element labels should be shown above elements, to the left of elements or not shown. Overrides the label position setting for the form. If groups have multiple columns then if shown labels will automatically be placed above fields rather than to the left of fields."
COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_DETAILS_LABEL="Labels position (details)"
COM_FABRIK_FIELD_LABELS_ABOVE_GLOBAL="Use global"
COM_FABRIK_FIELD_LABELS_ABOVE_LEFT="Left"
COM_FABRIK_FIELD_LABELS_ABOVE_ABOVE="Above"
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_fabrik/models/forms/group.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@
type="radio"
class="btn-group"
default="-1"
label="COM_FABRIK_FIELD_LABELS_ABOVE_LABEL"
description="COM_FABRIK_FIELD_LABELS_ABOVE_DESC" >
label="COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_LABEL"
description="COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_DESC" >
<option value="-1">COM_FABRIK_FIELD_LABELS_ABOVE_GLOBAL</option>
<option value="0">COM_FABRIK_FIELD_LABELS_ABOVE_LEFT</option>
<option value="1">COM_FABRIK_FIELD_LABELS_ABOVE_ABOVE</option>
Expand All @@ -224,8 +224,8 @@
type="radio"
class="btn-group"
default="-1"
label="COM_FABRIK_FIELD_LABELS_ABOVE_DETAILS_LABEL"
description="COM_FABRIK_FIELD_LABELS_ABOVE_DETAILS_DESC" >
label="COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_DETAILS_LABEL"
description="COM_FABRIK_FIELD_GROUP_LABELS_ABOVE_DETAILS_DESC" >
<option value="-1">COM_FABRIK_FIELD_LABELS_ABOVE_GLOBAL</option>
<option value="0">COM_FABRIK_FIELD_LABELS_ABOVE_LEFT</option>
<option value="1">COM_FABRIK_FIELD_LABELS_ABOVE_ABOVE</option>
Expand Down
2 changes: 1 addition & 1 deletion plugins/fabrik_element/notes/notes.php
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ protected function getOrderBy($view = '', $query = false)
}
else
{
$order = FabrikString::safeqn($params->get('join_db_name') . '.' . $orderBy) . ' ' . $params->get('notes_order_dir', 'ASC');
$order = FabrikString::safeQuoteName($params->get('join_db_name') . '.' . $orderBy) . ' ' . $params->get('notes_order_dir', 'ASC');

if ($query)
{
Expand Down

0 comments on commit f69c6c9

Please sign in to comment.