From 3c3369f64b1c30f9e7bb8ba23e89f0205ea6c8dd Mon Sep 17 00:00:00 2001 From: Matthias Mees Date: Mon, 24 Jun 2013 16:08:26 +0200 Subject: [PATCH] Markup maintenance. --- include/admin/category.inc.php | 2 +- templates/2k11/admin/category.inc.tpl | 4 ++-- templates/2k11/admin/comments.inc.tpl | 5 +---- templates/2k11/admin/configuration.inc.tpl | 1 - templates/2k11/admin/entries.inc.tpl | 2 +- templates/2k11/admin/entries.tpl | 10 ++++------ templates/2k11/admin/groups.inc.tpl | 6 ++---- templates/2k11/admin/images.inc.tpl | 2 +- templates/2k11/admin/media_pane.tpl | 5 ----- templates/2k11/admin/media_properties.tpl | 4 ---- templates/2k11/admin/overview.inc.tpl | 15 ++++++--------- templates/2k11/admin/personal.inc.tpl | 2 +- templates/2k11/admin/plugin_config.tpl | 8 ++++---- templates/2k11/admin/plugins.inc.tpl | 6 +++--- templates/2k11/admin/show_plugins.fnc.tpl | 7 ++----- templates/2k11/admin/users.inc.tpl | 3 ++- 16 files changed, 30 insertions(+), 52 deletions(-) diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php index adf44c18..70ecbd13 100644 --- a/include/admin/category.inc.php +++ b/include/admin/category.inc.php @@ -149,7 +149,7 @@ if ( $serendipity['GET']['adminAction'] == 'edit' || $serendipity['GET']['adminA $data['new'] = true; $cid = false; $this_cat = array(); - echo ''. CREATE_NEW_CAT .''; + echo '

'. CREATE_NEW_CAT .'

'; $save = CREATE; $read_groups = array(0 => 0); $write_groups = array(0 => 0); diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl index 4c1c46b1..7c6b4bec 100644 --- a/templates/2k11/admin/category.inc.tpl +++ b/templates/2k11/admin/category.inc.tpl @@ -153,13 +153,13 @@
  • - {$category.category_name|escape:"html"} + {$category.category_name|escape:"html"}
    {if $category.category_description != ''} {$category.category_description|escape:"html"} {/if} - ({if $category.authorid == 0}{$CONST.ALL_AUTHORS}{else}{$category.realname|escape:"html"}{/if}) + ({if $category.authorid == 0}{$CONST.ALL_AUTHORS}{else}{$category.realname|escape:"html"}{/if})
    diff --git a/templates/2k11/admin/comments.inc.tpl b/templates/2k11/admin/comments.inc.tpl index ccc3661b..9eb90d40 100644 --- a/templates/2k11/admin/comments.inc.tpl +++ b/templates/2k11/admin/comments.inc.tpl @@ -1,8 +1,6 @@ {if !empty($errormsg)} - {* TODO: Not sure anything emitted here actually IS an error. *} {$errormsg} {/if} -

    {$CONST.COMMENTS}

    @@ -84,7 +82,6 @@
    -
    {if !is_array($sql)} {$CONST.NO_COMMENTS} @@ -109,7 +106,7 @@
    {$CONST.AUTHOR}:
    {$comment.author|escape|truncate:40:"…"} {$comment.action_author}
    {$CONST.EMAIL}:
    -
    {if empty($comment.email)}N/A{else}{$comment.email|escape|truncate:40:"…"}{if $comment.subscribed == 'true'} ({$CONST.ACTIVE_COMMENT_SUBSCRIPTION}){/if}{/if} {$comment.action_email}
    +
    {if empty($comment.email)}N/A{else}{$comment.email|escape|truncate:40:"…"}{if $comment.subscribed == 'true'} ({$CONST.ACTIVE_COMMENT_SUBSCRIPTION}){/if}{/if} {$comment.action_email}
    IP:
    {if empty($comment.ip)}N/A{else}{$comment.ip|escape}{/if} {$comment.action_ip}
    URL:
    diff --git a/templates/2k11/admin/configuration.inc.tpl b/templates/2k11/admin/configuration.inc.tpl index a942c645..14c74371 100644 --- a/templates/2k11/admin/configuration.inc.tpl +++ b/templates/2k11/admin/configuration.inc.tpl @@ -19,6 +19,5 @@ {/if} {else}

    {$CONST.CONFIGURATION}

    - {$config} {/if} diff --git a/templates/2k11/admin/entries.inc.tpl b/templates/2k11/admin/entries.inc.tpl index a38c34cc..cfc7baea 100644 --- a/templates/2k11/admin/entries.inc.tpl +++ b/templates/2k11/admin/entries.inc.tpl @@ -220,7 +220,7 @@ {foreach $rip_entry AS $ripent} {$ripent} {/foreach} -
    +
    {$CONST.NOT_REALLY} {$CONST.DUMP_IT}
    diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl index c588b75b..8a483705 100644 --- a/templates/2k11/admin/entries.tpl +++ b/templates/2k11/admin/entries.tpl @@ -4,11 +4,11 @@ {/if}
    {foreach $entry_vars.hiddens as $key => $value} - + {/foreach} - - - + + + {$entry_vars.formToken}
    @@ -46,7 +46,6 @@ {/if} - @@ -93,7 +92,6 @@ {/if} - diff --git a/templates/2k11/admin/groups.inc.tpl b/templates/2k11/admin/groups.inc.tpl index ae09d02b..66a3b128 100644 --- a/templates/2k11/admin/groups.inc.tpl +++ b/templates/2k11/admin/groups.inc.tpl @@ -113,12 +113,10 @@ {$CONST.PERMISSION_FORBIDDEN_ENABLE_DESC} {/if}
    - {if $edit} + {if $edit} + {/if} - {else} - - {/if}
    {else} diff --git a/templates/2k11/admin/images.inc.tpl b/templates/2k11/admin/images.inc.tpl index 897072bb..b9fad034 100644 --- a/templates/2k11/admin/images.inc.tpl +++ b/templates/2k11/admin/images.inc.tpl @@ -69,7 +69,7 @@ {foreach $rip_image AS $ripimg} {$ripimg} {/foreach} -
    +
    {$CONST.DUMP_IT} {$CONST.NOT_REALLY}
    diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl index dec104b8..a7064862 100644 --- a/templates/2k11/admin/media_pane.tpl +++ b/templates/2k11/admin/media_pane.tpl @@ -31,20 +31,15 @@ {if $so_val.type == 'date'} {if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
    - {* Core might need to be adapted to input[type=date] *} - {* date is not ideal, should be datetime – but datetime isn't properly supported *} - {* by browsers yet, so we probably need a JS widget (jQuery UI?) for this … *} {* i18n *} - {* i18n *} - {* (DD.MM.YYYY | YYYY-MM-DD | MM/DD/YYYY) *}
    {elseif $so_val.type == 'intrange'} {if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
    - {* Could also use input[type=range]; unsure if that's actually useful (yet) *} {* i18n *} - diff --git a/templates/2k11/admin/media_properties.tpl b/templates/2k11/admin/media_properties.tpl index 4a807203..99e374a4 100644 --- a/templates/2k11/admin/media_properties.tpl +++ b/templates/2k11/admin/media_properties.tpl @@ -2,7 +2,6 @@ {if $media.is_edit}
    -
    {$media.token} @@ -10,13 +9,10 @@ {$media.editform_hidden} {/if} - {$MEDIA_ITEMS} - {if $media.is_edit}
    -
    {/if} diff --git a/templates/2k11/admin/overview.inc.tpl b/templates/2k11/admin/overview.inc.tpl index 1c5a5fe0..ac3d0c02 100644 --- a/templates/2k11/admin/overview.inc.tpl +++ b/templates/2k11/admin/overview.inc.tpl @@ -16,21 +16,19 @@
    • - - {$backend_frontpage_display} - {if $update}

    UPDATER_TITLE

    - New Version available: {$curVersion} + + New Version available: {$curVersion}
    {/if} - {if is_array($comments)}

    {$CONST.COMMENTS}

    -
      + +
        {foreach $comments as $comment}
      1. {$comment.body} @@ -54,11 +52,11 @@
    {/if} - {if is_array($entries)}

    Future Entries

    -
      + +
        {foreach $entries as $entry}
      1. {$entry.title} @@ -85,4 +83,3 @@
    {/if} - diff --git a/templates/2k11/admin/personal.inc.tpl b/templates/2k11/admin/personal.inc.tpl index 1531cdd8..1c9d5ec6 100644 --- a/templates/2k11/admin/personal.inc.tpl +++ b/templates/2k11/admin/personal.inc.tpl @@ -1,4 +1,4 @@ -

    {$CONST.PERSONAL_SETTINGS}

    +

    {$CONST.PERSONAL_SETTINGS}

    {if $adminAction == 'save'} {if $not_authorized} {$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL} diff --git a/templates/2k11/admin/plugin_config.tpl b/templates/2k11/admin/plugin_config.tpl index 1c06f202..0ac7722b 100644 --- a/templates/2k11/admin/plugin_config.tpl +++ b/templates/2k11/admin/plugin_config.tpl @@ -1,7 +1,7 @@ {if $showSubmit_head} -
    +
    {if $postKey == "template"} - {$CONST.BACK} + {$CONST.BACK} {/if}
    @@ -31,9 +31,9 @@
    {/foreach} {if $showSubmit_foot} -
    +
    {if $postKey == "template"} - {$CONST.BACK} + {$CONST.BACK} {/if}
    diff --git a/templates/2k11/admin/plugins.inc.tpl b/templates/2k11/admin/plugins.inc.tpl index 6fda8ddd..a04979a6 100644 --- a/templates/2k11/admin/plugins.inc.tpl +++ b/templates/2k11/admin/plugins.inc.tpl @@ -12,12 +12,12 @@ {elseif $saveconf} {$CONST.DONE}: {$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"} {/if} -

    {$name} ({$class})

    +

    {$name} ({$class})

    -

    {$CONST.DESCRIPTION}: {$desc}

    +

    {$CONST.DESCRIPTION}: {$desc}

    {if !empty($license)} -

    {$CONST.MEDIA_PROPERTY_COPYRIGHT}: {$license}

    +

    {$CONST.MEDIA_PROPERTY_COPYRIGHT}: {$license}

    {/if} {if ! empty($documentation) || $changelog || $documentation_local}
      diff --git a/templates/2k11/admin/show_plugins.fnc.tpl b/templates/2k11/admin/show_plugins.fnc.tpl index 3183e669..0f3f2b3f 100644 --- a/templates/2k11/admin/show_plugins.fnc.tpl +++ b/templates/2k11/admin/show_plugins.fnc.tpl @@ -1,6 +1,3 @@ -{* functions_plugins_admin.inc.php::function_show_plugins() including output of functions_plugins_admin.inc.php::function ownership() *} - - {if !$event_only}
      @@ -79,7 +76,7 @@   {else} - ' . UP . ' + UP {/if} @@ -87,7 +84,7 @@   {else} - '. DOWN .' + DOWN {/if} diff --git a/templates/2k11/admin/users.inc.tpl b/templates/2k11/admin/users.inc.tpl index b63d4487..f3bc915e 100644 --- a/templates/2k11/admin/users.inc.tpl +++ b/templates/2k11/admin/users.inc.tpl @@ -44,7 +44,8 @@ {foreach $users as $user} {if $user.isEditable}
    • - {$user.realname|escape:"html"} ({$user.userlevel}) + {$user.realname|escape:"html"} ({$user.userlevel}) +