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 '<strong>'. CREATE_NEW_CAT .'</strong>';
+ echo '<h2>'. CREATE_NEW_CAT .'</h2>';
$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 @@
<li>
<div class="clearfix {cycle values="odd,even"}">
<details class="category_data">
- <summary class="category_name{if $category.category_icon} category_hasicon{/if}"><span class="icon-folder-open"></span> {$category.category_name|escape:"html"}</summary>
+ <summary><span class="icon-folder-open"></span> {$category.category_name|escape:"html"}</summary>
<div class="category_info clearfix">
{if $category.category_description != ''}
<span class="category_desc">{$category.category_description|escape:"html"}</span>
{/if}
- (<span class="category_author">{if $category.authorid == 0}{$CONST.ALL_AUTHORS}{else}{$category.realname|escape:"html"}{/if}</span>)
+ (<span>{if $category.authorid == 0}{$CONST.ALL_AUTHORS}{else}{$category.realname|escape:"html"}{/if}</span>)
</div>
</details>
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. *}
<span class="msg_error"><span class="icon-attention-circled"></span> {$errormsg}</span>
{/if}
-<div class="has_toolbar">
<h2>{$CONST.COMMENTS}</h2>
<form action="" method="GET">
@@ -84,7 +82,6 @@
</div>
</fieldset>
</form>
-</div>
{if !is_array($sql)}
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.NO_COMMENTS}</span>
@@ -109,7 +106,7 @@
<dt>{$CONST.AUTHOR}:</dt>
<dd>{$comment.author|escape|truncate:40:"…"} {$comment.action_author}</dd>
<dt>{$CONST.EMAIL}:</dt>
- <dd>{if empty($comment.email)}N/A{else}<a href="mailto:{$comment.email|escape}" title="{$comment.email|escape}">{$comment.email|escape|truncate:40:"…"}</a>{if $comment.subscribed == 'true'} <span class="serendipity_subscription_on">({$CONST.ACTIVE_COMMENT_SUBSCRIPTION})</span>{/if}{/if} {$comment.action_email}</dd>
+ <dd>{if empty($comment.email)}N/A{else}<a href="mailto:{$comment.email|escape}" title="{$comment.email|escape}">{$comment.email|escape|truncate:40:"…"}</a>{if $comment.subscribed == 'true'} <i>({$CONST.ACTIVE_COMMENT_SUBSCRIPTION})</i>{/if}{/if} {$comment.action_email}</dd>
<dt>IP:</dt>
<dd>{if empty($comment.ip)}N/A{else}{$comment.ip|escape}{/if} {$comment.action_ip}</dd>
<dt>URL:</dt>
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}
<h2>{$CONST.CONFIGURATION}</h2>
-
{$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}
<span class="msg_dialogue"><span class="icon-help-circled"></span> {$ripent}</span>
{/foreach}
- <div class="dialogue_delrip form_buttons">
+ <div class="form_buttons">
<a class="button_link state_cancel icon_link" href="{$smarty.server.HTTP_REFERER|escape}">{$CONST.NOT_REALLY}</a>
<a class="button_link state_submit icon_link" href="{$newLoc}">{$CONST.DUMP_IT}</a>
</div>
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}
<form id="serendipityEntry" name="serendipityEntry" {$entry_vars.entry.entry_form} action="{$entry_vars.targetURL}" method="post">
{foreach $entry_vars.hiddens as $key => $value}
- <input type="hidden" name="{$key}" value="{$value}" />
+ <input type="hidden" name="{$key}" value="{$value}">
{/foreach}
- <input type="hidden" id="entryid" name="serendipity[id]" value="{$entry_vars.entry.id}" />
- <input type="hidden" name="serendipity[timestamp]" value="{$entry_vars.timestamp}" />
- <input type="hidden" name="serendipity[preview]" value="false" />
+ <input type="hidden" id="entryid" name="serendipity[id]" value="{$entry_vars.entry.id}">
+ <input type="hidden" name="serendipity[timestamp]" value="{$entry_vars.timestamp}">
+ <input type="hidden" name="serendipity[preview]" value="false">
{$entry_vars.formToken}
<div id="edit_entry_title" class="form_field">
<label for="entryTitle">{$CONST.TITLE}</label>
@@ -46,7 +46,6 @@
{/if}
<input class="hilite_i wrap_selection" type="button" name="insI" value="I" data-tag="em" data-tarea="body">
<input class="hilite_b wrap_selection" type="button" name="insB" value="B" data-tag="strong" data-tarea="body">
- <input class="hilite_u wrap_selection" type="button" name="insU" value="U" data-tag="u" data-tarea="body">
<input class="wrap_selection" type="button" name="insQ" value="{$CONST.QUOTE}" data-tag="blockquote" data-tarea="body">
<input class="wrap_insimg" type="button" name="insJ" value="img" data-tarea="body">
<input class="wrap_insmedia" type="button" name="insImage" value="{$CONST.MEDIA}" data-tarea="body">
@@ -93,7 +92,6 @@
{/if}
<input class="hilite_i wrap_selection" type="button" name="insI" value="I" data-tag="em" data-tarea="extended">
<input class="hilite_b wrap_selection" type="button" name="insB" value="B" data-tag="strong" data-tarea="extended">
- <input class="hilite_u wrap_selection" type="button" name="insU" value="U" data-tag="u" data-tarea="extended">
<input class="wrap_selection" type="button" name="insQ" value="{$CONST.QUOTE}" data-tag="blockquote" data-tarea="extended">
<input class="wrap_insimg" type="button" name="insJ" value="img" data-tarea="extended">
<input class="wrap_insmedia" type="button" name="insImage" value="{$CONST.MEDIA}" data-tarea="extended">
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 @@
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.PERMISSION_FORBIDDEN_ENABLE_DESC}</span>
{/if}
<div class="form_buttons">
- {if $edit}
+ {if $edit}
<input name="SAVE_EDIT" type="submit" value="{$CONST.SAVE}">
+ {/if}
<input name="SAVE_NEW" type="submit" value="{$CONST.CREATE_NEW_GROUP}">
- {else}
- <input name="SAVE_NEW" type="submit" value="{$CONST.CREATE_NEW_GROUP}">
- {/if}
</div>
</form>
{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}
<span class="msg_dialogue"><span class="icon-help-circled"></span> {$ripimg}</span>
{/foreach}
- <div class="dialogue_delrip form_buttons">
+ <div class="form_buttons">
<a class="button_link icon_link" href="{$newLoc}">{$CONST.DUMP_IT}</a>
<a class="button_link icon_link" href="{$smarty.server.HTTP_REFERER|escape}">{$CONST.NOT_REALLY}</a>
</div>
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}
<div class="form_field">
- {* 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 … *}
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">From</label> {* i18n *}
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="date" value="{$media.filter[$so_key].from|@escape}">
-
<label for="serendipity_filter_{$so_key}_to" class="visuallyhidden">To</label> {* i18n *}
<input id="serendipity_filter_{$so_key}_to" name="serendipity[filter][{$so_key}][to]" type="date" value="{$media.filter[$so_key].to|@escape}">
- {* <span class="input_hint">(DD.MM.YYYY | YYYY-MM-DD | MM/DD/YYYY)</span> *}
</div>
{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}
<div class="form_field">
- {* Could also use input[type=range]; unsure if that's actually useful (yet) *}
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">From</label> {* i18n *}
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="text" value="{$media.filter[$so_key].from|@escape}">
-
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}
<form id="mediaPropertyForm" action="?" method="POST">
-<div>
{$media.token}
<input name="serendipity[action]" type="hidden" value="admin">
<input name="serendipity[adminModule]" type="hidden" value="images">
@@ -10,13 +9,10 @@
<input name="serendipity[adminSubAction]" type="hidden" value="properties">
{$media.editform_hidden}
{/if}
-
{$MEDIA_ITEMS}
-
{if $media.is_edit}
<div class="form_buttons">
<input name="submit" type="submit" value="{$CONST.GO}">
</div>
-</div>
</form>
{/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 @@
</li>
</ul>
</aside>
-
-
{$backend_frontpage_display}
-
{if $update}
<section id="dashboard_update" class="dashboard">
<h4>UPDATER_TITLE</h4>
- New Version available: {$curVersion}
+
+ <span class="msg_notice"><span class="icon-info-circled"></span> New Version available: {$curVersion}</span>
</section>
{/if}
-
{if is_array($comments)}
<section id="dashboard_comments" class="dashboard">
<h4>{$CONST.COMMENTS}</h4>
- <ol>
+
+ <ol class="plainList">
{foreach $comments as $comment}
<li>
{$comment.body}
@@ -54,11 +52,11 @@
</ol>
</section>
{/if}
-
{if is_array($entries)}
<section id="dashboard_entries" class="dashboard">
<h4>Future Entries</h4>
- <ol>
+
+ <ol class="plainList">
{foreach $entries as $entry}
<li>
{$entry.title}
@@ -85,4 +83,3 @@
</ol>
</section>
{/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 @@
-<h2>{$CONST.PERSONAL_SETTINGS}</h2>
+ <h2>{$CONST.PERSONAL_SETTINGS}</h2>
{if $adminAction == 'save'}
{if $not_authorized}
<span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</span>
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}
- <div class="save_conf form_buttons">
+ <div class="form_buttons">
{if $postKey == "template"}
- <a class="button_link" href="?serendipity[adminModule]=templates">{$CONST.BACK}</a>
+ <a class="button_link" href="?serendipity[adminModule]=templates">{$CONST.BACK}</a>
{/if}
<input name="SAVECONF" type="submit" value="{$CONST.SAVE}">
</div>
@@ -31,9 +31,9 @@
</div>
{/foreach}
{if $showSubmit_foot}
- <div class="save_conf form_buttons">
+ <div class="form_buttons">
{if $postKey == "template"}
- <a class="button_link" href="?serendipity[adminModule]=templates">{$CONST.BACK}</a>
+ <a class="button_link" href="?serendipity[adminModule]=templates">{$CONST.BACK}</a>
{/if}
<input name="SAVECONF" type="submit" value="{$CONST.SAVE}">
</div>
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}
<span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.DONE}: {$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"}</span>
{/if}
- <h2>{$name} (<span class="plugin_class">{$class}</span>)</h2>
+ <h2>{$name} ({$class})</h2>
<div class="plugin_info">
- <p><strong>{$CONST.DESCRIPTION}:</strong> {$desc}</p>
+ <p><b>{$CONST.DESCRIPTION}:</b> {$desc}</p>
{if !empty($license)}
- <p><strong>{$CONST.MEDIA_PROPERTY_COPYRIGHT}:</strong> {$license}</p>
+ <p><b>{$CONST.MEDIA_PROPERTY_COPYRIGHT}:</b> {$license}</p>
{/if}
{if ! empty($documentation) || $changelog || $documentation_local}
<ul class="plainList">
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}
<form action="?serendipity[adminModule]=plugins" method="post">
<input id="order" name="serendipity[pluginorder]" type="hidden" value="">
@@ -79,7 +76,7 @@
{else}
<a href="?{$serendipity_setFormTokenUrl}&serendipity[adminModule]=plugins&submit=move+up&serendipity[plugin_to_move]={$plugin_data.key}{if $event_only}&serendipity[event_plugin]=true{/if}">
- <img src="{serendipity_getFile file='admin/img/uparrow.png'}" height="16" width="16" border="0" alt="' . UP . '" />
+ <span class="icon-up-open"></span><span class="visuallyhidden"> UP</span>
</a>
{/if}
@@ -87,7 +84,7 @@
{else}
<a href="?{$serendipity_setFormTokenUrl}&serendipity[adminModule]=plugins&submit=move+down&serendipity[plugin_to_move]={$plugin_data.key}{if $event_only}&serendipity[event_plugin]=true{/if}">
- <img src="{serendipity_getFile file='admin/img/downarrow.png'}" height="16" width="16" alt="'. DOWN .'" border="0" />
+ <span class="icon-down-open"></span><span class="visuallyhidden"> DOWN</span>
</a>
{/if}
</li>
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}
<li class="clearfix {cycle values="odd,even"}">
- <span class="user_name user_{if $user.userlevel >= {$CONST.USERLEVEL_ADMIN}}admin{else}{if $user.userlevel >= {$CONST.USERLEVEL_CHIEF}}chief{else}editor{/if}{/if}"><span class="icon-user"></span> {$user.realname|escape:"html"} ({$user.userlevel})</span>
+ <span class="user_name"><span class="icon-user"></span> {$user.realname|escape:"html"} ({$user.userlevel})</span>
+
<ul class="plainList clearfix edit_actions">
<li><a class="button_link" href="{$user.authorUrl}" title="{$CONST.PREVIEW} {$user.realname}"><span class="icon-eye"></span><span class="visuallyhidden"> {$CONST.PREVIEW}</span></a></li>
<li><a class="button_link" href="?serendipity[adminModule]=users&serendipity[adminAction]=edit&serendipity[userid]={$user.authorid}#editform" title="{$CONST.EDIT} {$user.realname|escape:"html"}"><span class="icon-edit"></span><span class="visuallyhidden"> {$CONST.EDIT}</span></a></li>