[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/www/admin search.php, 1.7, 1.8 index.php, 1.15,
|
From: |
gsmet |
|
Subject: |
[Gforge-commits] gforge/www/admin search.php, 1.7, 1.8 index.php, 1.15, 1.16 useredit.php, 1.4, 1.5 userlist.php, 1.10, 1.11 |
|
Date: |
Fri, 13 Feb 2004 11:19:09 -0600 |
Update of /cvsroot/gforge/gforge/www/admin
In directory db.perdue.net:/tmp/cvs-serv15402/www/admin
Modified Files:
search.php index.php useredit.php userlist.php
Log Message:
Improved /admin/ localization and UI
Improved /admin/ french localization
Index: search.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/search.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- search.php 9 Feb 2003 22:02:16 -0000 1.7
+++ search.php 13 Feb 2004 17:19:05 -0000 1.8
@@ -67,8 +67,8 @@
OR realname ILIKE '%$search%'
");
- print '<p><strong>'
.$Language->getText('admin_search','user_search_criteria').'"<em>'.$search.'</em>":
'
- .db_numrows($result)
.$Language->getText('admin_search','matches').'</strong></p>';
+ print '<p><strong>'
.$Language->getText('admin_search','user_search_criteria').'
"<em>'.$search.'</em>": '
+ .db_numrows($result) .' '.
$Language->getText('admin_search','matches').'</strong></p>';
if (db_numrows($result) < 1) {
echo db_error();
Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/index.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- index.php 1 Dec 2003 04:03:41 -0000 1.15
+++ index.php 13 Feb 2004 17:19:05 -0000 1.16
@@ -24,11 +24,17 @@
$abc_array =
array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','0','1','2','3','4','5','6','7','8','9');
-
?>
<p><strong><?php echo $Language->getText('admin_index','user_maintaince');
?></strong></p>
<ul>
+ <li><?php
+ $res=db_query("SELECT count(*) AS count FROM users WHERE
status='A'");
+ $row = db_fetch_array($res);
+ echo $Language->getText('admin_index','active_users_count',
array($row[count]));
+ ?></li>
+</ul>
+<ul>
<li><a href="userlist.php"><?php echo
$Language->getText('admin_index','display_full_user_list');
?></a> </li>
<li><?php echo
$Language->getText('admin_index','display_user_beginning_with') ?>
<?php
@@ -38,7 +44,7 @@
?>
<br />
<form name="usersrch" action="search.php" method="post">
- Search <em>(userid, username, realname, email)</em>:
+ <?php echo $Language->getText('admin_index','search_users'); ?>:
<input type="text" name="search" />
<input type="hidden" name="substr" value="1" />
<input type="hidden" name="usersearch" value="1" />
@@ -50,6 +56,23 @@
<strong><?php echo $Language->getText('admin_index','group_maintaince');
?></strong>
</p>
<ul>
+ <li><?php
+ $res=db_query("SELECT count(*) AS count FROM groups");
+ $row = db_fetch_array($res);
+ echo
$Language->getText('admin_index','registered_projects_count',
array($row[count]));
+ ?></li>
+ <li><?php
+ $res=db_query("SELECT count(*) AS count FROM groups WHERE
status='A'");
+ $row = db_fetch_array($res);
+ echo $Language->getText('admin_index','active_projects_count',
array($row[count]));
+ ?></li>
+ <li><?php
+ $res=db_query("SELECT count(*) AS count FROM groups WHERE
status='P'");
+ $row = db_fetch_array($res);
+ echo $Language->getText('admin_index','pending_projects_count',
array($row[count]));
+ ?></li>
+</ul>
+<ul>
<li><a href="grouplist.php"><?php echo
$Language->getText('admin_index','display_full_group'); ?></a></li>
<li><?php echo
$Language->getText('admin_index','display_groups_beginning_with'); ?>
@@ -60,7 +83,7 @@
?>
<br />
<form name="gpsrch" action="search.php" method="post">
- Search <em>(groupid, group unix name, full name)</em>:
+ <?php echo $Language->getText('admin_index','search_groups');
?>:
<input type="text" name="search" />
<input type="hidden" name="substr" value="1" />
<input type="hidden" name="groupsearch" value="1" />
@@ -71,20 +94,18 @@
<ul>
<li><a href="/register/"><?php echo
$Language->getText('admin_index','register_new_project'); ?></a></li>
<li><?php echo $Language->getText('admin_index','groups_with'); ?> <a
href="approve-pending.php"><strong>P</strong> <?php echo
$Language->getText('admin_index','pending_status'); ?></a> <em><?php echo
$Language->getText('admin_index','new_project_approval'); ?></em></li>
- <li>
+ <li><form name="projectsearch" action="search.php">
<?php echo $Language->getText('admin_index','groups_with_status'); ?>
- <form name="projectsearch" action="search.php">
<select name="status">
- <option value="D">D</option>
- <option value="A">A</option>
- <option value="H">H</option>
- <option value="P">P</option>
+ <option value="D"><?php echo
$Language->getText('admin_index','project_deleted'); ?></option>
+ <option value="A"><?php echo
$Language->getText('admin_index','project_active'); ?></option>
+ <option value="H"><?php echo
$Language->getText('admin_index','project_hold'); ?></option>
+ <option value="P"><?php echo
$Language->getText('admin_index','project_pending'); ?></option>
</select>
<input type="hidden" name="groupsearch" value="1">
<input type="hidden" name="search" value="%">
<input type="submit" value="<?php echo
$Language->getText('general','submit');?> "/>
- </form>
- </li>
+ </form></li>
<li><a
href="search.php?groupsearch=1&search=%&is_public=0"><?php echo
$Language->getText('admin_index','private_groups'); ?></a></li>
</ul>
@@ -135,22 +156,6 @@
<?php
-$res=db_query("SELECT count(*) AS count FROM users WHERE status='A'");
-$row = db_fetch_array($res);
-print "<p>Active site users: <strong>$row[count]</strong></p>";
-
-$res=db_query("SELECT count(*) AS count FROM groups");
-$row = db_fetch_array($res);
-print "<br />Registered projects: <strong>$row[count]</strong>";
-
-$res=db_query("SELECT count(*) AS count FROM groups WHERE status='A'");
-$row = db_fetch_array($res);
-print "<br />Active projects: <strong>$row[count]</strong>";
-
-$res=db_query("SELECT count(*) AS count FROM groups WHERE status='P'");
-$row = db_fetch_array($res);
-print "<br />Pending projects: <strong>$row[count]</strong>";
-
site_admin_footer(array());
-?>
+?>
\ No newline at end of file
Index: useredit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/useredit.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- useredit.php 9 Feb 2003 22:02:16 -0000 1.4
+++ useredit.php 13 Feb 2004 17:19:05 -0000 1.5
@@ -189,7 +189,7 @@
<tr '.$GLOBALS['HTML']->boxGetAltRowStyle($i++).'>
<td>'.$row_cat['group_name'].'</td>
<td>'.$row_cat['unix_group_name'].'</td>
- <td><a
href="/project/admin/?group_id='.$row_cat[group_id].'">['.$Language->getText('admin_useredit','project_admin').']</a>
+ <td width="40%"><a
href="/project/admin/?group_id='.$row_cat[group_id].'">['.$Language->getText('admin_useredit','project_admin').']</a>
<a
href="/project/admin/userperms.php?group_id='.$row_cat['group_id'].'">['.$Language->getText('admin_useredit','membership_permissions').']</a></td>
</tr>
';
Index: userlist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/userlist.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- userlist.php 9 Feb 2003 22:02:16 -0000 1.10
+++ userlist.php 13 Feb 2004 17:19:05 -0000 1.11
@@ -28,26 +28,44 @@
echo '<p>' .$Language->getText('admin_userlist','key') .':
<font
color="#00ff00">'.$Language->getText('admin_userlist','active'). '</font>
<font color="grey">'
.$Language->getText('admin_userlist','deleted') .'</font>
- <font color="red">'
.$Language->getText('admin_userlist','suspended'). '</font>'
- .$Language->getText('admin_userlist','pending').'</p>
- <table width="100%" cellspacing="0" cellpadding="0"
border="1">';
+ <font color="red">'
.$Language->getText('admin_userlist','suspended'). '</font> '
+ .$Language->getText('admin_userlist','pending').'</p>';
+
+ $tableHeaders = array(
+ $Language->getText('admin_userlist', 'login'),
+ $Language->getText('admin_userlist', 'add_date'),
+ ' ',
+ ' ',
+ ' ',
+ ' '
+ );
+
+ echo $GLOBALS['HTML']->listTableTop($tableHeaders);
+
+ $count = 0;
while ($usr = db_fetch_array($result)) {
- print "\n<tr><td bgcolor=\"";
- if ($usr[status] == 'A') print "#00ff00";
- if ($usr[status] == 'D') print "grey";
- if ($usr[status] == 'S') print "red";
+ print '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($count) .
'><td bgcolor="';
+ if ($usr['status'] == 'A') print "#00ff00";
+ if ($usr['status'] == 'D') print "grey";
+ if ($usr['status'] == 'S') print "red";
print "\"><a href=\"useredit.php?user_id=$usr[user_id]\">";
if ($usr[status] == 'P') print "*";
- print "$usr[user_name]</a>";
- print "</td>";
- print "\n<td><a href=\"/developer/?form_dev=$usr[user_id]\">["
.$Language->getText('admin_userlist','devprofile'). "]</a></td>";
- print "\n<td><a
href=\"userlist.php?action=activate&user_id=$usr[user_id]\">["
.$Language->getText('admin_userlist','activate'). "]</a></td>";
- print "\n<td><a
href=\"userlist.php?action=delete&user_id=$usr[user_id]\">["
.$Language->getText('admin_userlist','delete') ."]</a></td>";
- print "\n<td><a
href=\"userlist.php?action=suspend&user_id=$usr[user_id]\">["
.$Language->getText('admin_userlist','suspend'). "]</a></td>";
- print "</tr>";
+ echo $usr['user_name'].'</a>';
+ echo '</td>';
+ echo '<td width="15%" align="center">';
+ echo ($usr['add_date'] ? date($GLOBALS['sys_datefmt'],
$usr['add_date']) : '-');
+ echo '</td>';
+ echo '<td width="15%" align="center"><a
href="/developer/?form_dev='.$usr['user_id'].'">['
.$Language->getText('admin_userlist','devprofile'). ']</a></td>';
+ echo '<td width="15%" align="center"><a
href="userlist.php?action=activate&user_id='.$usr['user_id'].'">['
.$Language->getText('admin_userlist','activate'). ']</a></td>';
+ echo '<td width="15%" align="center"><a
href="userlist.php?action=delete&user_id='.$usr['user_id'].'">['
.$Language->getText('admin_userlist','delete') .']</a></td>';
+ echo '<td width="15%" align="center"><a
href="userlist.php?action=suspend&user_id='.$usr['user_id'].'">['
.$Language->getText('admin_userlist','suspend'). ']</a></td>';
+ echo '</tr>';
+
+ $count ++;
}
- print "</table>";
+
+ echo $GLOBALS['HTML']->listTableBottom();
}
@@ -79,9 +97,9 @@
if ($user_name_search) {
// [RM] LIKE is case-sensitive, and we don't want that
// $result = db_query("SELECT user_name,user_id,status
FROM users WHERE user_name LIKE '$user_name_search%' ORDER BY user_name");
- $result = db_query("SELECT user_name,user_id,status FROM users
WHERE user_name ~* '^$user_name_search' ORDER BY user_name");
+ $result = db_query("SELECT user_name,user_id,status,add_date
FROM users WHERE user_name ~* '^$user_name_search' ORDER BY user_name");
} else {
- $result = db_query("SELECT user_name,user_id,status FROM users
ORDER BY user_name");
+ $result = db_query("SELECT user_name,user_id,status,add_date
FROM users ORDER BY user_name");
}
show_users_list ($result);
} else {
@@ -91,7 +109,7 @@
print "<strong>" . group_getname($group_id) . "</strong></p>";
- $result = db_query("SELECT users.user_id AS user_id,users.user_name AS
user_name,users.status AS status "
+ $result = db_query("SELECT users.user_id AS user_id,users.user_name AS
user_name,users.status AS status, users.add_date AS add_date "
. "FROM users,user_group "
. "WHERE users.user_id=user_group.user_id AND "
. "user_group.group_id=$group_id ORDER BY users.user_name");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/www/admin search.php, 1.7, 1.8 index.php, 1.15, 1.16 useredit.php, 1.4, 1.5 userlist.php, 1.10, 1.11,
gsmet <=
- Prev by Date:
[Gforge-commits] gforge/www/include/languages French.tab, 1.80, 1.81 Base.tab, 1.138, 1.139
- Next by Date:
[Gforge-commits] gforge/www/include/languages French.tab, 1.81, 1.82 Base.tab, 1.139, 1.140
- Previous by thread:
[Gforge-commits] gforge/www/include/languages French.tab, 1.80, 1.81 Base.tab, 1.138, 1.139
- Next by thread:
[Gforge-commits] gforge/www/include/languages French.tab, 1.81, 1.82 Base.tab, 1.139, 1.140
- Index(es):