From dd45daaad8637f72aa9d0f927f89e637783fdbf8 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Mon, 11 Mar 2013 02:19:25 +0000
Subject: Get rid of max-height - no longer breaks newer versions of chrome,
 but does break showmore.

---
 view/theme/redbasic/css/style.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c6490a573..b20b1434e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1090,8 +1090,7 @@ footer {
 }
 
 .wall-item-content img {
-  max-height: 95% !important;
-  max-width: 95% !important;
+	max-width: 95% !important;
 /*  box-shadow: 8px 8px 8px #666; can't really have this because of smileys */
 }
 
@@ -3777,4 +3776,4 @@ ul.menu-popup {
 	margin-top: 8px;
 }
 
-.profile-match-connect { margin-top: 5px; }
\ No newline at end of file
+.profile-match-connect { margin-top: 5px; }
-- 
cgit v1.2.3


From fbc5260995866c280fbc48bfb7899836f46136f4 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Tue, 12 Mar 2013 02:35:18 +0000
Subject: Get admin/users mostly working.  Still need to associate channels
 with accounts.

---
 view/tpl/admin_users.tpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 727030f5d..b8822175c 100644
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -66,11 +66,12 @@
 					<tr>
 						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
 						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
+						<td class='email'>$u.account_email</td>
+						<td class='register_date'>$u.account_created</td>
+						<td class='login_date'>$u.account_lastlog</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
 						<td class='login_date'>$u.page_flags</td>
+						<td class='service_class'>$u.account_service_class</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
 						<td class="tools">
 							<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>
-- 
cgit v1.2.3


From b48c481b9cb1b1c06634139dc0e6c4c91b83d873 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Fri, 15 Mar 2013 15:25:39 +0000
Subject: Tidy up

---
 view/tpl/admin_users.tpl         |  3 ---
 view/tpl/smarty3/admin_users.tpl | 10 ++++------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index b8822175c..6de504e2a 100644
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -65,12 +65,9 @@
 				{{ for $users as $u }}
 					<tr>
 						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
 						<td class='email'>$u.account_email</td>
 						<td class='register_date'>$u.account_created</td>
 						<td class='login_date'>$u.account_lastlog</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags</td>
 						<td class='service_class'>$u.account_service_class</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
 						<td class="tools">
diff --git a/view/tpl/smarty3/admin_users.tpl b/view/tpl/smarty3/admin_users.tpl
index 5448a08c4..136ce3c3e 100644
--- a/view/tpl/smarty3/admin_users.tpl
+++ b/view/tpl/smarty3/admin_users.tpl
@@ -70,12 +70,10 @@
 				{{foreach $users as $u}}
 					<tr>
 						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<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='email'>{{$u.account_email}}</td>
+						<td class='register_date'>{{$u.account_created}}</td>
+						<td class='login_date'>{{$u.account_lastlog}}</td>
+						<td class='service_class'>{{$u.account_service_class}}</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
 						<td class="tools">
 							<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>
-- 
cgit v1.2.3