From fee607db56f9e87320ce2644ba61ca49266ea7ab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:16:45 +0200 Subject: more webpages - generic-content-wrapper fixes --- mod/editblock.php | 15 ++++++----- mod/editlayout.php | 16 +++++++----- mod/editpost.php | 2 +- view/tpl/menuedit.tpl | 4 +++ view/tpl/mitemedit.tpl | 71 +++++++++++++++++++++++++++----------------------- view/tpl/mitemlist.tpl | 61 +++++++++++++++++++++---------------------- 6 files changed, 90 insertions(+), 79 deletions(-) diff --git a/mod/editblock.php b/mod/editblock.php index a0ece8133..faa283b63 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -108,12 +108,6 @@ function editblock_content(&$a) { else $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Block'), - '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), - '$id' => $itm[0]['id'] - )); - $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), @@ -133,7 +127,7 @@ function editblock_content(&$a) { $rp = 'blocks/' . $channel['channel_address']; - $o .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $rp, '$action' => 'item', '$webpage' => ITEM_BUILDBLOCK, @@ -181,6 +175,13 @@ function editblock_content(&$a) { '$expires' => t('Set expiration date'), )); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Block'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$editor' => $editor + )); + return $o; } diff --git a/mod/editlayout.php b/mod/editlayout.php index 8ab5aab22..a39611a58 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -101,12 +101,6 @@ function editlayout_content(&$a) { $layout_title = $item_id[0]['sid']; $plaintext = true; - - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Layout'), - '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), - '$id' => $itm[0]['id'] - )); $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), @@ -132,7 +126,7 @@ function editlayout_content(&$a) { $rp = 'layouts/' . $which; - $o .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $rp, '$action' => 'item', '$webpage' => ITEM_PDL, @@ -178,6 +172,14 @@ function editlayout_content(&$a) { '$expires' => t('Set expiration date'), )); + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Layout'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$editor' => $editor + )); + return $o; } diff --git a/mod/editpost.php b/mod/editpost.php index db0a86df1..e907a07d0 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -100,7 +100,7 @@ function editpost_content(&$a) { $cipher = 'aes256'; - $editor .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], '$action' => 'item', '$share' => t('Edit'), diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 7fc17471c..0e5df2c47 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,4 +1,5 @@ {{if $header}} +
{{if $menu_id}}
@@ -27,3 +28,6 @@
+{{if $header}} +
+{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index cdc022c5c..8715d6391 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,37 +1,42 @@ {{if $header}} -
-

{{$header}}

-
+
+
+

{{$header}}

+
{{/if}} -
-
- - {{if $mitem_id}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_desc}} - {{include file="field_input.tpl" field=$mitem_link}} - {{if $menu_names}} - - {{foreach $menu_names as $menu_name}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_order}} - {{include file="field_checkbox.tpl" field=$usezid}} - {{include file="field_checkbox.tpl" field=$newwin}} -
-
- - {{if $submit_more}} - - {{/if}} - +
+ + + {{if $mitem_id}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + + {{foreach $menu_names as $menu_name}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} +
+
+ + {{if $submit_more}} + + {{/if}} + +
+ {{$aclselect}}
- {{$aclselect}} -
- +
+ +
+{{if $header}}
+{{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 4e606654f..8686d4204 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,35 +1,34 @@ -
-
- +
+
+
+ +
+

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

+
-

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

-
-
-{{$create}} + {{$create}} -{{if $mlist }} -
- - - - - - - - - {{foreach $mlist as $m }} - - - - - - - - {{/foreach}} -
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+ {{if $mlist }} +
+ + + + + + + + + {{foreach $mlist as $m }} + + + + + + + + {{/foreach}} +
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+
+ {{/if}}
-{{/if}} - - - -- cgit v1.2.3