[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin templates/base/users.xsl inc/class.boacco...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] admin templates/base/users.xsl inc/class.boacco... |
|
Date: |
Sat, 12 Aug 2006 09:13:02 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Changes by: Dave Hall <skwashd> 06/08/12 09:13:01
Modified files:
templates/base : users.xsl
inc : class.boaccounts.inc.php
class.uiaccounts.inc.php
Added files:
templates/base/css: base.css
Log message:
eye candy and reimplement quota - untested on ldap accts atm
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/templates/base/users.xsl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.boaccounts.inc.php?cvsroot=phpgroupware&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiaccounts.inc.php?cvsroot=phpgroupware&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/admin/templates/base/css/base.css?cvsroot=phpgroupware&rev=1.1
Patches:
Index: templates/base/users.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/admin/templates/base/users.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/users.xsl 8 Jul 2006 06:51:16 -0000 1.2
+++ templates/base/users.xsl 12 Aug 2006 09:13:01 -0000 1.3
@@ -1,4 +1,4 @@
-<!-- $Id: users.xsl,v 1.2 2006/07/08 06:51:16 skwashd Exp $ -->
+<!-- $Id: users.xsl,v 1.3 2006/08/12 09:13:01 skwashd Exp $ -->
<xsl:template name="users">
<xsl:choose>
@@ -134,83 +134,38 @@
<!-- BEGIN account_view -->
<xsl:template match="account_view">
- <xsl:variable name="i_back" select="i_back"/>
- <table>
- <tr>
- <td>
- ID
- </td>
- <td>
- <xsl:value-of select="account_id" />
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_loginid" />
- </td>
- <td>
- <xsl:value-of select="account_lid" />
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_lastname" />
- </td>
- <td>
- <xsl:value-of select="lastname"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_firstname" />
- </td>
- <td>
- <xsl:value-of select="firstname"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_lastlogin" />
- </td>
- <td>
- <xsl:value-of select="lastlogin"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_lastloginfrom"
/>
- </td>
- <td>
- <xsl:value-of select="lastloginfrom"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_pwchange" />
- </td>
- <td>
- <xsl:value-of
select="lastpasswd_change"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_status" />
- </td>
- <td>
- <xsl:value-of select="status"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="l_expires" />
- </td>
- <td>
- <xsl:value-of select="expires"/>
- </td>
- </tr>
+ <a href="{i_back}"><xsl:value-of select="l_back" /></a>
+ <div id="admin_view_user">
+ <h2><xsl:value-of select="l_user" /></h2>
+ <span class="label"><xsl:value-of select="l_firstname"
/></span>
+ <span class="value"><xsl:value-of
select="firstname"/></span><br class="eol" />
+
+ <span class="label"><xsl:value-of select="l_lastname"
/></span>
+ <span class="value"><xsl:value-of
select="lastname"/></span><br class="eol" />
+
+ <span class="label"><xsl:value-of select="l_status"
/></span>
+ <span class="value"><xsl:value-of
select="account_status"/></span><br class="eol" />
+
+ <span class="label"><xsl:value-of select="l_expires"
/></span>
+ <span class="value"><xsl:value-of
select="input_expires"/></span><br class="eol" />
+
+ <span class="label"><xsl:value-of select="l_lastlogin"
/></span>
+ <span class="value"><xsl:value-of
select="account_lastlogin"/></span><br class="eol" />
+
+ <span class="label"><xsl:value-of
select="l_lastloginfrom" /></span>
+ <span class="value"><xsl:value-of
select="lastloginfrom"/></span><br class="eol" />
+
+ <span class="label"><xsl:value-of select="l_pwchange"
/></span>
+ <span class="value"><xsl:value-of
select="account_lastpasswd_change"/></span><br class="eol" />
+
+ <h2><xsl:value-of select="l_applications" /></h2>
+ <div>
+ <ul>
<xsl:apply-templates select="permissions" />
- </table>
- <a href="{$i_back}"><xsl:value-of select="l_back" /></a>
+ </ul>
+ </div>
+ </div>
+ <div><a href="{i_back}"><xsl:value-of select="l_back"
/></a></div>
</xsl:template>
<!-- BEGIN account_edit -->
@@ -324,6 +279,11 @@
</xsl:choose>
</td>
</tr>
+ <tr class="row_off">
+ <td><label
for="values_quota"><xsl:value-of select="lang_quota"/></label></td>
+ <td><input type="text"
name="values[quota]" id="values_quota" value="{account_quota}" />Mb</td>
+ <td colspan="2"></td>
+ </tr>
<tr>
<td colspan="4"
height="5"></td>
</tr>
@@ -402,7 +362,7 @@
</xsl:template>
<xsl:template match="permissions">
- <tr>
+ <li>
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="@class">
@@ -416,14 +376,17 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- <td><xsl:value-of select="name"/></td>
- <td>
+ <span>
<xsl:choose>
<xsl:when test="enabled = 1">
X
</xsl:when>
+ <xsl:otherwise>
+
+ </xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
+ </span>
+ <xsl:value-of select="name"/>
+ </li>
</xsl:template>
Index: inc/class.boaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- inc/class.boaccounts.inc.php 11 Aug 2006 07:09:27 -0000 1.50
+++ inc/class.boaccounts.inc.php 12 Aug 2006 09:13:01 -0000 1.51
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.boaccounts.inc.php,v 1.50 2006/08/11 07:09:27 skwashd Exp
$ */
+ /* $Id: class.boaccounts.inc.php,v 1.51 2006/08/12 09:13:01 skwashd Exp
$ */
//FIXME define constants for rights so we can fuck all these magic
numbers
@@ -269,6 +269,7 @@
'account_expires_year' =>
$values['account_expires_year'],
'account_expires_never' =>
$values['expires'],
'expires'
=> $values['expires'],
+ 'quota'
=> $values['quota']
/* 'file_space' =>
$_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
);
Index: inc/class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- inc/class.uiaccounts.inc.php 6 Aug 2006 10:03:24 -0000 1.62
+++ inc/class.uiaccounts.inc.php 12 Aug 2006 09:13:01 -0000 1.63
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.uiaccounts.inc.php,v 1.62 2006/08/06 10:03:24 skwashd Exp
$ */
+ /* $Id: class.uiaccounts.inc.php,v 1.63 2006/08/12 09:13:01 skwashd Exp
$ */
class uiaccounts
{
@@ -455,8 +455,6 @@
$GLOBALS['phpgw']->xslttpl->add_file('msgbox',
PHPGW_TEMPLATE_DIR);
$GLOBALS['phpgw']->xslttpl->add_file('groups');
$GLOBALS['phpgw_info']['flags']['app_header'] =
$account_id > 0 ? lang('edit group') : lang('add group');
-
- echo "ui::edit_group account_id == $account_id <br>";
$data = array
(
'account_id' => $account_id,
@@ -727,6 +725,7 @@
'lang_expires' =>
lang('expires'),
'lang_firstname' =>
lang('firstname'),
'lang_applications' =>
lang('applications'),
+ 'lang_quota' =>
lang('quota'),
'lang_save' =>
lang('save'),
'lang_cancel' =>
lang('cancel'),
'select_expires' =>
$GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True),
@@ -741,6 +740,7 @@
'account_lastname' =>
$userData['account_lastname'],
'account_passwd' =>
$account_passwd,
'account_passwd_2' =>
$account_passwd_2,
+ 'account_quota' =>
$userData['quota'],
'anonymous' =>
(int) $userData['anonymous'],
'changepassword' => (int)
$userData['changepassword'],
'expires_never' =>
(($userData['expires'] == -1)?'yes':''),
@@ -759,13 +759,13 @@
function view_user()
{
- if
($GLOBALS['phpgw']->acl->check('account_access',8,'admin') || !
$_GET['account_id'])
+ if
($GLOBALS['phpgw']->acl->check('account_access',8,'admin') || !
isset($_GET['account_id']) )
{
$this->list_users();
return false;
}
- $account =&
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
+ $account =& CreateObject('phpgwapi.accounts', (int)
$_GET['account_id'],'u');
$userData = $account->read_repository();
if ($userData['status'])
@@ -786,7 +786,7 @@
$userData['account_lastlogin'] = lang('Never');
}
- if ($userData['expires'] != -1)
+ if ( (int) $userData['expires'] <> -1)
{
$userData['input_expires'] =
$GLOBALS['phpgw']->common->show_date($userData['expires']);
}
@@ -813,7 +813,7 @@
{
if ($application[1]['enabled'] &&
$application[1]['status'] != 2)
{
-
$userData['permissions'][$i]['name'] = $application[1]['title'];
+
$userData['permissions'][$i]['name'] = lang($application[1]['name']);
if(in_array($application[1]['name'], $perms))
{
$userData['permissions'][$i]['enabled'] = true;
@@ -826,22 +826,25 @@
// Labels
$userData['l_action'] = lang('View user
account');
$userData['l_loginid'] = lang('LoginID');
- $userData['l_account_active'] = lang('Account
active');
+ $userData['l_status'] = lang('Account
status');
$userData['l_password'] = lang('Password');
$userData['l_lastname'] = lang('Last Name');
$userData['l_groups'] = lang('Groups');
$userData['l_firstname'] = lang('First Name');
+ $userData['l_pwchange'] = lang('Last password
change');
$userData['l_lastlogin'] = lang('Last login');
- $userData['l_lastloginfrom'] = lang('Last login
from');
+ $userData['l_lastloginfrom']= lang('Last login from');
$userData['l_expires'] = lang('Expires');
$userData['l_back'] = lang('Back');
+ $userData['l_user'] = lang('user');
+ $userData['l_applications'] = lang('applications');
// Interactions
$userData['i_back'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('account "%1" properties', $userData['account_lid']);
$GLOBALS['phpgw']->xslttpl->add_file('users');
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_view' => $userData));
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('account_view' => $userData));
}
function delete_group()
Index: templates/base/css/base.css
===================================================================
RCS file: templates/base/css/base.css
diff -N templates/base/css/base.css
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/base/css/base.css 12 Aug 2006 09:13:01 -0000 1.1
@@ -0,0 +1,43 @@
+/* These spans should be moved into the api */
+span.label
+{
+ display: block;
+ float: left;
+ font-weight: bold;
+ width: 200px;
+}
+
+span.value
+{
+ display: block;
+ float: left;
+ width: 300px;
+}
+
+#admin_view_user div
+{
+ height: 225px;
+ overflow: auto;
+ width: 320px;
+}
+
+#admin_view_user ul
+{
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+#admin_view_user li
+{
+ padding: 2px 0px;
+ width: 300px;
+}
+
+#admin_view_user li span
+{
+ display: block;
+ float: left;
+ text-align: center;
+ width: 25px;
+}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin templates/base/users.xsl inc/class.boacco...,
Dave Hall <=