harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
friendica 2015-04-14 16:22:59 -07:00
commit 89536ff88b
6 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/text.php
View File

@ -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'),

9
mod/blocks.php
View File

@ -78,16 +78,11 @@ function blocks_content(&$a) {
return;
}
if(feature_enabled($owner,'expert')) {
$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
if(! $mimetype)
if(! $mimetype) {
$mimetype = 'choose';
}
else {
$mimetype = 'text/bbcode';
}
$x = array(
'webpage' => ITEM_BUILDBLOCK,

7
mod/webpages.php
View File

@ -70,14 +70,11 @@ 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)
if(! $mimetype) {
$mimetype = 'choose';
}
else {
$mimetype = 'text/bbcode';
}
$layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout'));
if(! $layout)

3
view/css/mod_webpages.css
View File

@ -7,13 +7,14 @@
}
#webpage-list-table th:nth-child(1){
padding: 7px 3px 7px 10px;
white-space: nowrap;
}
#webpage-list-table td:nth-child(1){
padding: 7px 3px 7px 10px;
white-space: nowrap;
}
#webpage-list-table th:nth-child(5),
#webpage-list-table td:nth-child(5){
padding: 7px 3px;

2
view/tpl/webpagelist.tpl
View File

@ -13,7 +13,7 @@
</div>
{{/if}}
{{if $pages}}
<div id="pagelist-content-wrapper" class="generic-content-wrapper-styled">
<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
<table id="webpage-list-table">
<tr>
<th width="1%">{{$pagelink_txt}}</th>