From 472432b1b9bc49aa92b089172d44464250e873ef Mon Sep 17 00:00:00 2001 From: Garvin Hicking 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 | 112 +++++++++--------- .../default/admin/media_imgedit_done.tpl | 72 +++++------ templates/default/admin/media_items.tpl | 6 +- templates/default/admin/media_pane.tpl | 20 ++-- templates/default/admin/media_properties.tpl | 2 +- templates/default/admin/media_upload.tpl | 12 +- 28 files changed, 387 insertions(+), 378 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index 0f21ff46..cec89267 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 91d9caae..878e7d5a 100644 --- a/include/admin/category.inc.php +++ b/include/admin/category.inc.php @@ -136,7 +136,7 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok } ?> - + - + /> - + - - + + @@ -238,14 +238,14 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
- id="hide_sub_no" /> - id="hide_sub_yes" /> + id="hide_sub_no" /> + id="hide_sub_yes" /> -
+
@@ -274,8 +274,8 @@ if ( $serendipity['GET']['adminAction'] == 'view' ) { foreach ( $categories as $category ) { ?> - <?php echo EDIT ?> - <?php echo DELETE ?> + <?php echo EDIT ?> + <?php echo DELETE ?> @@ -285,7 +285,7 @@ if ( $serendipity['GET']['adminAction'] == 'view' ) { } ?> - + diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php index b343e488..64f38e04 100644 --- a/include/admin/comments.inc.php +++ b/include/admin/comments.inc.php @@ -278,19 +278,19 @@ function highlightComment(id, checkvalue) { : - + : - + : - + IP: - + : - + : - + : @@ -317,7 +317,7 @@ function highlightComment(id, checkvalue) { - + @@ -399,7 +399,7 @@ foreach ($sql as $rs) { - + - +
: :
diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php index 17b5407f..433e4484 100644 --- a/include/admin/entries.inc.php +++ b/include/admin/entries.inc.php @@ -138,7 +138,7 @@ function serendipity_drawList() { ?> - + @@ -175,7 +175,7 @@ function serendipity_drawList() { - + @@ -251,7 +251,9 @@ function serendipity_drawList() { $entry_pre .= ' ' . DRAFT . ': '; } ?> -
+ +
+
@@ -287,7 +289,7 @@ function serendipity_drawList() { <?php echo EDIT; ?> <?php echo DELETE; ?> - +
@@ -313,8 +315,8 @@ function serendipity_drawList() {
- - + +
@@ -328,7 +330,7 @@ function serendipity_drawList() { - : # + : # @@ -540,9 +542,9 @@ switch($serendipity['GET']['adminAction']) {

- " class="serendipityPrettyButton"> + " class="serendipityPrettyButton input_button"> - +

- " class="serendipityPrettyButton"> + " class="serendipityPrettyButton input_button "> - +
- +
- [] - - [] + " class="serendipityIconLink"><?php echo EDIT . " /> + " class="serendipityIconLink"><?php echo DELETE . " />
@@ -71,7 +71,7 @@ foreach($groups as $group) {
- +
@@ -103,11 +103,10 @@ if ($serendipity['GET']['adminAction'] == 'edit') { } ?> - - + @@ -172,7 +171,7 @@ foreach($allusers AS $user) { } else { echo "\n"; echo "\n"; - echo '' . "\n"; + echo '' . "\n"; echo "\n"; } } @@ -233,11 +232,11 @@ foreach($allusers AS $user) { - + - + - + @@ -252,8 +251,8 @@ if ($serendipity['GET']['adminAction'] == 'edit') { ?>

- - + +
- +            - +

- + - + @@ -444,14 +444,14 @@ switch ($serendipity['GET']['adminAction']) {
$indent' . $indentB . '' . $indentB . '
- /> + />


- +
@@ -476,14 +476,14 @@ switch ($serendipity['GET']['adminAction']) { - +


- +
@@ -551,7 +551,7 @@ switch ($serendipity['GET']['adminAction']) { - + @@ -564,7 +564,7 @@ switch ($serendipity['GET']['adminAction']) {
-
+

-
+
" /> - x - + x +
: -
- +
+
diff --git a/include/admin/import.inc.php b/include/admin/import.inc.php index bbe62404..17bd3cbc 100644 --- a/include/admin/import.inc.php +++ b/include/admin/import.inc.php @@ -220,7 +220,7 @@ if (isset($serendipity['GET']['importFrom']) && serendipity_checkFormToken()) { - + @@ -261,7 +261,7 @@ if (isset($serendipity['GET']['importFrom']) && serendipity_checkFormToken()) { - + -
+
@@ -456,7 +456,7 @@ if ( (int)$serendipity['GET']['step'] == 0 ) { $config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE); serendipity_printConfigTemplate($config, $from, true, false, false); ?> -
+
diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php index 82bcd485..6374b7eb 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 '
' . "\n"; echo '

' . $output['links_title'] . '

' . "\n"; @@ -41,5 +39,5 @@ if ($output['show_links']) { echo '' . "\n"; echo '
' . "\n"; } - -echo $output['more']; +echo '' . $output['welcome'] . ''; +echo $output['more']; \ No newline at end of file diff --git a/include/admin/personal.inc.php b/include/admin/personal.inc.php index 36bb4772..143b4eaa 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); ?> -
+
>