aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <redmatrix@redmatrix.me>2015-04-14 16:22:59 -0700
committerfriendica <redmatrix@redmatrix.me>2015-04-14 16:22:59 -0700
commit89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e (patch)
treeadf4be41d5a98588836b5e9bf49c34177806c9f4 /include
parent3a45206b9971ee981ea61de31c8413350ebcdd7b (diff)
parent953819e7da8152f959f04c733ce617cc34cf8c7d (diff)
downloadvolse-hubzilla-89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e.tar.gz
volse-hubzilla-89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e.tar.bz2
volse-hubzilla-89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/text.php27
1 files changed, 15 insertions, 12 deletions
diff --git a/include/text.php b/include/text.php
index 791254e52..f1f6d41f0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1595,18 +1595,20 @@ function layout_select($channel_id, $current = '') {
intval($channel_id),
intval(ITEM_PDL)
);
+
if($r) {
- $o = t('Select a page layout: ');
- $o .= '<select name="layout_mid" id="select-layout_mid" >';
- $empty_selected = (($current === '') ? ' selected="selected" ' : '');
- $o .= '<option value="" ' . $empty_selected . '>' . t('default') . '</option>';
+ $empty_selected = (($current === false) ? ' selected="selected" ' : '');
+ $options .= '<option value="" ' . $empty_selected . '>' . t('default') . '</option>';
foreach($r as $rr) {
$selected = (($rr['mid'] == $current) ? ' selected="selected" ' : '');
- $o .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['sid'] . '</option>';
+ $options .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['sid'] . '</option>';
}
- $o .= '</select>';
}
+ $o = replace_macros(get_markup_template('field_select_raw.tpl'), array(
+ '$field' => array('layout_mid', t('Page layout'), $selected, t('You can create your own with the layouts tool'), $options)
+ ));
+
return $o;
}
@@ -1639,13 +1641,14 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
}
}
- $o = t('Page content type: ');
- $o .= '<select name="mimetype" id="mimetype-select">';
foreach($x as $y) {
- $select = (($y == $current) ? ' selected="selected" ' : '');
- $o .= '<option name="' . $y . '"' . $select . '>' . $y . '</option>';
+ $selected = (($y == $current) ? ' selected="selected" ' : '');
+ $options .= '<option name="' . $y . '"' . $selected . '>' . $y . '</option>';
}
- $o .= '</select>';
+
+ $o = replace_macros(get_markup_template('field_select_raw.tpl'), array(
+ '$field' => array('mimetype', t('Page content type'), $selected, '', $options)
+ ));
return $o;
}
@@ -2105,7 +2108,7 @@ function design_tools() {
$who = $channel['channel_address'];
return replace_macros(get_markup_template('design_tools.tpl'), array(
- '$title' => t('Design'),
+ '$title' => t('Design Tools'),
'$who' => $who,
'$sys' => $sys,
'$blocks' => t('Blocks'),