From 7350493ff42f076a1e2bb5ba4c26ea47e714da4f Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Thu, 12 Jul 2007 09:40:04 +0000
Subject: [PATCH] Merge patch from Don Chambers for better input classes in
admin
---
docs/NEWS | 3 +
include/admin/category.inc.php | 22 ++---
include/admin/comments.inc.php | 18 ++--
include/admin/entries.inc.php | 24 ++---
include/admin/export.inc.php | 2 +-
include/admin/groups.inc.php | 21 ++--
include/admin/images.inc.php | 30 +++---
include/admin/import.inc.php | 4 +-
include/admin/installer.inc.php | 4 +-
include/admin/overview.inc.php | 6 +-
include/admin/personal.inc.php | 2 +-
include/admin/plugins.inc.php | 2 +-
include/admin/templates.inc.php | 19 ++--
include/admin/upgrader.inc.php | 4 +-
include/admin/users.inc.php | 14 +--
include/functions_entries_admin.inc.php | 64 ++++++-------
include/functions_installer.inc.php | 13 +--
include/functions_plugins_admin.inc.php | 14 +--
serendipity_admin.php | 84 ++++++++--------
templates/default/admin/entries.tpl | 66 ++++++-------
templates/default/admin/index.tpl | 95 +++++++++----------
templates/default/admin/media_choose.tpl | 30 +++---
templates/default/admin/media_imgedit.tpl | 57 +++++++++++
.../default/admin/media_imgedit_done.tpl | 37 ++++++++
templates/default/admin/media_items.tpl | 6 +-
templates/default/admin/media_pane.tpl | 20 ++--
templates/default/admin/media_properties.tpl | 18 ++++
templates/default/admin/media_upload.tpl | 12 +--
28 files changed, 406 insertions(+), 285 deletions(-)
create mode 100644 templates/default/admin/media_imgedit.tpl
create mode 100644 templates/default/admin/media_imgedit_done.tpl
create mode 100644 templates/default/admin/media_properties.tpl
diff --git a/docs/NEWS b/docs/NEWS
index 0f21ff4..cec8926 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -19,6 +19,9 @@ Version 1.3 ()
Version 1.2 ()
------------------------------------------------------------------------
+ * Backend templating changes to insert more classes to input fields
+ etc (Don Chambers)
+
* Fix invalid pingback XML code, by Slim
* (beta2) Fix when saving personal configuration the userlevel and
diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php
index 91d9caa..878e7d5 100644
--- a/include/admin/category.inc.php
+++ b/include/admin/category.inc.php
@@ -136,7 +136,7 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
}
?>
</select>
- <input type="submit" name="REMOVE" value="<?php echo GO ?>" class="serendipityPrettyButton">
+ <input type="submit" name="REMOVE" value="<?php echo GO ?>" class="serendipityPrettyButton input_button">
</form>
<?php
}
@@ -169,21 +169,21 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
<table cellpadding="5" width="100%">
<tr>
<td><?php echo NAME; ?></td>
- <td><input type="text" name="serendipity[cat][name]" value="<?php echo isset($this_cat['category_name']) ? htmlspecialchars($this_cat['category_name']) : ''; ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[cat][name]" value="<?php echo isset($this_cat['category_name']) ? htmlspecialchars($this_cat['category_name']) : ''; ?>" /></td>
<td rowspan="5" align="center" valign="middle" width="200" style="border: 1px solid #ccc"><img src="<?php echo isset($this_cat['category_icon']) ? $this_cat['category_icon'] : '' ?>" id="imagepreview" <?php echo empty($this_cat['category_icon']) ? 'style="display: none"' : '' ?> /></td>
</tr>
<tr>
<td><?php echo DESCRIPTION; ?></td>
- <td><input type="text" name="serendipity[cat][description]" value="<?php echo isset($this_cat['category_description']) ? htmlspecialchars($this_cat['category_description']) : ''; ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[cat][description]" value="<?php echo isset($this_cat['category_description']) ? htmlspecialchars($this_cat['category_description']) : ''; ?>" /></td>
</tr>
<tr>
<td><?php echo IMAGE; ?></td>
<td>
<script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script>
- <input type="text" id="img_icon" name="serendipity[cat][icon]" value="<?php echo isset($this_cat['category_icon']) ? htmlspecialchars($this_cat['category_icon']) : ''; ?>" onchange="document.getElementById('imagepreview').src = this.value; document.getElementById('imagepreview').style.display = '';" />
- <script type="text/javascript" language="JavaScript">document.write('<input type="button" name="insImage" value="<?php echo IMAGE ; ?>" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&serendipity[filename_only]=true\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');" class="serendipityPrettyButton" />');</script><!-- noscript>FIXXME: Emit a warning if JS is disabled</noscript -->
+ <input class="input_textbox" type="text" id="img_icon" name="serendipity[cat][icon]" value="<?php echo isset($this_cat['category_icon']) ? htmlspecialchars($this_cat['category_icon']) : ''; ?>" onchange="document.getElementById('imagepreview').src = this.value; document.getElementById('imagepreview').style.display = '';" />
+ <script type="text/javascript" language="JavaScript">document.write('<input type="button" name="insImage" value="<?php echo IMAGE ; ?>" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&serendipity[filename_only]=true\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');" class="serendipityPrettyButton input_button" />');</script><!-- noscript>FIXXME: Emit a warning if JS is disabled</noscript -->
</td>
</tr>
@@ -238,14 +238,14 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
<tr>
<td><?php echo CATEGORY_HIDE_SUB ?><br /><em><?php echo CATEGORY_HIDE_SUB_DESC; ?></em></td>
<td valign="top">
- <input type="radio" name="serendipity[cat][hide_sub]" value="0" <?php echo ($this_cat['hide_sub'] == 0 ? 'checked="checked"' : ''); ?> id="hide_sub_no" /> <label for="hide_sub_no"><?php echo NO; ?></label>
- <input type="radio" name="serendipity[cat][hide_sub]" value="1" <?php echo ($this_cat['hide_sub'] == 1 ? 'checked="checked"' : ''); ?> id="hide_sub_yes" /> <label for="hide_sub_yes"><?php echo YES; ?></label>
+ <input class="input_radio" type="radio" name="serendipity[cat][hide_sub]" value="0" <?php echo ($this_cat['hide_sub'] == 0 ? 'checked="checked"' : ''); ?> id="hide_sub_no" /> <label for="hide_sub_no"><?php echo NO; ?></label>
+ <input class="input_radio" type="radio" name="serendipity[cat][hide_sub]" value="1" <?php echo ($this_cat['hide_sub'] == 1 ? 'checked="checked"' : ''); ?> id="hide_sub_yes" /> <label for="hide_sub_yes"><?php echo YES; ?></label>
</td>
</tr>
<?php serendipity_plugin_api::hook_event('backend_category_showForm', $cid, $this_cat); ?>
</table>
- <div><input type="submit" name="SAVE" value="<?php echo $save; ?>" class="serendipityPrettyButton" /></div>
+ <div><input type="submit" name="SAVE" value="<?php echo $save; ?>" class="serendipityPrettyButton input_button" /></div>
</form>
<?php } ?>
@@ -274,8 +274,8 @@ if ( $serendipity['GET']['adminAction'] == 'view' ) {
foreach ( $categories as $category ) {
?>
<tr>
- <td width="16"><a href="?serendipity[adminModule]=category&serendipity[adminAction]=edit&serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png') ?>" border="0" title="<?php echo $category['categoryid']; ?>" alt="<?php echo EDIT ?>" /></a></td>
- <td width="16"><a href="?serendipity[adminModule]=category&serendipity[adminAction]=delete&serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" border="0" title="<?php echo $category['categoryid']; ?>" alt="<?php echo DELETE ?>" /></a></td>
+ <td width="16"><a title="<?php echo EDIT ?>" href="?serendipity[adminModule]=category&serendipity[adminAction]=edit&serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png') ?>" border="0" alt="<?php echo EDIT ?>" /></a></td>
+ <td width="16"><a title="<?php echo DELETE ?>" href="?serendipity[adminModule]=category&serendipity[adminAction]=delete&serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" border="0" alt="<?php echo DELETE ?>" /></a></td>
<td width="16"><?php if ( !empty($category['category_icon']) ) {?><img src="<?php echo serendipity_getTemplateFile('admin/img/thumbnail.png') ?>" alt="" /><?php } else echo ' ' ?></td>
<td width="300" style="padding-left: <?php echo ($category['depth']*15)+20 ?>px"><img src="<?php echo serendipity_getTemplateFile('admin/img/folder.png') ?>" style="vertical-align: bottom;"> <?php echo htmlspecialchars($category['category_name']) ?></td>
<td><?php echo htmlspecialchars($category['category_description']) ?></td>
@@ -285,7 +285,7 @@ if ( $serendipity['GET']['adminAction'] == 'view' ) {
} ?>
<tr>
<td colspan="6" align="right">
- <a href="?serendipity[adminModule]=category&serendipity[adminAction]=new" class="serendipityPrettyButton"><?php echo CREATE_NEW_CAT ?></a>
+ <a href="?serendipity[adminModule]=category&serendipity[adminAction]=new" class="serendipityPrettyButton input_button"><?php echo CREATE_NEW_CAT ?></a>
</td>
</tr>
</table>
diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php
index b343e48..64f38e0 100644
--- a/include/admin/comments.inc.php
+++ b/include/admin/comments.inc.php
@@ -278,19 +278,19 @@ function highlightComment(id, checkvalue) {
</tr>
<tr>
<td><?php echo AUTHOR ?>:</td>
- <td><input type="text" name="serendipity[filter][author]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['author']) ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[filter][author]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['author']) ?>" /></td>
<td><?php echo EMAIL ?>:</td>
- <td><input type="text" name="serendipity[filter][email]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['email']) ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[filter][email]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['email']) ?>" /></td>
<td><?php echo URL ?>:</td>
- <td><input type="text" name="serendipity[filter][url]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['url']) ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[filter][url]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['url']) ?>" /></td>
</tr>
<tr>
<td>IP:</td>
- <td><input type="text" name="serendipity[filter][ip]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['ip']) ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[filter][ip]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['ip']) ?>" /></td>
<td><?php echo CONTENT ?>:</td>
- <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['body']) ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[filter][body]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['body']) ?>" /></td>
<td><?php echo REFERER ?>:</td>
- <td><input type="text" name="serendipity[filter][referer]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['referer']) ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[filter][referer]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['referer']) ?>" /></td>
</tr>
<tr>
<td><?php echo COMMENTS; ?>:</td>
@@ -317,7 +317,7 @@ function highlightComment(id, checkvalue) {
</select></td>
</tr>
<tr>
- <td colspan="6" align="right"><input type="submit" name="submit" value=" - <?php echo GO ?> - " class="serendipityPrettyButton" /> <?php serendipity_plugin_api::hook_event('backend_comments_top', $sql); ?></td>
+ <td colspan="6" align="right"><input type="submit" name="submit" value=" - <?php echo GO ?> - " class="serendipityPrettyButton input_button" /> <?php serendipity_plugin_api::hook_event('backend_comments_top', $sql); ?></td>
</tr>
</table>
</form>
@@ -399,7 +399,7 @@ foreach ($sql as $rs) {
<td class="serendipity_admin_list_item <?php echo $class ?>" id="comment_<?php echo $comment['id'] ?>">
<table width="100%" cellspacing="0" cellpadding="3" border="0">
<tr>
- <td rowspan="3" width="20" align="center"><input type="checkbox" name="serendipity[delete][<?php echo $comment['id'] ?>]" value="<?php echo $comment['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $comment['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" /></td>
+ <td rowspan="3" width="20" align="center"><input class="input_checkbox" type="checkbox" name="serendipity[delete][<?php echo $comment['id'] ?>]" value="<?php echo $comment['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $comment['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" /></td>
<td width="40%"><strong><?php echo AUTHOR ?></strong>: <?php echo htmlspecialchars($comment['author']) . $comment['action_author']; ?></td>
<td><strong><?php echo EMAIL ?></strong>:
<?php
@@ -471,7 +471,7 @@ foreach ($sql as $rs) {
</tr>
<?php } ?>
<tr>
- <td><input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" class="serendipityPrettyButton" /> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?>" class="serendipityPrettyButton" /></td>
+ <td><input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" class="serendipityPrettyButton input_button" /> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?>" class="serendipityPrettyButton input_button" /></td>
</tr>
</table>
</form>
diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php
index 17b5407..433e448 100644
--- a/include/admin/entries.inc.php
+++ b/include/admin/entries.inc.php
@@ -138,7 +138,7 @@ function serendipity_drawList() {
?> </select>
</td>
<td valign="top" width="80"><?php echo CONTENT ?></td>
- <td valign="top"><input size="10" type="text" name="serendipity[filter][body]" value="<?php echo (isset($serendipity['GET']['filter']['body']) ? htmlspecialchars($serendipity['GET']['filter']['body']) : '') ?>" /></td>
+ <td valign="top"><input class="input_textbox" size="10" type="text" name="serendipity[filter][body]" value="<?php echo (isset($serendipity['GET']['filter']['body']) ? htmlspecialchars($serendipity['GET']['filter']['body']) : '') ?>" /></td>
</tr>
<tr>
<td class="serendipity_admin_filters_headline" colspan="6"><strong><?php echo SORT_ORDER ?></strong></td>
@@ -175,7 +175,7 @@ function serendipity_drawList() {
</td>
</tr>
<tr>
- <td align="right" colspan="6"><input type="submit" name="go" value="<?php echo GO ?>" class="serendipityPrettyButton" /></td>
+ <td align="right" colspan="6"><input type="submit" name="go" value="<?php echo GO ?>" class="serendipityPrettyButton input_button" /></td>
</tr>
</table>
</form>
@@ -251,7 +251,9 @@ function serendipity_drawList() {
$entry_pre .= ' ' . DRAFT . ': ';
}
?>
- <div class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($rows % 2 ? 'even' : 'uneven'); ?>">
+<!-- <div class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($rows % 2 ? 'even' : 'uneven'); ?>"> -->
+ <div class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($rows % 2) ? 'even' : 'uneven'; ?>">
+
<table width="100%" cellspacing="0" cellpadding="3">
<tr>
<td>
@@ -287,7 +289,7 @@ function serendipity_drawList() {
<?php } ?>
<a href="?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]=<?php echo $entry['id']; ?>" title="<?php echo EDIT . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
<a href="?<?php echo serendipity_setFormToken('url'); ?>&serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=delete&serendipity[id]=<?php echo $entry['id']; ?>" title="<?php echo DELETE . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
- <input type="checkbox" name="serendipity[multiDelete][]" value="<?php echo $entry['id']; ?>" />
+ <input class="input_checkbox" type="checkbox" name="serendipity[multiDelete][]" value="<?php echo $entry['id']; ?>" />
</td>
</tr>
</table>
@@ -313,8 +315,8 @@ function serendipity_drawList() {
<table class="serendipity_admin_list" cellpadding="0" width="100%">
<tr>
<td align="right">
- <input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" class="serendipityPrettyButton" />
- <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_ENTRIES ?>" class="serendipityPrettyButton" />
+ <input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" class="serendipityPrettyButton input_button" />
+ <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_ENTRIES ?>" class="serendipityPrettyButton input_button" />
</td>
</tr>
</table>
@@ -328,7 +330,7 @@ function serendipity_drawList() {
<input type="hidden" name="serendipity[action]" value="admin" />
<input type="hidden" name="serendipity[adminModule]" value="entries" />
<input type="hidden" name="serendipity[adminAction]" value="editSelect" />
- <?php echo EDIT_ENTRY ?>: #<input type="text" size="3" name="serendipity[id]" /> <input type="submit" name="serendipity[editSubmit]" value="<?php echo GO ?>" class="serendipityPrettyButton" />
+ <?php echo EDIT_ENTRY ?>: #<input class="input_textbox" type="text" size="3" name="serendipity[id]" /> <input type="submit" name="serendipity[editSubmit]" value="<?php echo GO ?>" class="serendipityPrettyButton input_button" />
</form>
</td>
</tr>
@@ -540,9 +542,9 @@ switch($serendipity['GET']['adminAction']) {
<br />
<br />
<div>
- <a href="<?php echo htmlspecialchars($_SERVER["HTTP_REFERER"]); ?>" class="serendipityPrettyButton"><?php echo NOT_REALLY; ?></a>
+ <a href="<?php echo htmlspecialchars($_SERVER["HTTP_REFERER"]); ?>" class="serendipityPrettyButton input_button"><?php echo NOT_REALLY; ?></a>
<?php echo str_repeat(' ', 10); ?>
- <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton"><?php echo DUMP_IT; ?></a>
+ <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton input_button"><?php echo DUMP_IT; ?></a>
</div>
<?php
break;
@@ -564,9 +566,9 @@ switch($serendipity['GET']['adminAction']) {
<br />
<br />
<div>
- <a href="<?php echo htmlspecialchars($_SERVER["HTTP_REFERER"]); ?>" class="serendipityPrettyButton"><?php echo NOT_REALLY; ?></a>
+ <a href="<?php echo htmlspecialchars($_SERVER["HTTP_REFERER"]); ?>" class="serendipityPrettyButton input_button "><?php echo NOT_REALLY; ?></a>
<?php echo str_repeat(' ', 10); ?>
- <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton"><?php echo DUMP_IT; ?></a>
+ <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton input_button"><?php echo DUMP_IT; ?></a>
</div>
<?php
break;
diff --git a/include/admin/export.inc.php b/include/admin/export.inc.php
index fd5af16..46c01d4 100644
--- a/include/admin/export.inc.php
+++ b/include/admin/export.inc.php
@@ -8,7 +8,7 @@ if (IN_serendipity !== true) {
?>
<div>
- <a href="<?php echo $serendipity['baseURL'] ?>rss.php?version=2.0&all=1" class="serendipityPrettyButton"><?php echo EXPORT_FEED; ?></a>
+ <a href="<?php echo $serendipity['baseURL'] ?>rss.php?version=2.0&all=1" class="serendipityPrettyButton input_button"><?php echo EXPORT_FEED; ?></a>
</div>
<?php
/* vim: set sts=4 ts=4 expandtab : */
diff --git a/include/admin/groups.inc.php b/include/admin/groups.inc.php
index 4b6d2a5..ef6b505 100644
--- a/include/admin/groups.inc.php
+++ b/include/admin/groups.inc.php
@@ -57,8 +57,8 @@ foreach($groups as $group) {
<table width="100%">
<tr>
<td><?php echo htmlspecialchars($group['name']); ?></td>
- <td width="200" align="right"> [<a href="?serendipity[adminModule]=groups&serendipity[adminAction]=edit&serendipity[group]=<?php echo $group['id'] ?>"><?php echo EDIT ?></a>]
- - [<a href="?serendipity[adminModule]=groups&serendipity[adminAction]=delete&serendipity[group]=<?php echo $group['id'] ?>"><?php echo DELETE ?></a>]</td>
+ <td width="200" align="right"> <a href="?serendipity[adminModule]=groups&serendipity[adminAction]=edit&serendipity[group]=<?php echo $group['id'] ?>" title="<?php echo EDIT . " " . $group['name']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT . " " . $group['name']; ?>" /><?php echo EDIT ?></a>
+ <a href="?<?php echo serendipity_setFormToken('url'); ?>&serendipity[adminModule]=groups&serendipity[adminAction]=delete&serendipity[group]=<?php echo $group['id'] ?>" title="<?php echo DELETE . " " . $group['name']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE . " " . $group['name']; ?>" /><?php echo DELETE ?></a></td>
</tr>
</table>
</div>
@@ -71,7 +71,7 @@ foreach($groups as $group) {
<tr>
<td colspan="3" align="right">
<form action="?serendipity[adminModule]=groups" method="post">
- <input type="submit" name="NEW" value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="NEW" value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton input_button" />
</form>
</td>
</tr>
@@ -103,11 +103,10 @@ if ($serendipity['GET']['adminAction'] == 'edit') {
}
?>
</h3>
-
<table>
<tr>
<td><?php echo NAME; ?></td>
- <td><input type="text" name="serendipity[name]" value="<?php echo htmlspecialchars($from['name']); ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[name]" value="<?php echo htmlspecialchars($from['name']); ?>" /></td>
</tr>
<tr>
<td valign="top"><?php echo USERCONF_GROUPS; ?></td>
@@ -172,7 +171,7 @@ foreach($allusers AS $user) {
} else {
echo "<tr>\n";
echo "<td>$indent<label for=\"" . htmlspecialchars($perm) . "\">" . htmlspecialchars($permname) . "</label></td>\n";
- echo '<td>' . $indentB . '<input id="' . htmlspecialchars($perm) . '" type="checkbox" name="serendipity[' . htmlspecialchars($perm) . ']" value="true" ' . $selected . ' /></td>' . "\n";
+ echo '<td>' . $indentB . '<input class="input_checkbox" id="' . htmlspecialchars($perm) . '" type="checkbox" name="serendipity[' . htmlspecialchars($perm) . ']" value="true" ' . $selected . ' /></td>' . "\n";
echo "</tr>\n";
}
}
@@ -233,11 +232,11 @@ foreach($allusers AS $user) {
<?php
if ($serendipity['GET']['adminAction'] == 'edit') { ?>
- <input type="submit" name="SAVE_EDIT" value="<?php echo SAVE; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="SAVE_EDIT" value="<?php echo SAVE; ?>" class="serendipityPrettyButton input_button" />
<?php echo ' - ' . WORD_OR . ' - ' ?>
- <input type="submit" name="SAVE_NEW" value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="SAVE_NEW" value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton input_button" />
<?php } else { ?>
- <input type="submit" name="SAVE_NEW" value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="SAVE_NEW" value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton input_button" />
<?php } ?>
</div>
@@ -252,8 +251,8 @@ if ($serendipity['GET']['adminAction'] == 'edit') { ?>
<br /><br />
<?php echo serendipity_setFormToken(); ?>
<input type="hidden" name="serendipity[group]" value="<?php echo $serendipity['GET']['group']; ?>" />
- <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" class="serendipityPrettyButton" />
- <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" class="serendipityPrettyButton input_button" />
+ <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" class="serendipityPrettyButton input_button" />
</div>
</form>
<?php
diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index 6f76f92..056be04 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -95,9 +95,9 @@ switch ($serendipity['GET']['adminAction']) {
?>
<form method="get" id="delete_image">
<div>
- <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton"><?php echo DUMP_IT ?></a>
+ <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton input_button"><?php echo DUMP_IT ?></a>
- <a href="<?php echo $abortLoc; ?>" class="serendipityPrettyButton"><?php echo ABORT_NOW ?></a>
+ <a href="<?php echo $abortLoc; ?>" class="serendipityPrettyButton input_button"><?php echo ABORT_NOW ?></a>
</div>
</form>
<?php
@@ -115,7 +115,7 @@ switch ($serendipity['GET']['adminAction']) {
if (!serendipity_moveMediaDirectory(null, $serendipity['GET']['newname'], 'file', $serendipity['GET']['fid'], $file)) {
?>
<br />
- <input type="button" onclick="history.go(-1);" value="<?php echo BACK; ?>" class="serendipityPrettyButton" />
+ <input type="button" onclick="history.go(-1);" value="<?php echo BACK; ?>" class="serendipityPrettyButton input_button" />
<?php
break;
}
@@ -413,7 +413,7 @@ switch ($serendipity['GET']['adminAction']) {
<table cellpadding="5">
<tr>
<td width="100"><strong><?php echo NAME ?></strong></td>
- <td><input type="text" name="serendipity[newDir]" value="<?php echo $use_dir; ?>" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[newDir]" value="<?php echo $use_dir; ?>" /></td>
</tr>
<tr>
<td><label for="read_authors"><?php echo PERM_READ; ?></label></td>
@@ -444,14 +444,14 @@ switch ($serendipity['GET']['adminAction']) {
</tr>
<tr>
<td>
- <input id="setchild" value="true" type="checkbox" name="serendipity[update_children]" <?php echo (!empty($serendipity['POST']['update_children']) == 'on' ? 'checked="checked"' : ''); ?> /> <label for="setchild"><?php echo PERM_SET_CHILD; ?></label>
+ <input class="input_checkbox" id="setchild" value="true" type="checkbox" name="serendipity[update_children]" <?php echo (!empty($serendipity['POST']['update_children']) == 'on' ? 'checked="checked"' : ''); ?> /> <label for="setchild"><?php echo PERM_SET_CHILD; ?></label>
<td>
</tr>
</table>
<br />
<br />
<div align="center">
- <input name="serendipity[save]" value="<?php echo SAVE ?>" class="serendipityPrettyButton" type="submit" />
+ <input name="serendipity[save]" value="<?php echo SAVE ?>" class="serendipityPrettyButton input_button" type="submit" />
</div>
</form>
@@ -476,14 +476,14 @@ switch ($serendipity['GET']['adminAction']) {
<td><?php echo basename(htmlspecialchars($serendipity['GET']['dir'])) ?></td>
</tr>
<tr>
- <td colspan="2"><input type="checkbox" name="serendipity[nuke]" value="true" style="margin: 0"> <?php echo FORCE_DELETE ?></td>
+ <td colspan="2"><input class="input_checkbox" type="checkbox" name="serendipity[nuke]" value="true" style="margin: 0"> <?php echo FORCE_DELETE ?></td>
</tr>
</table>
<br />
<br />
<div align="center">
<?php echo sprintf(CONFIRM_DELETE_DIRECTORY, htmlspecialchars($serendipity['GET']['dir'])) ?><br />
- <input name="SAVE" value="<?php echo DELETE_DIRECTORY ?>" class="serendipityPrettyButton" type="submit" />
+ <input name="SAVE" value="<?php echo DELETE_DIRECTORY ?>" class="serendipityPrettyButton input_button" type="submit" />
</div>
</form>
@@ -551,7 +551,7 @@ switch ($serendipity['GET']['adminAction']) {
<table cellpadding="5">
<tr>
<td><?php echo NAME ?></td>
- <td><input type="text" name="serendipity[name]" value="" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[name]" value="" /></td>
</tr>
<tr>
<td><?php echo PARENT_DIRECTORY ?></td>
@@ -564,7 +564,7 @@ switch ($serendipity['GET']['adminAction']) {
</td>
</tr>
</table>
- <div><input name="SAVE" value="<?php echo CREATE_DIRECTORY ?>" class="serendipityPrettyButton" type="submit"></div>
+ <div><input name="SAVE" value="<?php echo CREATE_DIRECTORY ?>" class="serendipityPrettyButton input_button" type="submit"></div>
</form>
<?php
break;
@@ -600,7 +600,7 @@ switch ($serendipity['GET']['adminAction']) {
<?php } ?>
</table>
<br />
- <div><a href="?serendipity[adminModule]=images&serendipity[adminAction]=directoryCreate" class="serendipityPrettyButton"><?php echo CREATE_NEW_DIRECTORY ?></a></div>
+ <div><a href="?serendipity[adminModule]=images&serendipity[adminAction]=directoryCreate" class="serendipityPrettyButton input_button"><?php echo CREATE_NEW_DIRECTORY ?></a></div>
<?php
break;
@@ -756,14 +756,14 @@ switch ($serendipity['GET']['adminAction']) {
<input type="hidden" name="serendipity[adminAction]" value="scale" />
<input type="hidden" name="serendipity[fid]" value="<?php echo $serendipity["GET"]["fid"]; ?>" />
- <input type="text" size="4" name="serendipity[width]" onchange="rescale('width' , value);" value="<?php echo $s[0]; ?>" />x
- <input type="text" size="4" name="serendipity[height]" onchange="rescale('height', value);" value="<?php echo $s[1]; ?>" />
+ <input class="input_textbox" type="text" size="4" name="serendipity[width]" onchange="rescale('width' , value);" value="<?php echo $s[0]; ?>" />x
+ <input class="input_textbox" type="text" size="4" name="serendipity[height]" onchange="rescale('height', value);" value="<?php echo $s[1]; ?>" />
<br />
<?php echo KEEP_PROPORTIONS; ?>:
<!-- <input type='button' value='preview'>-->
- <input type="checkbox" name="auto" checked="checked" /><br />
- <input type="button" name="scale" value="<?php echo IMAGE_RESIZE; ?>" onclick="if (confirm('<?php echo REALLY_SCALE_IMAGE; ?>')) document.serendipityScaleForm.submit();" class="serendipityPrettyButton" />
+ <input class="input_checkbox" type="checkbox" name="auto" checked="checked" /><br />
+ <input type="button" name="scale" value="<?php echo IMAGE_RESIZE; ?>" onclick="if (confirm('<?php echo REALLY_SCALE_IMAGE; ?>')) document.serendipityScaleForm.submit();" class="serendipityPrettyButton input_button" />
</div>
</form>
diff --git a/include/admin/import.inc.php b/include/admin/import.inc.php
index bbe6240..17bd3cb 100644
--- a/include/admin/import.inc.php
+++ b/include/admin/import.inc.php
@@ -220,7 +220,7 @@ if (isset($serendipity['GET']['importFrom']) && serendipity_checkFormToken()) {
</tr>
<?php } ?>
<tr>
- <td colspan="2" align="right"><input type="submit" value="<?php echo IMPORT_NOW ?>" class="serendipityPrettyButton"></td>
+ <td colspan="2" align="right"><input type="submit" value="<?php echo IMPORT_NOW ?>" class="serendipityPrettyButton input_button"></td>
</tr>
</table>
</form>
@@ -261,7 +261,7 @@ if (isset($serendipity['GET']['importFrom']) && serendipity_checkFormToken()) {
<option value="<?php echo $v ?>"><?php echo $k ?></option>
<?php } ?>
</select>
- <input type="submit" value="<?php echo GO ?>" class="serendipityPrettyButton">
+ <input type="submit" value="<?php echo GO ?>" class="serendipityPrettyButton input_button">
</form>
<?php
}
diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index fa0e7fd..54935ed 100644
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -445,7 +445,7 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
$config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE, null, array('simpleInstall'));
serendipity_printConfigTemplate($config, $from, true, false, false);
?>
- <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>" class="serendipityPrettyButton"></div>
+ <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>" class="serendipityPrettyButton input_button"></div>
</form>
<?php } elseif ( $serendipity['GET']['step'] == '2b' ) { ?>
@@ -456,7 +456,7 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
$config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
serendipity_printConfigTemplate($config, $from, true, false, false);
?>
- <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>" class="serendipityPrettyButton"></div>
+ <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>" class="serendipityPrettyButton input_button"></div>
</form>
<?php } elseif ( (int)$serendipity['GET']['step'] == 3 ) { ?>
diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php
index 82bcd48..6374b7e 100644
--- a/include/admin/overview.inc.php
+++ b/include/admin/overview.inc.php
@@ -29,8 +29,6 @@ $output = array(
serendipity_plugin_api::hook_event('backend_frontpage_display', $output);
-echo $output['welcome'];
-
if ($output['show_links']) {
echo '<div class="' . $output['links_css'] . '">' . "\n";
echo '<p>' . $output['links_title'] . '</p>' . "\n";
@@ -41,5 +39,5 @@ if ($output['show_links']) {
echo '</ul>' . "\n";
echo '</div>' . "\n";
}
-
-echo $output['more'];
+echo '<span class="serendipityWelcomeBack">' . $output['welcome'] . '</span>';
+echo $output['more'];
\ No newline at end of file
diff --git a/include/admin/personal.inc.php b/include/admin/personal.inc.php
index 36bb477..143b4ea 100644
--- a/include/admin/personal.inc.php
+++ b/include/admin/personal.inc.php
@@ -105,7 +105,7 @@ $from['groups'] = serendipity_getGroups($serendipity['authorid']);
unset($from['password']);
serendipity_printConfigTemplate($template, $from, true, false);
?>
- <div align="right"><input type="submit" name="SAVE" value="<?php echo SAVE; ?>" /></div>
+ <div align="right"><input class="serendipityPrettyButton input_button" type="submit" name="SAVE" value="<?php echo SAVE; ?>" /></div>
</form>
<?php
diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index 07a8763..53e7e17 100644
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -239,7 +239,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
<option value="ALL" <?php echo ($serendipity['GET']['only_group'] == 'ALL' ? 'selected="selected"' : ''); ?>><?php echo ALL_CATEGORIES; ?>
<option value="UPGRADE" <?php echo ($serendipity['GET']['only_group'] == 'UPGRADE' ? 'selected="selected"' : ''); ?>><?php echo WORD_NEW; ?>
</select>
- <input type="submit" value="<?php echo GO; ?>" />
+ <input class="serendipityPrettyButton input_button" type="submit" value="<?php echo GO; ?>" />
</form>
</td>
</tr>
diff --git a/include/admin/templates.inc.php b/include/admin/templates.inc.php
index 03cb813..bc773ce 100644
--- a/include/admin/templates.inc.php
+++ b/include/admin/templates.inc.php
@@ -108,7 +108,7 @@ if (is_array($template_config)) {
echo '<h3>' . SELECT_TEMPLATE . '</h3>';
?>
-<br /><br />
+<br />
<?php
$i = 0;
$stack = array();
@@ -135,8 +135,9 @@ echo '<h3>' . SELECT_TEMPLATE . '</h3>';
} elseif (!empty($info['preview_fullsizeURL'])) {
$preview .= '<a href="' . $info['preview_fullsizeURL'] . '" target="_blank">';
$preview_link = true;
- } else {
- #echo "No large preview";
+
+# } else {
+# echo "No large preview";
}
if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png')) {
@@ -162,13 +163,13 @@ echo '<h3>' . SELECT_TEMPLATE . '</h3>';
/* TODO: Smarty versioncheck */
- $class = (($i % 2) ? 'even' : 'uneven');
+ $class = (($i % 2 == 0) ? 'even' : 'uneven');
?>
<div class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo $class ?>">
<table width="100%" id="serendipity_theme_<?php echo $theme; ?>">
<tr>
- <td colspan="2"><strong><?php echo $info['name']; ?></strong></td>
+ <td colspan="2"><span class="serendipityTemplateSelectName"><strong><?php echo $info['name']; ?></strong></span></td>
<td valign="middle" align="center" width="70" rowspan="2">
<?php
if ( $serendipity['template'] != $theme ) {
@@ -176,7 +177,7 @@ echo '<h3>' . SELECT_TEMPLATE . '</h3>';
?>
<a href="?serendipity[adminModule]=templates&serendipity[adminAction]=install&serendipity[theme]=<?php echo $theme . $info['customURI']; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/install_now' . $info['customIcon'] . '.png') ?>" alt="<?php echo SET_AS_TEMPLATE ?>" title="<?php echo SET_AS_TEMPLATE ?>" border="0" /></a>
<?php } else { ?>
- <span style="color: #cccccc"><?php echo sprintf(UNMET_REQUIREMENTS, implode(', ', $unmetRequirements)); ?></span>
+ <span class="serendipityTemplateSelectUnmetRequirements">style="color: #cccccc"><?php echo sprintf(UNMET_REQUIREMENTS, implode(', ', $unmetRequirements)); ?></span>
<?php
}
} ?>
@@ -186,9 +187,9 @@ echo '<h3>' . SELECT_TEMPLATE . '</h3>';
<tr>
<td width="100" style="padding-left: 10px"><?php echo $preview; ?></td>
<td valign="top">
- <?php echo AUTHOR; ?>: <?php echo $info['author'];?><br />
- <?php echo LAST_UPDATED; ?>: <?php echo $info['date']; ?><br />
- <?php echo CUSTOM_ADMIN_INTERFACE; ?>: <?php echo $info['custom_admin_interface']; ?><br />
+ <span class="serendipityTemplateSelectDetails"><?php echo AUTHOR; ?>: <?php echo $info['author'];?></span><br />
+ <span class="serendipityTemplateSelectDetails"><?php echo LAST_UPDATED; ?>: <?php echo $info['date']; ?></span><br />
+ <span class="serendipityTemplateSelectDetails"><?php echo CUSTOM_ADMIN_INTERFACE; ?>: <?php echo $info['custom_admin_interface']; ?></span><br />
</td>
</tr>
</table>
diff --git a/include/admin/upgrader.inc.php b/include/admin/upgrader.inc.php
index c5010fa..bbf6bc7 100644
--- a/include/admin/upgrader.inc.php
+++ b/include/admin/upgrader.inc.php
@@ -370,10 +370,10 @@ if (($showAbort && $serendipity['GET']['action'] == 'ignore') || $serendipity['G
<hr noshade="noshade">
<?php if ($taskCount > 0 || sizeof($sqlfiles) > 0) { ?>
<strong><?php echo SERENDIPITY_UPGRADER_PROCEED_QUESTION ?></strong>
- <br /><br /><a href="<?php echo $upgradeLoc; ?>" class="serendipityPrettyButton"><?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?></a> <?php if ($showAbort) { ?><a href="<?php echo $abortLoc; ?>" class="serendipityPrettyButton"><?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?></a><?php } ?>
+ <br /><br /><a href="<?php echo $upgradeLoc; ?>" class="serendipityPrettyButton input_button"><?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?></a> <?php if ($showAbort) { ?><a href="<?php echo $abortLoc; ?>" class="serendipityPrettyButton"><?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?></a><?php } ?>
<?php } else { ?>
<strong><?php echo SERENDIPITY_UPGRADER_NO_UPGRADES ?></strong>
- <br /><br /><a href="<?php echo $upgradeLoc; ?>" class="serendipityPrettyButton"><?php echo SERENDIPITY_UPGRADER_CONSIDER_DONE ?></a>
+ <br /><br /><a href="<?php echo $upgradeLoc; ?>" class="serendipityPrettyButton input_button"><?php echo SERENDIPITY_UPGRADER_CONSIDER_DONE ?></a>
<?php }
}
}
diff --git a/include/admin/users.inc.php b/include/admin/users.inc.php
index b56fbb8..79b2048 100644
--- a/include/admin/users.inc.php
+++ b/include/admin/users.inc.php
@@ -202,8 +202,8 @@ if (is_array($users)) {
<?php /* TODO: Add username to list once tom figures out how to fix uneven rowstyles */ ?>
<td><img src="<?php echo $img ?>" alt="" style="border: 0px none ; vertical-align: bottom; display: inline;" /> <?php echo htmlspecialchars($user['realname']); ?></td>
<td width="100" align="center"><?php echo $user['userlevel']; ?></td>
- <td width="200" align="right"> [<a href="?serendipity[adminModule]=users&serendipity[adminAction]=edit&serendipity[userid]=<?php echo $user['authorid'] ?>#editform"><?php echo EDIT ?></a>]
- - [<a href="?serendipity[adminModule]=users&serendipity[adminAction]=delete&serendipity[userid]=<?php echo $user['authorid'] ?>"><?php echo DELETE ?></a>]</td>
+ <td width="200" align="right"> <a href="?serendipity[adminModule]=users&serendipity[adminAction]=edit&serendipity[userid]=<?php echo $user['authorid'] ?>#editform" title="<?php echo EDIT . " " . $user['realname']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT . " " . $user['realname']; ?>" /><?php echo EDIT ?></a>
+ <a href="?<?php echo serendipity_setFormToken('url'); ?>&serendipity[adminModule]=users&serendipity[adminAction]=delete&serendipity[userid]=<?php echo $user['authorid'] ?>" title="<?php echo DELETE . " " . $user['realname']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE . " " . $user['realname']; ?>" /><?php echo DELETE ?></a></td>
</tr>
</table>
</div>
@@ -218,7 +218,7 @@ if (is_array($users)) {
<tr>
<td colspan="3" align="right">
<form action="?serendipity[adminModule]=users" method="post">
- <input type="submit" name="NEW" value="<?php echo CREATE_NEW_USER; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="NEW" value="<?php echo CREATE_NEW_USER; ?>" class="serendipityPrettyButton input_button" />
</form>
</td>
</tr>
@@ -277,9 +277,9 @@ if (!empty($serendipity['GET']['userid'])) {
serendipity_printConfigTemplate($config, $from, true, false, true, true);
if ($serendipity['GET']['adminAction'] == 'edit') { ?>
- <input type="submit" name="SAVE_EDIT" value="<?php echo SAVE; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="SAVE_EDIT" value="<?php echo SAVE; ?>" class="serendipityPrettyButton input_button" />
<?php } else { ?>
- <input type="submit" name="SAVE_NEW" value="<?php echo CREATE_NEW_USER; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="SAVE_NEW" value="<?php echo CREATE_NEW_USER; ?>" class="serendipityPrettyButton input_button" />
<?php } ?>
</div>
@@ -298,8 +298,8 @@ if ($serendipity['GET']['adminAction'] == 'edit') { ?>
<br /><br />
<?php echo serendipity_setFormToken(); ?>
<input type="hidden" name="serendipity[user]" value="<?php echo $serendipity['GET']['userid']; ?>" />
- <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" class="serendipityPrettyButton" />
- <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" class="serendipityPrettyButton input_button" />
+ <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" class="serendipityPrettyButton input_button" />
</div>
</form>
<?php
diff --git a/include/functions_entries_admin.inc.php b/include/functions_entries_admin.inc.php
index 9d61d46..ed98782 100644
--- a/include/functions_entries_admin.inc.php
+++ b/include/functions_entries_admin.inc.php
@@ -200,7 +200,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
<td colspan="2">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td><input type="text" id="entryTitle" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlspecialchars($entry['title']) : ''; ?>" size="60" /></td>
+ <td><input class="input_textbox" type="text" id="entryTitle" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlspecialchars($entry['title']) : ''; ?>" size="60" /></td>
<td align="right">
<select name="serendipity[isdraft]">
<?php if ($_SESSION['serendipityRightPublish']) { ?><option value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option><?php } ?>
@@ -220,7 +220,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
</td>
<td>
<input type="hidden" name="serendipity[chk_timestamp]" value="<?php echo serendipity_serverOffsetHour(isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time()); ?>" />
- <input type="text" name="serendipity[new_timestamp]" id="serendipityNewTimestamp" value="<?php echo date(DATE_FORMAT_2, serendipity_serverOffsetHour(isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
+ <input class="input_textbox" type="text" name="serendipity[new_timestamp]" id="serendipityNewTimestamp" value="<?php echo date(DATE_FORMAT_2, serendipity_serverOffsetHour(isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
<a href="#" onclick="document.getElementById('serendipityNewTimestamp').value = '<?php echo date(DATE_FORMAT_2, serendipity_serverOffsetHour(time())) ?>'; return false;" title="<?php echo RESET_DATE_DESC ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/clock.png') ?>" border="0" style="vertical-align: text-top;" alt="<?php echo RESET_DATE ?>" /></a>
</td>
<td align="right">
@@ -381,24 +381,24 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
if (!$serendipity['wysiwyg'] && eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
?>
<script type="text/javascript" language="JavaScript">
- document.write('<input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<em>\',\'</em>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<strong>\',\'</strong>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<u>\',\'</u>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<blockquote>\',\'</blockquote>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<em>\',\'</em>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<strong>\',\'</strong>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<u>\',\'</u>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<blockquote>\',\'</blockquote>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
</script>
<?php
/* Do the "old" non-WYSIWYG editor */
} elseif (!$serendipity['wysiwyg']) { ?>
<script type="text/javascript" language="JavaScript">
- document.write('<input type="button" class="serendipityPrettyButton" value=" B " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'b\')">');
- document.write('<input type="button" class="serendipityPrettyButton" value=" U " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'u\')">');
- document.write('<input type="button" class="serendipityPrettyButton" value=" I " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'i\')">');
- document.write('<input type="button" class="serendipityPrettyButton" value="<img>" onclick="serendipity_insImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
- document.write('<input type="button" class="serendipityPrettyButton" value="<?php echo MEDIA; ?>" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no\');">');
- document.write('<input type="button" class="serendipityPrettyButton" value="Link" onclick="serendipity_insLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value=" B " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'b\')">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value=" U " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'u\')">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value=" I " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'i\')">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value="<img>" onclick="serendipity_insImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value="<?php echo MEDIA; ?>" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no\');">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value="Link" onclick="serendipity_insLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
</script>
<?php }
@@ -423,12 +423,12 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td align="left" width="70%">
- <input id="checkbox_allow_comments" type="checkbox" name="serendipity[allow_comments]" value="true" <?php echo $allow_comments; ?> /><label for="checkbox_allow_comments"><?php echo COMMENTS_ENABLE; ?></label><br />
- <input id="checkbox_moderate_comments" type="checkbox" name="serendipity[moderate_comments]" value="true" <?php echo $moderate_comments; ?> /><label for="checkbox_moderate_comments"><?php echo COMMENTS_MODERATE; ?></label>
+ <input class="input_checkbox" id="checkbox_allow_comments" type="checkbox" name="serendipity[allow_comments]" value="true" <?php echo $allow_comments; ?> /><label for="checkbox_allow_comments"><?php echo COMMENTS_ENABLE; ?></label><br />
+ <input class="input_checkbox" id="checkbox_moderate_comments" type="checkbox" name="serendipity[moderate_comments]" value="true" <?php echo $moderate_comments; ?> /><label for="checkbox_moderate_comments"><?php echo COMMENTS_MODERATE; ?></label>
</td>
<td align="right" rowspan="2" valign="middle" width="30%">
- <input accesskey="p" type="submit" value="- <?php echo PREVIEW; ?> -" class="serendipityPrettyButton" style="width: 150px" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';" /><br />
- <input accesskey="s" type="submit" onclick="return checkSave();" value="- <?php echo SAVE; ?> -" class="serendipityPrettyButton" style="width: 150px" />
+ <input accesskey="p" type="submit" value="- <?php echo PREVIEW; ?> -" class="serendipityPrettyButton input_button" style="width: 150px" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';" /><br />
+ <input accesskey="s" type="submit" onclick="return checkSave();" value="- <?php echo SAVE; ?> -" class="serendipityPrettyButton input_button" style="width: 150px" />
</td>
</tr>
</table>
@@ -450,22 +450,22 @@ if (!$serendipity['wysiwyg']) {
/* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
if (eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
?>
- <input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<em>','</em>')" />
- <input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<strong>','</strong>')" />
- <input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
- <input type="button" class="serendipityPrettyButton" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<blockquote>','</blockquote>')" />
- <input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
- <input type="button" class="serendipityPrettyButton" name="insImage" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
- <input type="button" class="serendipityPrettyButton" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<em>','</em>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<strong>','</strong>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<blockquote>','</blockquote>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insImage" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
<?php
/* Do the "old" non-WYSIWYG editor */
} else { ?>
- <input type="button" class="serendipityPrettyButton" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'b')">
- <input type="button" class="serendipityPrettyButton" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
- <input type="button" class="serendipityPrettyButton" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
- <input type="button" class="serendipityPrettyButton" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
- <input type="button" class="serendipityPrettyButton" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
- <input type="button" class="serendipityPrettyButton" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
+ <input type="button" class="serendipityPrettyButton input_button" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'b')">
+ <input type="button" class="serendipityPrettyButton input_button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
+ <input type="button" class="serendipityPrettyButton input_button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
+ <input type="button" class="serendipityPrettyButton input_button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
+ <input type="button" class="serendipityPrettyButton input_button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
+ <input type="button" class="serendipityPrettyButton input_button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
<?php
}
diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 5844afe..22c4285 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -379,20 +379,21 @@ function serendipity_replaceEmbeddedConfigVars ($s) {
* @param string The default value of the configuration item
* @return null
*/
+
function serendipity_guessInput($type, $name, $value='', $default='') {
global $serendipity;
switch ($type) {
case 'bool':
$value = serendipity_get_bool($value);
- echo '<input id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="true" ';
+ echo '<input class="input_radio" id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="true" ';
echo (($value == true) ? 'checked="checked"' : ''). ' /><label for="radio_cfg_' . $name . '_yes"> ' . YES . '</label> ';
- echo '<input id="radio_cfg_' . $name . '_no" type="radio" name="' . $name . '" value="false" ';
+ echo '<input class="input_radio" id="radio_cfg_' . $name . '_no" type="radio" name="' . $name . '" value="false" ';
echo (($value == true) ? '' : 'checked="checked"'). ' /><label for="radio_cfg_' . $name . '_no"> ' . NO . '</label>';
break;
case 'protected':
- echo '<input type="password" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
+ echo '<input class="input_textbox" type="password" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
break;
case 'multilist':
@@ -429,7 +430,7 @@ function serendipity_guessInput($type, $name, $value='', $default='') {
break;
case 'file':
- echo '<input type="file" size="30" name="' . $name . '" />';
+ echo '<input class="input_file" type="file" size="30" name="' . $name . '" />';
break;
case 'textarea':
@@ -437,7 +438,7 @@ function serendipity_guessInput($type, $name, $value='', $default='') {
break;
default:
- echo '<input type="text" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
+ echo '<input class="input_textbox" type="text" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
break;
}
}
@@ -605,7 +606,7 @@ function showConfigAll(count) {
if (!$noForm) {
?>
- <input type="submit" value="<?php echo CHECK_N_SAVE; ?>" class="serendipityPrettyButton" />
+ <input type="submit" value="<?php echo CHECK_N_SAVE; ?>" class="serendipityPrettyButton input_button" />
</div>
</form>
<?php
diff --git a/include/functions_plugins_admin.inc.php b/include/functions_plugins_admin.inc.php
index 39d7a18..70e8e28 100644
--- a/include/functions_plugins_admin.inc.php
+++ b/include/functions_plugins_admin.inc.php
@@ -210,7 +210,7 @@ function show_plugins($event_only = false, $sidebars = null)
<a href="#" id="grab<?php echo $css_key; ?>"></a>
</div>
<?php if ($is_plugin_editable) { ?>
- <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>" />
+ <input class="input_checkbox" type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>" />
<?php } ?>
<?php if ( $can_configure ) { ?>
@@ -245,8 +245,8 @@ function show_plugins($event_only = false, $sidebars = null)
</table>
<br />
<div>
- <input type="submit" name="REMOVE" title="<?php echo DELETE; ?>" value="<?php echo REMOVE_TICKED_PLUGINS; ?>" class="serendipityPrettyButton" />
- <input type="submit" name="SAVE" title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="REMOVE" title="<?php echo DELETE; ?>" value="<?php echo REMOVE_TICKED_PLUGINS; ?>" class="serendipityPrettyButton input_button" />
+ <input type="submit" name="SAVE" title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>" class="serendipityPrettyButton input_button" />
</div>
</form>
<?php
@@ -519,7 +519,7 @@ function serendipity_plugin_config(&$plugin, &$bag, &$name, &$desc, &$config_nam
<?php
}
?>
- <input class="direction_<?php echo $lang_direction; ?>" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[<?php echo $postKey; ?>][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo htmlspecialchars($radio['desc'][$radio_index]); ?>" />
+ <input class="direction_<?php echo $lang_direction; ?> input_radio" type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[<?php echo $postKey; ?>][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo $checked ?> title="<?php echo htmlspecialchars($radio['desc'][$radio_index]); ?>" />
<label for="serendipity_plugin_<?php echo $id; ?>"><?php echo htmlspecialchars($radio['desc'][$radio_index]); ?></label>
<?php
if ($counter == $per_row) {
@@ -544,7 +544,7 @@ function serendipity_plugin_config(&$plugin, &$bag, &$name, &$desc, &$config_nam
</td>
<td style="border-bottom: 1px solid #000000" width="250">
<div>
- <input class="direction_<?php echo $lang_direction; ?>" type="text" name="serendipity[<?php echo $postKey; ?>][<?php echo $config_item; ?>]" value="<?php echo $hvalue; ?>" size="30" />
+ <input class="direction_<?php echo $lang_direction; ?> input_textbox" type="text" name="serendipity[<?php echo $postKey; ?>][<?php echo $config_item; ?>]" value="<?php echo $hvalue; ?>" size="30" />
</div>
</td>
</tr>
@@ -633,7 +633,7 @@ EOS;
<div id="{$config_item}_preview" style="background-image: url($value); width:$preview_width; height: $preview_height;"> </div>
</td>
<td style="border-bottom: 1px solid #000000">
- <input type="text" id="serendipity[$postKey][$config_item]" name="serendipity[$postKey][$config_item]" value="$value" onchange="change_preview('$config_item')"/>
+ <input class="input_textbox" type="text" id="serendipity[$postKey][$config_item]" name="serendipity[$postKey][$config_item]" value="$value" onchange="change_preview('$config_item')"/>
<br /><a href="#" onclick="choose_media('serendipity[$postKey][$config_item]')">$media_link_text</a>
</td>
</tr>
@@ -666,7 +666,7 @@ EOS;
if ($showSubmit) {
?>
<div style="padding-left: 20px">
- <input type="submit" name="SAVECONF" value="<?php echo SAVE; ?>" class="serendipityPrettyButton" />
+ <input type="submit" name="SAVECONF" value="<?php echo SAVE; ?>" class="serendipityPrettyButton input_button" />
</div>
<?php
}
diff --git a/serendipity_admin.php b/serendipity_admin.php
index fa09c6a..fe45eec 100644
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -327,57 +327,58 @@ if ($use_installer) {
serendipity_plugin_api::hook_event('backend_login_page', $out);
?>
<td colspan="2" class="serendipityAdminContent">
- <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div>
+ <div id="serendipityAdminWelcome" align="center"><h2><?php echo WELCOME_TO_ADMIN ?></h2>
+ <h3><?php echo PLEASE_ENTER_CREDENTIALS ?></h3></div>
<?php echo $out['header']; ?>
- <br />
<?php if ($post_action != '' && !$is_logged_in ) { ?>
<div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
<?php } ?>
<form action="serendipity_admin.php" method="post">
<input type="hidden" name="serendipity[action]" value="admin" />
- <table cellspacing="10" cellpadding="0" border="0" align="center">
+ <table id="serendipityAdminCredentials" cellspacing="10" cellpadding="0" border="0" align="center">
<tr>
<td><?php echo USERNAME ?></td>
- <td><input type="text" name="serendipity[user]" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[user]" /></td>
</tr>
<tr>
<td><?php echo PASSWORD ?></td>
- <td><input type="password" name="serendipity[pass]" /></td>
+ <td><input class="input_textbox" type="password" name="serendipity[pass]" /></td>
</tr>
<tr>
- <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?></label></td>
+ <td colspan="2"><input class="input_checkbox" id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?></label></td>
</tr>
<tr>
- <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> >" class="serendipityPrettyButton" /></td>
+ <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> >" class="input_button serendipityPrettyButton" /></td>
</tr>
<?php echo $out['table']; ?>
</table>
</form>
<?php echo $out['footer']; ?>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a>
+ <p id="serendipityBackToBlog"><a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a></p>
<?php
} else {
if (!$no_sidebar) { ?>
<td id="serendipitySideBar">
- <ul class="serendipitySideBarMenu">
- <li><a href="serendipity_admin.php"><?php echo ADMIN_FRONTPAGE; ?></a></li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuMain">
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks"><a href="serendipity_admin.php"><?php echo ADMIN_FRONTPAGE; ?></a></li>
<?php if (serendipity_checkPermission('personalConfiguration')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks"><a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a></li>
<?php } ?>
</ul>
- <br />
- <ul class="serendipitySideBarMenu">
+ <br class="serendipitySideBarMenuSpacer" />
+
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
- <li class="serendipitySideBarMenuHead"><?php echo ADMIN_ENTRIES ?></li>
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks"><?php echo ADMIN_ENTRIES ?></li>
<?php if (serendipity_checkPermission('adminEntries')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminComments')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminCategories')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
<?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
@@ -386,58 +387,59 @@ if ($use_installer) {
</ul>
<?php if (serendipity_checkPermission('adminImages')) { ?>
- <ul class="serendipitySideBarMenu">
- <li class="serendipitySideBarMenuHead"><?php echo MEDIA; ?></li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuMedia">
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuMediaLinks"><?php echo MEDIA; ?></li>
<?php if (serendipity_checkPermission('adminImagesAdd')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminImagesView')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminImagesDirectories')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminImagesSync')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li>
<?php } ?>
<?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
</ul>
<?php } ?>
<?php if (serendipity_checkPermission('adminTemplates') || serendipity_checkPermission('adminPlugins')) { ?>
- <ul class="serendipitySideBarMenu">
- <li class="serendipitySideBarMenuHead"><?php echo APPEARANCE; ?></li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuAppearance">
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuAppearanceLinks"><?php echo APPEARANCE; ?></li>
<?php if (serendipity_checkPermission('adminTemplates')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminPlugins')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li>
<?php } ?>
<?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?>
</ul>
<?php } ?>
<?php if (serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration') || serendipity_checkPermission('adminUsers') || serendipity_checkPermission('adminUsersGroups') || serendipity_checkPermission('adminImport')) { ?>
- <ul class="serendipitySideBarMenu">
- <li class="serendipitySideBarMenuHead"><?php echo ADMIN; ?></li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuUserManagement">
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuUserManagementLinks"><?php echo ADMIN; ?></li>
<?php if (serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminUsers')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminUsersGroups')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=groups"><?php echo MANAGE_GROUPS; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=groups"><?php echo MANAGE_GROUPS; ?></a></li>
<?php } ?>
<?php if (serendipity_checkPermission('adminImport')) { ?>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li>
<?php } ?>
<?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?>
</ul>
<?php } ?>
- <br />
- <ul class="serendipitySideBarMenu">
- <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li>
+ <br class="serendipitySideBarMenuSpacer" />
+
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuLogout">
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks"><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks"><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li>
</ul>
</td>
@@ -450,7 +452,9 @@ if ($use_installer) {
</td>
</tr>
</table>
- <br />
+ <div class="serendipityAdminFooterSpacer">
+ <br />
+ </div>
<div id="serendipityAdminFooter">
<?php
if ($serendipity['expose_s9y']) {
diff --git a/templates/default/admin/entries.tpl b/templates/default/admin/entries.tpl
index 2d9f688..6bf7e91 100644
--- a/templates/default/admin/entries.tpl
+++ b/templates/default/admin/entries.tpl
@@ -14,12 +14,12 @@
{*** ENTRY TITLE, DRAFT START ***}
<tr>
<td>
- <b>{$CONST.TITLE}:</b>
+ <span><b>{$CONST.TITLE}:</b></span>
</td>
<td colspan="2">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td><input type="text" id="entryTitle" name="serendipity[title]" value="{$entry_vars.entry.title|@escape}" size="60" /></td>
+ <td><input class="input_textbox" type="text" id="entryTitle" name="serendipity[title]" value="{$entry_vars.entry.title|@escape}" size="60" /></td>
<td align="right">
<select name="serendipity[isdraft]">
{if $entry_vars.serendipityRightPublish}
@@ -43,7 +43,7 @@
</td>
<td>
<input type="hidden" name="serendipity[chk_timestamp]" value="{$entry_vars.timestamp}" />
- <input type="text" name="serendipity[new_timestamp]" id="serendipityNewTimestamp" value="{$entry_vars.timestamp|@formatTime:DATE_FORMAT_2:true:false:true}" />
+ <input class="input_textbox" type="text" name="serendipity[new_timestamp]" id="serendipityNewTimestamp" value="{$entry_vars.timestamp|@formatTime:DATE_FORMAT_2:true:false:true}" />
<a href="#" onclick="document.getElementById('serendipityNewTimestamp').value = '{$entry_vars.reset_timestamp|@formatTime:DATE_FORMAT_2:true:false:true}'; return false;" title="{$CONST.RESET_DATE_DESC}"><img src="{serendipity_getFile file='admin/img/clock.png'}" border="0" style="vertical-align: text-top;" alt="{$CONST.RESET_DATE}" /></a>
</td>
<td align="right">
@@ -89,22 +89,22 @@
<td align="right">
{if $entry_vars.wysiwyg_advanced}
<script type="text/javascript" language="JavaScript">
- document.write('<input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<em>\',\'</em>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<strong>\',\'</strong>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<u>\',\'</u>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insQ" value="{$CONST.QUOTE}" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<blockquote>\',\'</blockquote>\')" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insImage" value="{$CONST.MEDIA}" style="" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');" />');
- document.write('<input type="button" class="serendipityPrettyButton" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<em>\',\'</em>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<strong>\',\'</strong>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<u>\',\'</u>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insQ" value="{$CONST.QUOTE}" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<blockquote>\',\'</blockquote>\')" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insImage" value="{$CONST.MEDIA}" style="" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');" />');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
</script>
{else}
<script type="text/javascript" language="JavaScript">
- document.write('<input type="button" class="serendipityPrettyButton" value=" B " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'b\')">');
- document.write('<input type="button" class="serendipityPrettyButton" value=" U " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'u\')">');
- document.write('<input type="button" class="serendipityPrettyButton" value=" I " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'i\')">');
- document.write('<input type="button" class="serendipityPrettyButton" value="<img>" onclick="serendipity_insImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
- document.write('<input type="button" class="serendipityPrettyButton" value="{$CONST.MEDIA}" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no\');">');
- document.write('<input type="button" class="serendipityPrettyButton" value="Link" onclick="serendipity_insLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value=" B " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'b\')">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value=" U " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'u\')">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value=" I " onclick="serendipity_insBasic(document.forms[\'serendipityEntry\'][\'serendipity[body]\'], \'i\')">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value="<img>" onclick="serendipity_insImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value="{$CONST.MEDIA}" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[textarea]=body\', \'ImageSel\', \'width=800,height=600,toolbar=no\');">');
+ document.write('<input type="button" class="serendipityPrettyButton input_button" value="Link" onclick="serendipity_insLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
</script>
{/if}
{serendipity_hookPlugin hook="backend_entry_toolbar_extended" data=$entry_data.entry hookAll="true"}
@@ -130,12 +130,12 @@
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td align="left" width="70%">
- <input id="checkbox_allow_comments" type="checkbox" name="serendipity[allow_comments]" value="true" {if $entry_vars.allow_comments}checked="checked"{/if} /><label for="checkbox_allow_comments">{$CONST.COMMENTS_ENABLE}</label><br />
- <input id="checkbox_moderate_comments" type="checkbox" name="serendipity[moderate_comments]" value="true" {if $entry_vars.moderate_comments}checked="checked"{/if} /><label for="checkbox_moderate_comments">{$CONST.COMMENTS_MODERATE}</label>
+ <input class="input_checkbox" id="checkbox_allow_comments" type="checkbox" name="serendipity[allow_comments]" value="true" {if $entry_vars.allow_comments}checked="checked"{/if} /><label for="checkbox_allow_comments">{$CONST.COMMENTS_ENABLE}</label><br />
+ <input class="input_checkbox" id="checkbox_moderate_comments" type="checkbox" name="serendipity[moderate_comments]" value="true" {if $entry_vars.moderate_comments}checked="checked"{/if} /><label for="checkbox_moderate_comments">{$CONST.COMMENTS_MODERATE}</label>
</td>
<td align="right" rowspan="2" valign="middle" width="30%">
- <input accesskey="p" type="submit" value="- {$CONST.PREVIEW} -" class="serendipityPrettyButton" style="width: 150px" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';" /><br />
- <input accesskey="s" type="submit" onclick="return checkSave();" value="- {$CONST.SAVE} -" class="serendipityPrettyButton" style="width: 150px" />
+ <input accesskey="p" type="submit" value="- {$CONST.PREVIEW} -" class="serendipityPrettyButton input_button" style="width: 150px" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';" /><br />
+ <input accesskey="s" type="submit" onclick="return checkSave();" value="- {$CONST.SAVE} -" class="serendipityPrettyButton input_button" style="width: 150px" />
</td>
</tr>
</table>
@@ -157,20 +157,20 @@
{if NOT $entry_vars.wysiwyg}
<div id="tools_extended" style="display: none">
{if $entry_vars.wysiwyg_advanced}
- <input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<em>','</em>')" />
- <input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<strong>','</strong>')" />
- <input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
- <input type="button" class="serendipityPrettyButton" name="insQ" value="{$CONST.QUOTE}" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<blockquote>','</blockquote>')" />
- <input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
- <input type="button" class="serendipityPrettyButton" name="insImage" value="{$CONST.MEDIA}" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
- <input type="button" class="serendipityPrettyButton" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<em>','</em>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<strong>','</strong>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insQ" value="{$CONST.QUOTE}" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<blockquote>','</blockquote>')" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insImage" value="{$CONST.MEDIA}" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+ <input type="button" class="serendipityPrettyButton input_button" name="insURL" value="URL" accesskey="l" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
{else}
- <input type="button" class="serendipityPrettyButton" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'b')">
- <input type="button" class="serendipityPrettyButton" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
- <input type="button" class="serendipityPrettyButton" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
- <input type="button" class="serendipityPrettyButton" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
- <input type="button" class="serendipityPrettyButton" value="{$CONST.MEDIA}" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
- <input type="button" class="serendipityPrettyButton" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
+ <input type="button" class="serendipityPrettyButton input_button" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'b')">
+ <input type="button" class="serendipityPrettyButton input_button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
+ <input type="button" class="serendipityPrettyButton input_button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
+ <input type="button" class="serendipityPrettyButton input_button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
+ <input type="button" class="serendipityPrettyButton input_button" value="{$CONST.MEDIA}" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
+ <input type="button" class="serendipityPrettyButton input_button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
{/if}
{serendipity_hookPlugin hook="backend_entry_toolbar_extended" data=$entry_data.entry hookAll="true"}
</div>
diff --git a/templates/default/admin/index.tpl b/templates/default/admin/index.tpl
index 4a6bbe2..b3b02b3 100644
--- a/templates/default/admin/index.tpl
+++ b/templates/default/admin/index.tpl
@@ -79,69 +79,67 @@
{$admin_vars.out|@serendipity_refhookPlugin:'backend_login_page'}
<td colspan="2" class="serendipityAdminContent">
- <div align="center">{$CONST.WELCOME_TO_ADMIN}<br />
- {$CONST.PLEASE_ENTER_CREDENTIALS}
- {$admin_vars.out.header}
+ <div id="serendipityAdminWelcome" align="center">
+ <h2>{$CONST.WELCOME_TO_ADMIN}</h2>
+ <h3>{$CONST.PLEASE_ENTER_CREDENTIALS}</h3>
+ {$admin_vars.out.header}
</div>
- <br />
-
{if $admin_vars.post_action != '' AND NOT $admin_vars.is_logged_in}
- <div class="serendipityAdminMsgError">{$CONST.WRONG_USERNAME_OR_PASSWORD}</div>
+ <div class="serendipityAdminMsgError">{$CONST.WRONG_USERNAME_OR_PASSWORD}</div>
{/if}
-
<form action="serendipity_admin.php" method="post">
<input type="hidden" name="serendipity[action]" value="admin" />
- <table cellspacing="10" cellpadding="0" border="0" align="center">
+ <table id="serendipityAdminCredentials" cellspacing="10" cellpadding="0" border="0" align="center">
<tr>
<td>{$CONST.USERNAME}</td>
- <td><input type="text" name="serendipity[user]" /></td>
+ <td><input class="input_textbox" type="text" name="serendipity[user]" /></td>
</tr>
<tr>
<td>{$CONST.PASSWORD}</td>
- <td><input type="password" name="serendipity[pass]" /></td>
+ <td><input class="input_textbox" type="password" name="serendipity[pass]" /></td>
</tr>
<tr>
- <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> {$CONST.AUTOMATIC_LOGIN}</label></td>
+ <td colspan="2"><input class="input_checkbox" id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> {$CONST.AUTOMATIC_LOGIN}</label></td>
</tr>
<tr>
- <td colspan="2" align="right"><input type="submit" name="submit" value="{$CONST.LOGIN} >" class="serendipityPrettyButton" /></td>
+ <td colspan="2" align="right"><input type="submit" name="submit" value="{$CONST.LOGIN} >" class="input_button serendipityPrettyButton" /></td>
</tr>
{$admin_vars.out.table}
</table>
</form>
{$admin_vars.out.footer}
- <a href="{$serendipityHTTPPath}">{$CONST.BACK_TO_BLOG}</a>
+ <p id="serendipityBackToBlog"><a href="{$serendipityHTTPPath}">{$CONST.BACK_TO_BLOG}</a></p>
{*** LOGIN-AREA END ***}
{else}
{*** SIDEBAR-MENU START ***}
{if NOT $admin_vars.no_sidebar}
<td id="serendipitySideBar">
+
{*** MAIN LINKS START ***}
- <ul class="serendipitySideBarMenu">
- <li><a href="serendipity_admin.php">{$CONST.ADMIN_FRONTPAGE}</a></li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuMain">
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks"><a href="serendipity_admin.php">{$CONST.ADMIN_FRONTPAGE}</a></li>
{if 'personalConfiguration'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=personal">{$CONST.PERSONAL_SETTINGS}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks"><a href="serendipity_admin.php?serendipity[adminModule]=personal">{$CONST.PERSONAL_SETTINGS}</a></li>
{/if}
</ul>
+ <br class="serendipitySideBarMenuSpacer" />
{*** MAIN LINKS END ***}
- <br />
-
{*** ENTRY LINKS START ***}
- <ul class="serendipitySideBarMenu">
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
{if 'adminEntries'|checkPermission OR 'adminEntriesPlugins'|checkPermission}
- <li class="serendipitySideBarMenuHead">{$CONST.ADMIN_ENTRIES}</li>
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks">{$CONST.ADMIN_ENTRIES}</li>
{if 'adminEntries'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new">{$CONST.NEW_ENTRY}</a></li>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect">{$CONST.EDIT_ENTRIES}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new">{$CONST.NEW_ENTRY}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect">{$CONST.EDIT_ENTRIES}</a></li>
{/if}
{if 'adminComments'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=comments">{$CONST.COMMENTS}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=comments">{$CONST.COMMENTS}</a></li>
{/if}
{if 'adminCategories'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=view">{$CONST.CATEGORIES}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=view">{$CONST.CATEGORIES}</a></li>
{/if}
{if 'adminEntries'|checkPermission OR 'adminEntriesPlugins'|checkPermission}
@@ -153,19 +151,19 @@
{*** MEDIA LINKS START ***}
{if 'adminImages'|checkPermission}
- <ul class="serendipitySideBarMenu">
- <li class="serendipitySideBarMenuHead">{$CONST.MEDIA}</li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuMedia">
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuMediaLinks">{$CONST.MEDIA}</li>
{if 'adminImagesAdd'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect">{$CONST.ADD_MEDIA}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect">{$CONST.ADD_MEDIA}</a></li>
{/if}
{if 'adminImagesView'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media">{$CONST.MEDIA_LIBRARY}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media">{$CONST.MEDIA_LIBRARY}</a></li>
{/if}
{if 'adminImagesDirectories'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect">{$CONST.MANAGE_DIRECTORIES}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect">{$CONST.MANAGE_DIRECTORIES}</a></li>
{/if}
{if 'adminImagesSync'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('{$CONST.WARNING_THIS_BLAHBLAH}');">{$CONST.CREATE_THUMBS}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('{$CONST.WARNING_THIS_BLAHBLAH}');">{$CONST.CREATE_THUMBS}</a></li>
{/if}
{if $admin_vars.no_create !== true} {serendipity_hookPlugin hook="backend_sidebar_entries_images" hookAll="true"}{/if}
</ul>
@@ -174,13 +172,13 @@
{*** APPEARANCE START ***}
{if 'adminTemplates'|checkPermission OR 'adminPlugins'|checkPermission}
- <ul class="serendipitySideBarMenu">
- <li class="serendipitySideBarMenuHead">{$CONST.APPEARANCE}</li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuAppearance">
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuAppearanceLinks">{$CONST.APPEARANCE}</li>
{if 'adminTemplates'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=templates">{$CONST.MANAGE_STYLES}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=templates">{$CONST.MANAGE_STYLES}</a></li>
{/if}
{if 'adminPlugins'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins">{$CONST.CONFIGURE_PLUGINS}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=plugins">{$CONST.CONFIGURE_PLUGINS}</a></li>
{/if}
{if $admin_vars.no_create !== true} {serendipity_hookPlugin hook="backend_sidebar_admin_appearance" hookAll="true"}{/if}
</ul>
@@ -189,20 +187,20 @@
{*** USER MANAGEMENT START ***}
{if 'adminUsersGroups'|checkPermission OR 'adminImport'|checkPermission OR 'siteConfiguration'|checkPermission OR 'blogConfiguration'|checkPermission OR 'adminUsers'|checkPermission}
- <ul class="serendipitySideBarMenu">
- <li class="serendipitySideBarMenuHead">{$CONST.ADMIN}</li>
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuUserManagement">
+ <li class="serendipitySideBarMenuHead serendipitySideBarMenuUserManagementLinks">{$CONST.ADMIN}</li>
{if 'siteConfiguration'|checkPermission OR 'blogConfiguration'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration">{$CONST.CONFIGURATION}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=configuration">{$CONST.CONFIGURATION}</a></li>
{/if}
{if 'adminUsers'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=users">{$CONST.MANAGE_USERS}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=users">{$CONST.MANAGE_USERS}</a></li>
{/if}
{if 'adminUsersGroups'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=groups">{$CONST.MANAGE_GROUPS}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=groups">{$CONST.MANAGE_GROUPS}</a></li>
{/if}
{if 'adminImport'|checkPermission}
- <li><a href="serendipity_admin.php?serendipity[adminModule]=import">{$CONST.IMPORT_ENTRIES}</a></li>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=export">{$CONST.EXPORT_ENTRIES}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=import">{$CONST.IMPORT_ENTRIES}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=export">{$CONST.EXPORT_ENTRIES}</a></li>
{/if}
{if $admin_vars.no_create !== true} {serendipity_hookPlugin hook="backend_sidebar_admin" hookAll="true"}{/if}
</ul>
@@ -210,10 +208,10 @@
{*** USER MANAGEMENT END ***}
{*** LOGOUT START ***}
- <br />
- <ul class="serendipitySideBarMenu">
- <li><a href="{$serendipityBaseURL}">{$CONST.BACK_TO_BLOG}</a></li>
- <li><a href="serendipity_admin.php?serendipity[adminModule]=logout">{$CONST.LOGOUT}</a></li>
+ <br class="serendipitySideBarMenuSpacer" />
+ <ul class="serendipitySideBarMenu serendipitySideBarMenuLogout">
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks"><a href="{$serendipityBaseURL}">{$CONST.BACK_TO_BLOG}</a></li>
+ <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks"><a href="serendipity_admin.php?serendipity[adminModule]=logout">{$CONST.LOGOUT}</a></li>
</ul>
{*** LOGOUT END ***}
@@ -230,11 +228,12 @@
</td>
</tr>
</table>
-
- <br />
+ <div class="serendipityAdminFooterSpacer">
+ <br />
+ </div>
<div id="serendipityAdminFooter">
{$admin_vars.version_info}
- </div>
+ </div>
</body>
<!-- ADMIN-ENTRY TEMPLATE: index.tpl END -->
</html>
\ No newline at end of file
diff --git a/templates/default/admin/media_choose.tpl b/templates/default/admin/media_choose.tpl
index 00c451b..b580474 100644
--- a/templates/default/admin/media_choose.tpl
+++ b/templates/default/admin/media_choose.tpl
@@ -206,29 +206,32 @@
{else}
<b>{$CONST.IMAGE_SIZE}:</b>
<br />
- <input id="radio_link_no" type="radio" name="serendipity[linkThumbnail]" value="no" {'linkThumbnail'|@ifRemember:'no':true} /><label for="radio_link_no">{$CONST.I_WANT_THUMB}</label><br />
- <input id="radio_link_yes" type="radio" name="serendipity[linkThumbnail]" value="yes" {'linkThumbnail'|@ifRemember:'yes'} /><label for="radio_link_yes">{$CONST.I_WANT_BIG_IMAGE}</label><br />
+ <input class="input_radio" id="radio_link_no" type="radio" name="serendipity[linkThumbnail]" value="no" {'linkThumbnail'|@ifRemember:'no':true} /><label for="radio_link_no">{$CONST.I_WANT_THUMB}</label><br />
+ <input class="input_radio" id="radio_link_yes" type="radio" name="serendipity[linkThumbnail]" value="yes" {'linkThumbnail'|@ifRemember:'yes'} /><label for="radio_link_yes">{$CONST.I_WANT_BIG_IMAGE}</label><br />
{serendipity_hookPlugin hookAll=true hook='frontend_image_selector_imagesize' eventData=$media.file}
<br />
{if NOT $media.filename_only}
<b>{$CONST.IMAGE_ALIGNMENT}:</b>
<br />
- <input type="radio" name="serendipity[align]" {'align'|@ifRemember:''} value="" /> <img src="{serendipity_getFile file='img/img_align_top.png'}" vspace="5" /><br />
- <input type="radio" name="serendipity[align]" {'align'|@ifRemember:'left':true} value="left" /> <img src="{serendipity_getFile file='img/img_align_left.png'}" vspace="5" /><br />
- <input type="radio" name="serendipity[align]" {'align'|@ifRemember:'right'} value="right" /><img src="{serendipity_getFile file='img/img_align_right.png'}" vspace="5" /><br />
+
+ <input class="input_radio" type="radio" name="serendipity[align]" {'align'|@ifRemember:''} value="" /> <img src="{serendipity_getFile file='img/img_align_top.png'}" vspace="5" /><br />
+ <input class="input_radio" type="radio" name="serendipity[align]" {'align'|@ifRemember:'left':true} value="left" /> <img src="{serendipity_getFile file='img/img_align_left.png'}" vspace="5" /><br />
+ <input class="input_radio" type="radio" name="serendipity[align]" {'align'|@ifRemember:'right'} value="right" /><img src="{serendipity_getFile file='img/img_align_right.png'}" vspace="5" /><br />
{serendipity_hookPlugin hookAll=true hook='frontend_image_selector_imagealign' eventData=$media.file}
<br />
<b>{$CONST.IMAGE_AS_A_LINK}:</b>
<br />
- <input id="radio_islink_yes" type="radio" name="serendipity[isLink]" value="yes" {'isLink'|@ifRemember:'yes':true} /><label for="radio_islink_yes"> {$CONST.I_WANT_NO_LINK}</label><br />
- <input id="radio_islink_no" type="radio" name="serendipity[isLink]" value="no" {'isLink'|@ifRemember:'no'} /><label for="radio_islink_no"> {$CONST.I_WANT_IT_TO_LINK}</label>
+
+ <input class="input_radio" type="radio" id="radio_islink_yes" type="radio" name="serendipity[isLink]" value="yes" {'isLink'|@ifRemember:'yes':true} /><label for="radio_islink_yes"> {$CONST.I_WANT_NO_LINK}</label><br />
+ <input class="input_radio" type="radio" id="radio_islink_no" type="radio" name="serendipity[isLink]" value="no" {'isLink'|@ifRemember:'no'} /><label for="radio_islink_no"> {$CONST.I_WANT_IT_TO_LINK}</label>
{if $media.file.hotlink}
- <input type="text" name="serendipity[url]" size="30" value="{$media.file.path}" /><br />
+
+ <input class="input_textbox" type="text" name="serendipity[url]" size="30" value="{$media.file.path}" /><br />
{else}
{serendipity_hookPlugin hookAll=true hook='frontend_image_selector_link_url' eventData=$media.file.links}
- <input type="text" name="serendipity[url]" size="30" value="{$media.file.links.imagelinkurl}" /><br />
+ <input class="input_textbox" type="text" name="serendipity[url]" size="30" value="{$media.file.links.imagelinkurl}" /><br />
{/if}
<label id="select_image_target">{$CONST.MEDIA_TARGET}</label>
@@ -251,9 +254,8 @@
{/if}
{serendipity_hookPlugin hookAll=true hook='frontend_image_selector_more' eventData=$media.file}
-
- <input type="button" value="{$CONST.BACK}" onclick="history.go(-1);" />
- <input type="button" value="{$CONST.DONE}" onclick="rememberOptions(); {$media.file.origfinishJSFunction}" />
+ <input class="serendipityPrettyButton input_button" type="button" value="{$CONST.BACK}" onclick="history.go(-1);" />
+ <input class="serendipityPrettyButton input_button" type="button" value="{$CONST.DONE}" onclick="rememberOptions(); {$media.file.origfinishJSFunction}" />
{serendipity_hookPlugin hookAll=true hook='frontend_image_selector_submit' eventData=$media.file}
{/if}
</div>
@@ -294,8 +296,8 @@
<div id="footerContainer">
<div id="footer">
- <p><a id="newdirlink" target="media" class="serendipityPrettyButton" href="{$serendipityHTTPPath}serendipity_admin_image_selector.php?serendipity[step]=directoryCreate">{$CONST.WORD_NEW}</a></p>
- <p><a id="managedirlink" target="media" class="serendipityPrettyButton" href="{$serendipityHTTPPath}serendipity_admin_image_selector.php?serendipity[step]=default&serendipity[adminModule]=images&serendipity[adminAction]=directorySelect">{$CONST.MANAGE_DIRECTORIES}</a></p>
+ <p><a id="newdirlink" target="media" class="serendipityPrettyButton input_button" href="{$serendipityHTTPPath}serendipity_admin_image_selector.php?serendipity[step]=directoryCreate">{$CONST.WORD_NEW}</a></p>
+ <p><a id="managedirlink" target="media" class="serendipityPrettyButton input_button" href="{$serendipityHTTPPath}serendipity_admin_image_selector.php?serendipity[step]=default&serendipity[adminModule]=images&serendipity[adminAction]=directorySelect">{$CONST.MANAGE_DIRECTORIES}</a></p>
</div>
</div>
diff --git a/templates/default/admin/media_imgedit.tpl b/templates/default/admin/media_imgedit.tpl
new file mode 100644
index 0000000..52f0889
--- /dev/null
+++ b/templates/default/admin/media_imgedit.tpl
@@ -0,0 +1,57 @@
+ <div id="imgedit">
+ <form class="nospace" method="post" action="{$imgedit.my_url}" onsubmit="imgedit_getCoordinates()">
+ <div class="smallcaps center">
+ <input class="specialbutton" type="submit" name="crop" value="Crop this image! I'm serious!" />
+ <div id="scaletext">
+ <span>OR</span> <input class="specialbutton" type="submit" onclick="return imgedit_autoSize('true');" name="scale" value="Just get that crap somehow inside, will ya? (Equals to: Fit image to largest side)" />
+ </div>
+ </div>
+
+ <input type="hidden" id="area_orientation" name="area_orientation" value="{$imgedit.area_orientation}" />
+ <input type="hidden" id="zoombox_factor" name="zoombox_factor" value="{$imgedit.zoombox_factor}" />
+ <input type="hidden" id="zoombox_x" name="zoombox_x" value="{$imgedit.zoombox_x}" />
+ <input type="hidden" id="zoombox_y" name="zoombox_y" value="{$imgedit.zoombox_y}" />
+ <input type="hidden" id="real_img_width" name="real_img_width" value="{$imgedit.real_img_width}" />
+ <input type="hidden" id="real_img_height" name="real_img_height" value="{$imgedit.real_img_height}" />
+ <input type="hidden" id="autoguess_clicked" name="autoguess_clicked" value="{$imgedit.autoguess_clicked}" />
+
+ <div id="zoom">
+ <div class="smallcaps">
+ <input type="submit" name="action[enlarge]" onclick="return imgedit_zoom(-2); this.blur();" value="Enlarge" class="button" />
+ </div>
+
+ <script language="JavaScript" type="text/javascript">
+ document.write('<div id="zoomslider"><img id="zoombutton" src="{serendipity_getFile file="admin/img/imgedit_slider.gif"}" width="25" height="5" alt="[Slider]" /></div>');
+ </script>
+
+ <noscript>
+ <div class="smallcaps">Zoom: {$imgedit.zoombox_factor}x</div>
+ </noscript>
+
+ <div class="smallcaps"><input type="submit" name="action[reduce]" onclick="return imgedit_zoom(2); this.blur();" value="Reduce" class="button" /></div>
+ <div class="smallcaps"><input type="submit" name="autoscale" onclick="return imgedit_autoSize('false');" value="Best Guess" class="button" /></div>
+
+ <!-- BEGIN ORIENTATION_AVAILABLE -->
+ <div class="smallcaps"><input type="image" name="toggle_area_orientation" onclick="return imgedit_areaOrientation();" title="Toggle Orientation" alt="Toggle Orientation" src="{serendipity_getFile file="admin/img/imgedit_orientation.gif"}" /></div>
+ <!-- END ORIENTATION_AVAILABLE -->
+ <noscript>
+ <br />
+ <input class="button" type="submit" name="action[moveup]" onclick="this.blur();" value="^" /><br />
+ <input class="button" type="submit" name="action[moveleft]" onclick="this.blur();" value="<" />
+ <input class="button" type="submit" name="action[moveright]" onclick="this.blur();" value=">" /><br />
+ <input class="button" type="submit" name="action[movedown]" onclick="this.blur();" value="V" /><br />
+ <span class="smallcaps">Move by <input class="button small" type="text" name="move_increase" value="{$imgedit.move_increase}" />px</span>
+ </noscript>
+ </div>
+
+ <div id="outer">
+ <img id="backdrop" src="{$imgedit.http_img_name}" alt="Backdrop" width="{$imgedit.img_width}" height="{$imgedit.img_height}" />
+ <img id="overlay" src="{$imgedit.http_img_name}" alt="Overlay" width="{$imgedit.img_width}" height="{$imgedit.img_height}" />
+ <img id="harea" src="{$imgedit.harea_img_name}" alt="[Crop area]" width="{$imgedit.harea_width}" height="{$imgedit.harea_height}" />
+ <img id="varea" src="{$imgedit.varea_img_name}" alt="[Crop area]" width="{$imgedit.varea_width}" height="{$imgedit.varea_height}" />
+ </div>
+ </form>
+ </div>
+ <script language="JavaScript" type="text/javascript">imgedit_init({$imgedit.zoombox_width}, {$imgedit.area_border}, {$imgedit.zoombox_x}, {$imgedit.zoombox_y}, '{$imgedit.area_orientation}');</script>
+ </body>
+</html>
\ No newline at end of file
diff --git a/templates/default/admin/media_imgedit_done.tpl b/templates/default/admin/media_imgedit_done.tpl
new file mode 100644
index 0000000..c92eabc
--- /dev/null
+++ b/templates/default/admin/media_imgedit_done.tpl
@@ -0,0 +1,37 @@
+ <fieldset class="info" id="fs_info">
+ <legend>Output Information</legend>
+
+ Your image was {$imgedit.real_img_width} x {$imgedit.real_img_height} pixels (Orientation: {$imgedit.area_orientation}).<br />
+ Depending on your zoom of {$imgedit.zoombox_factor}x, it was {$imgedit.zoom_img_width} x {$imgedit.zoom_img_height} pixels.<br />
+ It got scaled to {$imgedit.img_width} x {$imgedit.img_height} pixels.<br />
+ Then a rectangle starting from ({$imgedit.slice_from_x}|{$imgedit.slice_from_y}) to ({$imgedit.slice_to_x}|{$imgedit.slice_to_y}) has been sliced from it.<br />
+ <br />
+
+ {if $imgedit.image_cut}
+ The image has been correctly cropped and only the part inside of the rectangle is going to be shown.
+ {/if}
+
+ {if $imgedit.image_no_cut}
+ Because the source dimensions were smaller than the destination dimensions, the image does not fill up the complete space.
+ {/if}
+
+ {if $imgedit.image_error}
+ <span class="error">However, there were errors processing your image.</span>
+ {/if}
+ </fieldset>
+
+ <fieldset class="info" style="height: 200px">
+ <legend>Image Result</legend>
+
+ Cropped Image:<br />
+
+ <div id="outer">
+ <img id="cropimage" alt="Cropped image" src="{$imgedit.http_img_name}?{$imgedit.refresh_line}" width="{$imgedit.img_width}" height="{$imgedit.img_height}" class="crop" />
+ </div>
+ </fieldset>
+
+ <fieldset class="info">
+ <legend>Play it again, Sam</legend>
+
+ That was great! So, please once more, with feeling!.
+ </fieldset>
\ No newline at end of file
diff --git a/templates/default/admin/media_items.tpl b/templates/default/admin/media_items.tpl
index 3b5692e..1b39b8c 100644
--- a/templates/default/admin/media_items.tpl
+++ b/templates/default/admin/media_items.tpl
@@ -74,7 +74,7 @@
{elseif $prop_content.type == 'readonly'}
<div>{$prop_content.val|@escape}</div>
{elseif $prop_content.type == 'input'}
- <input id="mediaProperty{$prop_fieldname}" type="text" name="serendipity[mediaProperties][{$mediakey}][{$prop_content.title}]" value="{$prop_content.val|@escape}" />
+ <input class="input_textbox" id="mediaProperty{$prop_fieldname}" type="text" name="serendipity[mediaProperties][{$mediakey}][{$prop_content.title}]" value="{$prop_content.val|@escape}" />
{/if}
</div>
{/foreach}
@@ -92,7 +92,7 @@
{/if}
{if $file.is_image}
<div>
- <br /><a target="_blank" class="serendipityPrettyButton" href="serendipity_admin_image_selector.php?serendipity[adminModule]=images&serendipity[adminAction]=imgedit&serendipity[fid]={$file.id}">{$CONST.EDIT}</a>
+ <br /><a target="_blank" class="serendipityPrettyButton input_button" href="serendipity_admin_image_selector.php?serendipity[adminModule]=images&serendipity[adminAction]=imgedit&serendipity[fid]={$file.id}">{$CONST.EDIT}</a>
</div>
{/if}
</div>
@@ -105,7 +105,7 @@
{foreach from=$keyword_cells key="keyword_cell" item="keyword"}
<td>
{if $keyword.name}
- <input id="mediaKeyword{$keyword.name}{$mediakey}" type="checkbox" name="serendipity[mediaKeywords][{$mediakey}][{$keyword.name}]" value="true" {if $keyword.selected}checked="checked"{/if} /> <label for="mediaKeyword{$keyword.name}{$mediakey}">{$keyword.name}</label>
+ <input class="input_checkbox" id="mediaKeyword{$keyword.name}{$mediakey}" type="checkbox" name="serendipity[mediaKeywords][{$mediakey}][{$keyword.name}]" value="true" {if $keyword.selected}checked="checked"{/if} /> <label for="mediaKeyword{$keyword.name}{$mediakey}">{$keyword.name}</label>
{else}
{/if}
diff --git a/templates/default/admin/media_pane.tpl b/templates/default/admin/media_pane.tpl
index 96e55ea..1fff94a 100644
--- a/templates/default/admin/media_pane.tpl
+++ b/templates/default/admin/media_pane.tpl
@@ -41,8 +41,8 @@
</select>
</td>
<td>{$CONST.SORT_ORDER_NAME}</td>
- <td><input type="text" name="serendipity[only_filename]" value="{$media.only_filename|@escape}" /></td>
- <td colspan="2"><a href="#" class="serendipityPrettyButton" onclick="showFilters(); return false">» {$CONST.FILTERS}</a></td>
+ <td><input class="input_textbox" type="text" name="serendipity[only_filename]" value="{$media.only_filename|@escape}" /></td>
+ <td colspan="2"><a href="#" class="serendipityPrettyButton input_button" onclick="showFilters(); return false">» {$CONST.FILTERS}</a></td>
</tr>
<tr>
<td colspan="6">
@@ -50,7 +50,7 @@
<table width="100%" cellpadding="5" cellspacing="0" border="0">
<tr>
<td valign="top"><span style="white-space: nowrap">{$CONST.MEDIA_KEYWORDS}</span></td>
- <td><input id="keyword_input" type="text" name="serendipity[keywords]" value="{$media.keywords_selected|@escape}" /></td>
+ <td><input class="input_textbox" id="keyword_input" type="text" name="serendipity[keywords]" value="{$media.keywords_selected|@escape}" /></td>
<td width="98%">
{foreach from=$media.keywords item="keyword"}
<a href="#" onclick="AddKeyword('{$keyword|@escape}'); return false">{$keyword|@escape}</a>
@@ -63,18 +63,18 @@
{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}
<td>
- <input type="text" name="serendipity[filter][{$so_key}][from]" value="{$media.filter[$so_key].from|@escape}" />
+ <input class="input_textbox" type="text" name="serendipity[filter][{$so_key}][from]" value="{$media.filter[$so_key].from|@escape}" />
</td>
<td>
- - <input type="text" name="serendipity[filter][{$so_key}][to]" value="{$media.filter[$so_key].to|@escape}" /> (DD.MM.YYYY | YYYY-MM-DD | MM/DD/YYYY)
+ - <input class="input_textbox" type="text" name="serendipity[filter][{$so_key}][to]" value="{$media.filter[$so_key].to|@escape}" /> (DD.MM.YYYY | YYYY-MM-DD | MM/DD/YYYY)
</td>
{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}
<td>
- <input type="text" name="serendipity[filter][{$so_key}][from]" value="{$media.filter[$so_key].from|@escape}" />
+ <input class="input_textbox" type="text" name="serendipity[filter][{$so_key}][from]" value="{$media.filter[$so_key].from|@escape}" />
</td>
<td>
- - <input type="text" name="serendipity[filter][{$so_key}][to]" value="{$media.filter[$so_key].to|@escape}" />
+ - <input class="input_textbox" type="text" name="serendipity[filter][{$so_key}][to]" value="{$media.filter[$so_key].to|@escape}" />
</td>
{elseif $so_val.type == 'authors'}
{if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
@@ -89,7 +89,7 @@
{else}
{if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
<td>
- <input type="text" name="serendipity[filter][{$so_key}]" value="{$media.filter[$so_key]|@escape}" />
+ <input class="input_textbox" type="text" name="serendipity[filter][{$so_key}]" value="{$media.filter[$so_key]|@escape}" />
</td>
<td> </td>
{/if}
@@ -135,9 +135,9 @@
<tr>
<td align="right" colspan="6">
{if $media.show_upload}
- <input type="button" value="{$CONST.ADD_MEDIA|@escape}" onclick="location.href='{$media.url}&serendipity[adminAction]=addSelect&serendipity[only_path]={$media.only_path|escape:url}'; return false" class="serendipityPrettyButton" />
+ <input type="button" value="{$CONST.ADD_MEDIA|@escape}" onclick="location.href='{$media.url}&serendipity[adminAction]=addSelect&serendipity[only_path]={$media.only_path|escape:url}'; return false" class="serendipityPrettyButton input_button" />
{/if}
- <input type="submit" name="go" value=" - {$CONST.GO} - " class="serendipityPrettyButton" />
+ <input type="submit" name="go" value=" - {$CONST.GO} - " class="serendipityPrettyButton input_button" />
</td>
</tr>
</table>
diff --git a/templates/default/admin/media_properties.tpl b/templates/default/admin/media_properties.tpl
new file mode 100644
index 0000000..9152f58
--- /dev/null
+++ b/templates/default/admin/media_properties.tpl
@@ -0,0 +1,18 @@
+{if $media.is_edit}
+<form id="mediaPropertyForm" action="?" method="POST">
+ <div>
+ {$media.token}
+ <input type="hidden" name="serendipity[action]" value="admin" />
+ <input type="hidden" name="serendipity[adminModule]" value="images" />
+ <input type="hidden" name="serendipity[adminAction]" value="add" />
+ <input type="hidden" name="serendipity[adminSubAction]" value="properties" />
+ {$media.editform_hidden}
+{/if}
+
+{$MEDIA_ITEMS}
+
+{if $media.is_edit}
+ <br /><input type="submit" name="submit" value="{$CONST.GO}" class="serendipityPrettyButton input_button" />
+ </div>
+</form>
+{/if}
diff --git a/templates/default/admin/media_upload.tpl b/templates/default/admin/media_upload.tpl
index 6ef3c71..e5d96d9 100644
--- a/templates/default/admin/media_upload.tpl
+++ b/templates/default/admin/media_upload.tpl
@@ -183,7 +183,7 @@ function fillInput(source, target) {ldelim}
<table id="foreign_upload" class="image_add_foreign">
<tr>
<td nowrap="nowrap">{$CONST.ENTER_MEDIA_URL}</td>
- <td><input type="text" id="imageurl" name="serendipity[imageurl]"
+ <td><input class="input_textbox" type="text" id="imageurl" name="serendipity[imageurl]"
onchange="checkInputs()"
value=""
size="40" /></td>
@@ -208,7 +208,7 @@ function fillInput(source, target) {ldelim}
<table style="margin-top: 35px" id="upload_table" class="image_add_local">
<tr>
<td nowrap='nowrap'>{$CONST.ENTER_MEDIA_UPLOAD}</td>
- <td><input id="userfile_1" name="serendipity[userfile][1]"
+ <td><input class="input_file" id="userfile_1" name="serendipity[userfile][1]"
onchange="checkInputs();"
type="file" /></td>
</tr>
@@ -219,7 +219,7 @@ function fillInput(source, target) {ldelim}
<tr>
<td>{$CONST.SAVE_FILE_AS}</td>
- <td><input type="text" id="target_filename_1" name="serendipity[target_filename][1]" value="" size="40" /></td>
+ <td><input class="input_textbox" type="text" id="target_filename_1" name="serendipity[target_filename][1]" value="" size="40" /></td>
</tr>
<tr>
@@ -249,13 +249,13 @@ function fillInput(source, target) {ldelim}
<div style="text-align: center; margin-top: 15px; margin-bottom: 15px">
<script type="text/javascript">
- document.write('<input class="serendipityPrettyButton" type="button" value="{$CONST.IMAGE_MORE_INPUT}" onclick="hideForeign(); addField()"' + '/><br' + '/>');
+ document.write('<input class="serendipityPrettyButton input_button" type="button" value="{$CONST.IMAGE_MORE_INPUT}" onclick="hideForeign(); addField()"' + '/><br' + '/>');
</script>
<input type="hidden" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" />
<br />
- <input onclick="checkInputs();" type="submit" value="{$CONST.GO}" class="serendipityPrettyButton" />
+ <input onclick="checkInputs();" type="submit" value="{$CONST.GO}" class="serendipityPrettyButton input_button" />
- {$CONST.WORD_OR} -
- <input onclick="checkInputs();" name="go_properties" type="submit" value="{$CONST.GO_ADD_PROPERTIES|@escape}" class="serendipityPrettyButton" />
+ <input onclick="checkInputs();" name="go_properties" type="submit" value="{$CONST.GO_ADD_PROPERTIES|@escape}" class="serendipityPrettyButton input_button" />
</div>
</div>
<div class="image_add_note">{$CONST.ADD_MEDIA_BLAHBLAH_NOTE}</div>
--
2.39.5