[Customisation Database Commits] r830 - in /trunk/titania: includes/overlords/attention.php language/en/common.php styles/default/template/manage/attention_details.html styles/default/theme/common.css

[Tom Catullo]

Author: Tom
Date: Mon Mar 22 23:19:24 2010
New Revision: 830

Log:
Cleaned up and revamped the Attention pages for reported or unapproved content.

Modified:
    trunk/titania/includes/overlords/attention.php
    trunk/titania/language/en/common.php
    trunk/titania/styles/default/template/manage/attention_details.html
    trunk/titania/styles/default/theme/common.css

Modified: trunk/titania/includes/overlords/attention.php
==============================================================================
*** trunk/titania/includes/overlords/attention.php (original)
--- trunk/titania/includes/overlords/attention.php Mon Mar 22 23:19:24 2010
***************
*** 154,159 ****
--- 154,160 ----
  			$attention_ids[] = $row['attention_id'];
  			$user_ids[] = $row['attention_poster_id'];
  			$user_ids[] = $row['attention_requester'];
+ 			$user_ids[] = $row['attention_close_user'];
  
  			if ($row['attention_close_user'])
  			{
***************
*** 178,184 ****
  			$output = array_merge(
  				$attention->assign_details(true),
  				users_overlord::assign_details($row['attention_poster_id']),
! 				users_overlord::assign_details($row['attention_requester'], 'REPORTER_')
  			);
  
  			// Do we have to?
--- 179,186 ----
  			$output = array_merge(
  				$attention->assign_details(true),
  				users_overlord::assign_details($row['attention_poster_id']),
! 				users_overlord::assign_details($row['attention_requester'], 'REPORTER_'),
! 				users_overlord::assign_details($row['attention_close_user'], 'CLOSER_')
  			);
  
  			// Do we have to?

Modified: trunk/titania/language/en/common.php
==============================================================================
*** trunk/titania/language/en/common.php (original)
--- trunk/titania/language/en/common.php Mon Mar 22 23:19:24 2010
***************
*** 87,92 ****
--- 87,94 ----
  	'CONTRIB_MANAGE'			=> 'Manage Contribution',
  	'CREATE_CONTRIBUTION'		=> 'Create Contribution',
  	'CUSTOMISATION_DATABASE'	=> 'Customisation Database',
+ 	'CLOSED_ITEMS'				=> 'Closed Items',
+ 	'CLOSED_BY'					=> 'Closed by',
  
  	'DELETED_MESSAGE'			=> 'Last deleted by %1$s on %2$s - <a href="%3$s">Click here to undelete this message</a>',
  	'DESCRIPTION'				=> 'Description',
***************
*** 95,100 ****
--- 97,103 ----
  	'DOWNLOADS'					=> 'Downloads',
  	'DOWNLOAD_ACCESS_DENIED'	=> 'You are not allowed to download the requested file.',
  	'DOWNLOAD_NOT_FOUND'		=> 'The requested file could not be found.',
+ 	'DATE_CLOSED'				=> 'Date closed',
  
  	'EDIT'						=> 'Edit',
  	'EDITED_MESSAGE'			=> 'Last edited by %1$s on %2$s',

Modified: trunk/titania/styles/default/template/manage/attention_details.html
==============================================================================
*** trunk/titania/styles/default/template/manage/attention_details.html (original)
--- trunk/titania/styles/default/template/manage/attention_details.html Mon Mar 22 23:19:24 2010
***************
*** 72,90 ****
  	<span class="corners-bottom"><span></span></span></div>
  </div>
  
  <!-- BEGIN attention_closed -->
! <div id="report" class="panel">
! 	<div class="inner"><span class="corners-top"><span></span></span>
! 
! 	<div class="postbody">
! 		<h3>{attention_closed.ATTENTION_REASON}</h3>
! 		<p class="author">{L_POST_BY_AUTHOR} {attention_closed.REPORTER_USER_FULL} &laquo; {attention_closed.ATTENTION_TIME}</p>
! 		<div class="content">
! 			{attention_closed.ATTENTION_DESCRIPTION}
! 		</div>
  	</div>
- 
- 	<span class="corners-bottom"><span></span></span></div>
  </div>
  <!-- END attention_closed -->
  
--- 72,97 ----
  	<span class="corners-bottom"><span></span></span></div>
  </div>
  
+ <h3>{L_CLOSED_ITEMS}</h3>
  <!-- BEGIN attention_closed -->
! <div id="attention">
! 	<h4>{attention_closed.ATTENTION_REASON}</h4>
! 	<p class="author">{L_POST_BY_AUTHOR} {attention_closed.REPORTER_USER_FULL} &laquo; {attention_closed.ATTENTION_TIME}</p>
! 	<table>
! 		<tbody>
! 		<tr>
! 			<td class="bg2"><strong>{L_CLOSED_BY}:</strong></td>
! 			<td class="bg1">{attention_closed.CLOSER_USER_FULL}</td>
! 		</tr>
! 		<tr>
! 			<td class="bg2"><strong>{L_DATE_CLOSED}:</strong></td>
! 			<td class="bg1">{attention_closed.ATTENTION_CLOSE_TIME}</td>
! 		</tr>
! 		</tbody>
! 	</table>
! 	<div class="content">
! 		<blockquote><div><cite>{attention_closed.CLOSER_USER_FULL} {L_WROTE}:</cite>{attention_closed.ATTENTION_DESCRIPTION}</div></blockquote>
  	</div>
  </div>
  <!-- END attention_closed -->
  

Modified: trunk/titania/styles/default/theme/common.css
==============================================================================
*** trunk/titania/styles/default/theme/common.css (original)
--- trunk/titania/styles/default/theme/common.css Mon Mar 22 23:19:24 2010
***************
*** 399,404 ****
--- 399,421 ----
  	color: #BC2A4D;
  }
  
+ /* Attention Details Page
+ --------------------------------------------- */
+ #attention {
+ 	border-bottom-style: dashed;
+ 	border-bottom-width: 1px;
+ 	padding-top: 5px;
+ }
+ 
+ #attention td {
+ 	padding: 3px;
+ }
+ 
+ #attention .content {
+ 	font-size: 13px;
+ 	padding-bottom: 10px;
+ }
+ 
  
  #wrap {
  	width: 900px;