From cad6aca40feafa7adbe6066772afbe225dbfe30c Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Thu, 28 Sep 2006 06:49:29 +0000 Subject: removed images that were not being used, added icons and started the iconification! --- admin/users.php | 49 ++++++++-------- images/icon_delete.gif | Bin 0 -> 868 bytes images/icon_disable.gif | Bin 0 -> 552 bytes images/icon_download.gif | Bin 0 -> 306 bytes images/icon_edit.gif | Bin 0 -> 537 bytes images/icon_enable.gif | Bin 0 -> 289 bytes images/icon_flag.gif | Bin 0 -> 519 bytes images/icon_link.gif | Bin 0 -> 301 bytes images/icon_preferences.gif | Bin 0 -> 879 bytes images/icon_statistics.gif | Bin 0 -> 873 bytes lib/ui.lib.php | 23 ++++++++ modules/admin.php | 11 ---- templates/show_edit_user.inc.php | 103 +++++++++++++++++++++++++++++++++ templates/show_users.inc | 26 +++++---- templates/userform.inc | 102 -------------------------------- themes/burgundy/images/headphone.gif | Bin 861 -> 0 bytes themes/burgundy/images/table.gif | Bin 5680 -> 0 bytes themes/classic/images/blankalbum.jpg | Bin 20730 -> 0 bytes themes/classic/images/headphone.gif | Bin 861 -> 0 bytes themes/classic/images/table.gif | Bin 5680 -> 0 bytes themes/greyblock/images/blankalbum.jpg | Bin 22197 -> 0 bytes themes/greyblock/images/headphone.gif | Bin 861 -> 0 bytes themes/greyblock/images/table.gif | Bin 5680 -> 0 bytes 23 files changed, 163 insertions(+), 151 deletions(-) create mode 100644 images/icon_delete.gif create mode 100644 images/icon_disable.gif create mode 100644 images/icon_download.gif create mode 100644 images/icon_edit.gif create mode 100644 images/icon_enable.gif create mode 100644 images/icon_flag.gif create mode 100644 images/icon_link.gif create mode 100644 images/icon_preferences.gif create mode 100644 images/icon_statistics.gif create mode 100644 templates/show_edit_user.inc.php delete mode 100644 templates/userform.inc delete mode 100755 themes/burgundy/images/headphone.gif delete mode 100755 themes/burgundy/images/table.gif delete mode 100644 themes/classic/images/blankalbum.jpg delete mode 100755 themes/classic/images/headphone.gif delete mode 100755 themes/classic/images/table.gif delete mode 100644 themes/greyblock/images/blankalbum.jpg delete mode 100644 themes/greyblock/images/headphone.gif delete mode 100644 themes/greyblock/images/table.gif diff --git a/admin/users.php b/admin/users.php index 3a8c132c..e9cc8753 100644 --- a/admin/users.php +++ b/admin/users.php @@ -1,8 +1,7 @@ has_access(100)) { +if (!$GLOBALS['user']->has_access(100)) { access_denied(); } @@ -43,17 +42,16 @@ $user_id = scrub_in($_REQUEST['user']); $temp_user = new User($user_id); switch ($action) { - case 'edit': - if (conf('demo_mode')) { break; } - show_user_form($temp_user->username, - $temp_user->fullname, - $temp_user->email, - $temp_user->access, - 'edit_user', - ''); + case 'edit': + if (conf('demo_mode')) { break; } + $username = $temp_user->username; + $fullname = $temp_user->fullname; + $email = $temp_user->email; + $access = $temp_user->access; + $id = $temp_user->id; + require_once(conf('prefix') . '/templates/show_edit_user.inc.php'); break; - - case 'update_user': + case 'update_user': if (conf('demo_mode')) { break; } /* Clean up the variables */ @@ -162,20 +160,19 @@ switch ($action) { show_user_form('','','','','new_user',''); break; - case 'update': - case 'disabled': - if (conf('demo_mode')) { break; } - $level = scrub_in($_REQUEST['level']); - $thisuser = new User($_REQUEST['user']); - if ($GLOBALS['user']->has_access(100)) { - $thisuser->update_access($level); - } - show_manage_users(); + case 'update': + case 'disabled': + if (conf('demo_mode')) { break; } + $level = scrub_in($_REQUEST['level']); + $thisuser = new User($_REQUEST['user']); + if ($GLOBALS['user']->has_access(100)) { + $thisuser->update_access($level); + } + show_manage_users(); + break; + default: + show_manage_users(); break; - - default: - show_manage_users(); - } /* Show the footer */ diff --git a/images/icon_delete.gif b/images/icon_delete.gif new file mode 100644 index 00000000..94e71892 Binary files /dev/null and b/images/icon_delete.gif differ diff --git a/images/icon_disable.gif b/images/icon_disable.gif new file mode 100644 index 00000000..a769d5b9 Binary files /dev/null and b/images/icon_disable.gif differ diff --git a/images/icon_download.gif b/images/icon_download.gif new file mode 100644 index 00000000..c6ff1f2d Binary files /dev/null and b/images/icon_download.gif differ diff --git a/images/icon_edit.gif b/images/icon_edit.gif new file mode 100644 index 00000000..fe1be8a7 Binary files /dev/null and b/images/icon_edit.gif differ diff --git a/images/icon_enable.gif b/images/icon_enable.gif new file mode 100644 index 00000000..0664a5f5 Binary files /dev/null and b/images/icon_enable.gif differ diff --git a/images/icon_flag.gif b/images/icon_flag.gif new file mode 100644 index 00000000..67a678e9 Binary files /dev/null and b/images/icon_flag.gif differ diff --git a/images/icon_link.gif b/images/icon_link.gif new file mode 100644 index 00000000..0971bb99 Binary files /dev/null and b/images/icon_link.gif differ diff --git a/images/icon_preferences.gif b/images/icon_preferences.gif new file mode 100644 index 00000000..6d8a5f24 Binary files /dev/null and b/images/icon_preferences.gif differ diff --git a/images/icon_statistics.gif b/images/icon_statistics.gif new file mode 100644 index 00000000..7deec08e Binary files /dev/null and b/images/icon_statistics.gif differ diff --git a/lib/ui.lib.php b/lib/ui.lib.php index 7eec5525..c3be646c 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -1312,4 +1312,27 @@ function show_box_bottom() { } // show_box_bottom +/** + * get_user_icon + * this function takes a name and a returns either a text representation + * or an tag + */ +function get_user_icon($name) { + + $icon_name = 'icon_' . $name . '.gif'; + + if (file_exists(conf('prefix') . '/themes/' . $GLOBALS['theme']['path'] . '/images/' . $icon_name)) { + $img_url = conf('web_path') . conf('theme_path') . '/images/' . $icon_name; + } + else { + $img_url = conf('web_path') . '/images/' . $icon_name; + } + + $string = "\"$name\""; + + return $string; + +} // show_icon + + ?> diff --git a/modules/admin.php b/modules/admin.php index 33cf37d8..0be633e5 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -51,17 +51,6 @@ function show_manage_users () { } // show_manage_users() -/*! - @function show_user_form - @discussion shows the user form -*/ -function show_user_form ($username, $fullname, $email, $access, $type, $error) { - - require(conf('prefix').'/templates/userform.inc'); - -} // show_user_form() - - /* * show_change_password * diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php new file mode 100644 index 00000000..675c6224 --- /dev/null +++ b/templates/show_edit_user.inc.php @@ -0,0 +1,103 @@ +"; + $title = _('Adding a New User'); +} +else { + $userfield = scrub_out($username); + $title = _('Editing existing User'); +} +?> + +
+ +print_error('general'); ?> +
"> + + + + + + + + + + + + + + + + + + + + + + + + + +
+ : + + + print_error('username'); ?> +
: + +
+ : + + +
+ : + + + print_error('password'); ?> +
+ : + + +
+ : + + +
+"; + echo ""; +} +else { + echo "\n"; + echo "\n"; + echo ""; +} +?> +
+ diff --git a/templates/show_users.inc b/templates/show_users.inc index a6e6442b..dd0d7b0a 100644 --- a/templates/show_users.inc +++ b/templates/show_users.inc @@ -54,7 +54,8 @@ $admin_menu = "admin/"; - +   + @@ -83,46 +85,46 @@ while ($results = mysql_fetch_object($db_result)) { if (!$user->create_date) { $create_date = "Unknown"; } ?> - - - + + + fullname; ?> (username; ?>) - + - + - + - + - + disabled == '1') { - echo "username&level=enabled\">" . _("Enable") . ""; + echo "username&level=enabled\">" . get_user_icon('enable') . ""; } else { - echo "username&level=disabled\">" . _("Disable") .""; + echo "username&level=disabled\">" . get_user_icon('disable') .""; } ?> - + "; - $title = _("Adding a New User"); -} -else { - $userfield = $username; - $title = _("Editing existing User"); -} -?> - -
-
-print_error('general'); ?> -
"> - - - - - - - - - - - - - - - - - - - - - - - - - -
- : - - - print_error('username'); ?> -
: - -
- : - - -
- : - - - print_error('password'); ?> -
- : - - -
- : - - -
-"; - echo ""; -} -else { - echo "\n"; - echo "\n"; - echo ""; -} -?> -
diff --git a/themes/burgundy/images/headphone.gif b/themes/burgundy/images/headphone.gif deleted file mode 100755 index 74a66e11..00000000 Binary files a/themes/burgundy/images/headphone.gif and /dev/null differ diff --git a/themes/burgundy/images/table.gif b/themes/burgundy/images/table.gif deleted file mode 100755 index 89761b38..00000000 Binary files a/themes/burgundy/images/table.gif and /dev/null differ diff --git a/themes/classic/images/blankalbum.jpg b/themes/classic/images/blankalbum.jpg deleted file mode 100644 index 468301bd..00000000 Binary files a/themes/classic/images/blankalbum.jpg and /dev/null differ diff --git a/themes/classic/images/headphone.gif b/themes/classic/images/headphone.gif deleted file mode 100755 index 74a66e11..00000000 Binary files a/themes/classic/images/headphone.gif and /dev/null differ diff --git a/themes/classic/images/table.gif b/themes/classic/images/table.gif deleted file mode 100755 index 89761b38..00000000 Binary files a/themes/classic/images/table.gif and /dev/null differ diff --git a/themes/greyblock/images/blankalbum.jpg b/themes/greyblock/images/blankalbum.jpg deleted file mode 100644 index f3a49a2d..00000000 Binary files a/themes/greyblock/images/blankalbum.jpg and /dev/null differ diff --git a/themes/greyblock/images/headphone.gif b/themes/greyblock/images/headphone.gif deleted file mode 100644 index 74a66e11..00000000 Binary files a/themes/greyblock/images/headphone.gif and /dev/null differ diff --git a/themes/greyblock/images/table.gif b/themes/greyblock/images/table.gif deleted file mode 100644 index 89761b38..00000000 Binary files a/themes/greyblock/images/table.gif and /dev/null differ -- cgit