From 36959cfc4b8d3ab94c83f3a791e9d58d9bc103b2 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 28 Feb 2013 08:01:37 +0100
Subject: [PATCH 1/4] exp accounts info in diabook

---
 view/theme/diabook/admin_users.tpl         | 2 +-
 view/theme/diabook/smarty3/admin_users.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
index 609fd5ad2a..b455a8c2ee 100644
--- a/view/theme/diabook/admin_users.tpl
+++ b/view/theme/diabook/admin_users.tpl
@@ -69,7 +69,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
 						<td class="tools" style="width:60px;">
 							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
diff --git a/view/theme/diabook/smarty3/admin_users.tpl b/view/theme/diabook/smarty3/admin_users.tpl
index f870e0e771..8127944a33 100644
--- a/view/theme/diabook/smarty3/admin_users.tpl
+++ b/view/theme/diabook/smarty3/admin_users.tpl
@@ -74,7 +74,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
 						<td class="tools" style="width:60px;">
 							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>

From 209ebd4e7459bca5fc3cb9173737e3dfd0896073 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 28 Feb 2013 08:03:34 +0100
Subject: [PATCH 2/4] exp account info in frost

---
 view/theme/frost/admin_users.tpl         | 2 +-
 view/theme/frost/smarty3/admin_users.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frost/admin_users.tpl b/view/theme/frost/admin_users.tpl
index 0d11934348..a3f6d2416f 100644
--- a/view/theme/frost/admin_users.tpl
+++ b/view/theme/frost/admin_users.tpl
@@ -70,7 +70,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;
diff --git a/view/theme/frost/smarty3/admin_users.tpl b/view/theme/frost/smarty3/admin_users.tpl
index 9d74a5e77e..4d88670c17 100644
--- a/view/theme/frost/smarty3/admin_users.tpl
+++ b/view/theme/frost/smarty3/admin_users.tpl
@@ -75,7 +75,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

From 42a054c66739709e11ab7d607da71b6c345239d0 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 28 Feb 2013 08:07:41 +0100
Subject: [PATCH 3/4] exp account info in frost-mobile

---
 view/theme/frost-mobile/admin_users.tpl         | 2 +-
 view/theme/frost-mobile/smarty3/admin_users.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frost-mobile/admin_users.tpl b/view/theme/frost-mobile/admin_users.tpl
index 0d11934348..a3f6d2416f 100644
--- a/view/theme/frost-mobile/admin_users.tpl
+++ b/view/theme/frost-mobile/admin_users.tpl
@@ -70,7 +70,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;
diff --git a/view/theme/frost-mobile/smarty3/admin_users.tpl b/view/theme/frost-mobile/smarty3/admin_users.tpl
index 9d74a5e77e..4d88670c17 100644
--- a/view/theme/frost-mobile/smarty3/admin_users.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_users.tpl
@@ -75,7 +75,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

From cd478ecdcae8ff6c5b8220525fe3d45ec31ec3bb Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 28 Feb 2013 08:10:05 +0100
Subject: [PATCH 4/4] exp account info in decaf-mobile

---
 view/theme/decaf-mobile/admin_users.tpl         | 2 +-
 view/theme/decaf-mobile/smarty3/admin_users.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/decaf-mobile/admin_users.tpl b/view/theme/decaf-mobile/admin_users.tpl
index 3364679249..c3abbeb9c0 100644
--- a/view/theme/decaf-mobile/admin_users.tpl
+++ b/view/theme/decaf-mobile/admin_users.tpl
@@ -70,7 +70,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;
diff --git a/view/theme/decaf-mobile/smarty3/admin_users.tpl b/view/theme/decaf-mobile/smarty3/admin_users.tpl
index 886b67dcdf..df795a1f4f 100644
--- a/view/theme/decaf-mobile/smarty3/admin_users.tpl
+++ b/view/theme/decaf-mobile/smarty3/admin_users.tpl
@@ -75,7 +75,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;