aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-14 11:50:21 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-14 11:50:21 +0200
commitbf2a97147ecef7528e9adbed3cf4a1f3af03ad72 (patch)
treefbb4a46a9a68734f2f41b1c36cdf27557db2866a
parent865b602cf8b4eff5e7da00362df95e52e2fe4f77 (diff)
downloadvolse-hubzilla-bf2a97147ecef7528e9adbed3cf4a1f3af03ad72.tar.gz
volse-hubzilla-bf2a97147ecef7528e9adbed3cf4a1f3af03ad72.tar.bz2
volse-hubzilla-bf2a97147ecef7528e9adbed3cf4a1f3af03ad72.zip
some more on webpages
-rw-r--r--include/text.php27
-rw-r--r--mod/editwebpage.php2
-rw-r--r--mod/webpages.php8
-rw-r--r--view/css/mod_webpages.css3
4 files changed, 22 insertions, 18 deletions
diff --git a/include/text.php b/include/text.php
index 791254e52..29654e1fd 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, t('If unsure select text/bbcode'), $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'),
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index e81cde479..e30a33171 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -126,7 +126,7 @@ function editwebpage_content(&$a) {
$plaintext = true;
if(get_config('system','page_mimetype'))
- $mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
+ $mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
else
$mimeselect = mimetype_select($itm[0]['uid'],$mimetype);
diff --git a/mod/webpages.php b/mod/webpages.php
index b4c4e6e4e..2b284813a 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -70,10 +70,10 @@ function webpages_content(&$a) {
return;
}
- if(feature_enabled($owner,'expert') || $a->is_sys) {
- $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
- if(! $mimetype)
- $mimetype = 'choose';
+ $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
+
+ if(! $mimetype) {
+ $mimetype = 'choose';
}
else {
$mimetype = 'text/bbcode';
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index af1ef5357..29cd1e803 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -12,8 +12,9 @@
#webpage-list-table td:nth-child(1){
padding: 7px 3px 7px 10px;
- white-space: nowrap;
+ word-wrap: break-word;
}
+
#webpage-list-table th:nth-child(5),
#webpage-list-table td:nth-child(5){
padding: 7px 3px;