[Customisation Database Commits] r759 - in /trunk/titania: ./ includes/objects/ includes/overlords/ language/en/ manage/ styles/default/template/manage/

Nathan Guse exreaction at phpbb.com
Mon Mar 15 20:53:52 GMT 2010


Author: exreaction
Date: Mon Mar 15 20:53:52 2010
New Revision: 759

Log:
Much more work on the attention stuff

Beautify for me plz prototech <3

Added:
    trunk/titania/styles/default/template/manage/attention_details.html
Modified:
    trunk/titania/includes/objects/attention.php
    trunk/titania/includes/objects/post.php
    trunk/titania/includes/overlords/attention.php
    trunk/titania/includes/overlords/users.php
    trunk/titania/install.php
    trunk/titania/language/en/manage.php
    trunk/titania/manage/attention.php
    trunk/titania/styles/default/template/manage/attention.html

Modified: trunk/titania/includes/objects/attention.php
==============================================================================
*** trunk/titania/includes/objects/attention.php (original)
--- trunk/titania/includes/objects/attention.php Mon Mar 15 20:53:52 2010
***************
*** 52,57 ****
--- 52,59 ----
  			'attention_type'				=> array('default' => 0), // attention type constants (reported, needs approval, etc)
  			'attention_object_type'			=> array('default' => 0),
  			'attention_object_id'			=> array('default' => 0),
+ 			'attention_poster_id'			=> array('default' => 0),
+ 			'attention_post_time'			=> array('default' => 0),
  			'attention_url'					=> array('default' => ''),
  			'attention_requester'			=> array('default' => (int) phpbb::$user->data['user_id']),
  			'attention_time'				=> array('default' => titania::$time),
***************
*** 101,112 ****
--- 103,123 ----
  	public function assign_details($return = false)
  	{
  		$output = array(
+ 			'ATTENTION_ID'			=> $this->attention_id,
  			'ATTENTION_TYPE'		=> $this->attention_type,
  			'ATTENTION_TIME'		=> phpbb::$user->format_date($this->attention_time),
+ 			'ATTENTION_POST_TIME'	=> phpbb::$user->format_date($this->attention_post_time),
  			'ATTENTION_CLOSE_TIME'	=> ($this->attention_close_time) ? phpbb::$user->format_date($this->attention_close_time) : '',
  			'ATTENTION_TITLE'		=> $this->attention_title,
+ 			'ATTENTION_REASON'		=> $this->get_reason_string(),
+ 			'ATTENTION_DESCRIPTION'	=> $this->attention_description,
  
  			'U_VIEW_ATTENTION'		=> $this->get_url(),
+ 			'U_VIEW_DETAILS'		=> titania_url::append_url(titania_url::$current_page_url, array('a' => $this->attention_id)),
+ 
+ 			'S_CLOSED'				=> ($this->attention_close_time) ? true : false,
+ 			'S_UNAPPROVED'			=> ($this->attention_type == TITANIA_ATTENTION_UNAPPROVED) ? true : false,
+ 			'S_REPORTED'			=> ($this->attention_type == TITANIA_ATTENTION_REPORTED) ? true : false,
  		);
  
  		if ($return)
***************
*** 116,119 ****
--- 127,144 ----
  
  		phpbb::$template->assign_vars($output);
  	}
+ 
+ 	public function get_reason_string()
+ 	{
+ 		switch ((int) $this->attention_type)
+ 		{
+ 			case TITANIA_ATTENTION_REPORTED :
+ 				return phpbb::$user->lang['REPORTED'];
+ 			break;
+ 
+ 			case TITANIA_ATTENTION_UNAPPROVED :
+ 				return phpbb::$user->lang['UNAPPROVED'];
+ 			break;
+ 		}
+ 	}
  }

Modified: trunk/titania/includes/objects/post.php
==============================================================================
*** trunk/titania/includes/objects/post.php (original)
--- trunk/titania/includes/objects/post.php Mon Mar 15 20:53:52 2010
***************
*** 465,470 ****
--- 465,477 ----
  			return false;
  		}
  
+ 		// Make sure we have a topic here
+ 		if (!$this->topic->topic_id)
+ 		{
+ 			$this->topic->topic_id = $this->topic_id;
+ 			$this->topic->load();
+ 		}
+ 
  		if ($this->post_id == $this->topic->topic_first_post_id)
  		{
  			$this->topic->__set_array(array(
***************
*** 583,588 ****
--- 590,601 ----
  
  		// @todo remove attachments and other things
  
+ 		// Remove any attention items
+ 		$sql = 'DELETE FROM ' . TITANIA_ATTENTION_TABLE . '
+ 			WHERE attention_object_type = ' . TITANIA_POST . '
+ 				AND attention_object_id = ' . $this->post_id;
+ 		phpbb::$db->sql_query($sql);
+ 
  		// Initiate self-destruct mode
  		parent::delete();
  
***************
*** 770,776 ****
  			'U_INFO'						=> false,//$this->get_url('info'),
  			'U_QUOTE'						=> $this->acl_get('post') ? $this->get_url('quote') : '',
  			//U_MCP_APPROVE
! 			'U_MCP_REPORT'					=> titania_url::build_url('manage/attention', array('type' => $this->post_type, 'id' => $this->post_id)),
  
  			'S_UNREAD_POST'					=> ($this->unread) ? true : false, // remember that you must set this up extra...
  			'S_POST_APPROVED'				=> $this->post_approved,
--- 783,789 ----
  			'U_INFO'						=> false,//$this->get_url('info'),
  			'U_QUOTE'						=> $this->acl_get('post') ? $this->get_url('quote') : '',
  			//U_MCP_APPROVE
! 			'U_MCP_REPORT'					=> titania_url::build_url('manage/attention', array('type' => TITANIA_POST, 'id' => $this->post_id)),
  
  			'S_UNREAD_POST'					=> ($this->unread) ? true : false, // remember that you must set this up extra...
  			'S_POST_APPROVED'				=> $this->post_approved,

Modified: trunk/titania/includes/overlords/attention.php
==============================================================================
*** trunk/titania/includes/overlords/attention.php (original)
--- trunk/titania/includes/overlords/attention.php Mon Mar 15 20:53:52 2010
***************
*** 68,74 ****
  		return $row;
  	}
  
! 	public static function display_attention_list($type = false, $display_closed = false, $sort = false, $pagination = false)
  	{
  		if ($sort === false)
  		{
--- 68,86 ----
  		return $row;
  	}
  
! 	/**
! 	* Display the list of attention items
! 	*
! 	* @param array $options
! 	* 	attention_type
! 	* 	attention_object_id
! 	* 	only_closed bool only display closed items
! 	* 	display_closed bool display closed and open items
! 	* 	template_block string the name of the template block to output to (attention if not sent)
! 	* @param titania_sort $sort
! 	* @param titania_pagination $pagination
! 	*/
! 	public static function display_attention_list($options = array(), $sort = false, $pagination = false)
  	{
  		if ($sort === false)
  		{
***************
*** 96,125 ****
  				TITANIA_ATTENTION_TABLE	=> 'a',
  			),
  
  			'ORDER_BY'	=> $sort->get_order_by(),
  		);
  
  		// Limit to certain types if requested
! 		if ($type)
  		{
! 			$sql_ary['WHERE'] .= 'a.attention_type = ' . (int) $type;
  		}
  
! 		// Do we want the closed ones?
! 		if (!$display_closed)
  		{
! 			if (!isset($sql_ary['WHERE']))
! 			{
! 				$sql_ary['WHERE'] = '';
! 			}
! 			else
! 			{
! 				$sql_ary['WHERE'] .= ' AND ';
! 			}
  
! 			$sql_ary['WHERE'] .= 'a.attention_close_time = 0';
  		}
  
  		// Main SQL Query
  		$sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
  
--- 108,142 ----
  				TITANIA_ATTENTION_TABLE	=> 'a',
  			),
  
+ 			'WHERE'		=> array(),
+ 
  			'ORDER_BY'	=> $sort->get_order_by(),
  		);
  
  		// Limit to certain types if requested
! 		if (isset($options['attention_type']))
  		{
! 			$sql_ary['WHERE'][] = 'a.attention_type = ' . (int) $options['attention_type'];
  		}
  
! 		// Limit to certain item if requested
! 		if (isset($options['attention_object_id']))
  		{
! 			$sql_ary['WHERE'][] = 'a.attention_object_id = ' . (int) $options['attention_object_id'];
! 		}
  
! 		// Do we want the closed ones?
! 		if (isset($options['only_closed']) && $options['only_closed'])
! 		{
! 			$sql_ary['WHERE'][] = 'a.attention_close_time <> 0';
! 		}
! 		else if (!isset($options['display_closed']) || $options['display_closed'] == false)
! 		{
! 			$sql_ary['WHERE'][] = 'a.attention_close_time = 0';
  		}
  
+ 		$sql_ary['WHERE'] = implode(' AND ', $sql_ary['WHERE']);
+ 
  		// Main SQL Query
  		$sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
  
***************
*** 135,140 ****
--- 152,158 ----
  		while ($row = phpbb::$db->sql_fetchrow($result))
  		{
  			$attention_ids[] = $row['attention_id'];
+ 			$user_ids[] = $row['attention_poster_id'];
  			$user_ids[] = $row['attention_requester'];
  
  			if ($row['attention_close_user'])
***************
*** 159,165 ****
  
  			$output = array_merge(
  				$attention->assign_details(true),
! 				users_overlord::assign_details($row['attention_requester'])
  			);
  
  			// Do we have to?
--- 177,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?
***************
*** 171,177 ****
  				);
  			}
  
! 			phpbb::$template->assign_block_vars('attention', $output);
  		}
  		unset($attention);
  	}
--- 190,197 ----
  				);
  			}
  
! 			$template_block = (isset($options['template_block'])) ? $options['template_block'] : 'attention';
! 			phpbb::$template->assign_block_vars($template_block, $output);
  		}
  		unset($attention);
  	}

Modified: trunk/titania/includes/overlords/users.php
==============================================================================
*** trunk/titania/includes/overlords/users.php (original)
--- trunk/titania/includes/overlords/users.php Mon Mar 15 20:53:52 2010
***************
*** 235,241 ****
  		return self::$users[$user_id];
  	}
  
! 	public static function assign_details($user_id, $prefix = '')
  	{
  		$row = self::get_user($user_id);
  		$user_id = $row['user_id']; // Re-assign properly...in case it gives us the anonymous user
--- 235,241 ----
  		return self::$users[$user_id];
  	}
  
! 	public static function assign_details($user_id, $prefix = '', $output = false)
  	{
  		$row = self::get_user($user_id);
  		$user_id = $row['user_id']; // Re-assign properly...in case it gives us the anonymous user
***************
*** 252,258 ****
  		// Undo
  		$phpbb_root_path = PHPBB_ROOT_PATH;
  
! 		return array(
  			$prefix . 'USER_FULL'			=> self::get_user($user_id, '_full'),
  			$prefix . 'USER_COLOUR'			=> self::get_user($user_id, '_colour'),
  			$prefix . 'USERNAME'			=> self::get_user($user_id, '_username'),
--- 252,258 ----
  		// Undo
  		$phpbb_root_path = PHPBB_ROOT_PATH;
  
! 		$output = array(
  			$prefix . 'USER_FULL'			=> self::get_user($user_id, '_full'),
  			$prefix . 'USER_COLOUR'			=> self::get_user($user_id, '_colour'),
  			$prefix . 'USERNAME'			=> self::get_user($user_id, '_username'),
***************
*** 287,291 ****
--- 287,298 ----
  			$prefix . 'U_YIM'				=> self::get_user($user_id, '_yim'),
  			$prefix . 'U_JABBER'			=> self::get_user($user_id, '_jabber'),
  		);
+ 
+ 		if ($output)
+ 		{
+ 			phpbb::$template->assign_vars($output);
+ 		}
+ 
+ 		return $output;
  	}
  }

Modified: trunk/titania/install.php
==============================================================================
*** trunk/titania/install.php (original)
--- trunk/titania/install.php Mon Mar 15 20:53:52 2010
***************
*** 784,789 ****
--- 784,801 ----
  		'custom' => 'titania_custom',
  	),
  
+ 	'0.1.48' => array(
+ 		'table_column_add' => array(
+ 			array(TITANIA_ATTENTION_TABLE, 'attention_poster_id', array('UINT', 0)),
+ 			array(TITANIA_ATTENTION_TABLE, 'attention_post_time', array('TIMESTAMP', 0)),
+ 		),
+ 
+ 		'table_index_add' => array(
+ 			array(TITANIA_ATTENTION_TABLE, 'attention_poster_id'),
+ 			array(TITANIA_ATTENTION_TABLE, 'attention_post_time'),
+ 		),
+ 	),
+ 
  	// IF YOU ADD A NEW VERSION DO NOT FORGET TO INCREMENT THE VERSION NUMBER IN common.php!
  );
  

Modified: trunk/titania/language/en/manage.php
==============================================================================
*** trunk/titania/language/en/manage.php (original)
--- trunk/titania/language/en/manage.php Mon Mar 15 20:53:52 2010
***************
*** 44,49 ****
--- 44,51 ----
  'NO_ATTENTION' => 'No items need attention.',
  'ATTENTION' => 'Attention',
  'QUEUE_REPLY_MOVE' => 'Moved from %1$s to %2$s',
+ 'REPORTED' => 'Reported',
+ 'UNAPPROVED' => 'Unapproved',
  'UNKNOWN' => 'Unknown',
  'QUEUE_REPLY_IN_PROGRESS' => 'Marked as in-progress',
  'QUEUE_REPLY_NO_PROGRESS' => 'Marked as not in-progress',

Modified: trunk/titania/manage/attention.php
==============================================================================
*** trunk/titania/manage/attention.php (original)
--- trunk/titania/manage/attention.php Mon Mar 15 20:53:52 2010
***************
*** 21,26 ****
--- 21,28 ----
  	titania::needs_auth();
  }
  
+ phpbb::$user->add_lang('mcp');
+ 
  $attention_id = request_var('a', 0);
  $object_type = request_var('type', 0);
  $object_id = request_var('id', 0);
***************
*** 45,80 ****
  	$attention_object = new titania_attention;
  	$attention_object->__set_array($row);
  
! 	// Grab some users
! 	$user_ids = array($row['attention_requester']);
! 	if ($row['attention_close_user'])
  	{
! 		$user_ids[] = $row['attention_close_user'];
  	}
! 	users_overlord::load_users($user_ids);
  
! 	$output = array_merge(
! 		$attention_object->assign_details(true),
! 		users_overlord::assign_details($row['attention_requester'])
  	);
  
! 	// Do we have to?
! 	if ($row['attention_close_user'])
  	{
! 		$output = array_merge(
! 			$output,
! 			users_overlord::assign_details($row['attention_close_user'], 'CLOSE_')
! 		);
  	}
  
! 	phpbb::$template->assign_block_vars('attention', $output);
  
! 	unset($attention_object);
  }
  else
  {
  	$type = request_var('type', '');
  	$display_all = request_var('display_all', false);
  
  	switch ($type)
  	{
--- 47,148 ----
  	$attention_object = new titania_attention;
  	$attention_object->__set_array($row);
  
! 	$close = (isset($_POST['close'])) ? true : false;
! 	$approve = (isset($_POST['approve'])) ? true : false;
! 	$disapprove = (isset($_POST['disapprove'])) ? true : false;
! 
! 	// Close, approve, or disapprove the items
! 	if ($close || $approve || $disapprove)
  	{
! 		if (!check_form_key('attention'))
! 		{
! 			trigger_error('FORM_INVALID');
! 		}
! 
! 		$sql_ary = array(
! 			'attention_close_time'	=> titania::$time,
! 			'attention_close_user'	=> phpbb::$user->data['user_id'],
! 		);
! 
! 		$sql = 'UPDATE ' . TITANIA_ATTENTION_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
! 			WHERE attention_object_id = ' . (int) $attention_object->attention_object_id . '
! 				AND attention_object_type = ' . (int) $attention_object->attention_object_type . '
! 				AND attention_type = ' . (($close || $delete) ? TITANIA_ATTENTION_REPORTED : TITANIA_ATTENTION_UNAPPROVED);
! 		phpbb::$db->sql_query($sql);
  	}
! 	add_form_key('attention');
  
! 	// Display the current attention items
! 	$options = array(
! 		'attention_object_id'	=> $attention_object->attention_object_id,
  	);
+ 	attention_overlord::display_attention_list($options);
  
! 	// Display the old (closed) attention items
! 	$options['only_closed'] = true;
! 	$options['template_block'] = 'attention_closed';
! 	attention_overlord::display_attention_list($options);
! 
! 	switch ((int) $attention_object->attention_object_type)
  	{
! 		case TITANIA_POST :
! 			$post = new titania_post;
! 			$post->post_id = $attention_object->attention_object_id;
! 			if (!$post->load())
! 			{
! 				$attention_object->delete();
! 				trigger_error('NO_POST');
! 			}
! 
! 			// Close or approve the report
! 			if ($close)
! 			{
! 				$post->post_reported = false;
! 				$post->submit();
! 			}
! 			if ($approve)
! 			{
! 				$post->post_approved = 1;
! 				$post->submit();
! 			}
! 
! 			users_overlord::load_users(array($post->post_user_id, $post->post_edit_user, $post->post_delete_user));
! 			users_overlord::assign_details($post->post_user_id, 'POSTER_', true);
! 
! 			phpbb::$template->assign_vars(array(
! 				'POST_SUBJECT'		=> censor_text($post->post_subject),
! 				'POST_DATE'			=> $user->format_date($post->post_time),
! 				'POST_TEXT'			=> $post->generate_text_for_display(),
! 				'EDITED_MESSAGE'	=> ($post->post_edited) ? sprintf(phpbb::$user->lang['EDITED_MESSAGE'], users_overlord::get_user($post->post_edit_user, '_full'), phpbb::$user->format_date($post->post_edited)) : '',
! 				'DELETED_MESSAGE'	=> ($post->post_deleted != 0) ? sprintf(phpbb::$user->lang['DELETED_MESSAGE'], users_overlord::get_user($post->post_delete_user, '_full'), phpbb::$user->format_date($post->post_deleted), $post->get_url('undelete')) : '',
! 				'POST_EDIT_REASON'	=> censor_text($post->post_edit_reason),
! 
! 				'U_VIEW'			=> $post->get_url(),
! 				'U_EDIT'			=> $post->get_url('edit'),
! 			));
! 		break;
  	}
  
! 	titania::page_header('ATTENTION');
  
! 	titania::page_footer(true, 'manage/attention_details.html');
  }
  else
  {
  	$type = request_var('type', '');
  	$display_all = request_var('display_all', false);
+ 	/*$close = (isset($_POST['close'])) ? true : false;
+ 	$id_list = request_var('id_list', array(0));
+ 
+ 	if ($close && sizeof($id_list))
+ 	{
+ 		$attention_object = new titania_attention;
+ 		foreach ($id_list as $attention_id)
+ 		{
+ 			$attention_object->attention_id = $attention_id;
+ 			$attention_object->load();
+ 		}
+ 	}*/
  
  	switch ($type)
  	{
***************
*** 91,99 ****
  		break;
  	}
  
- 	attention_overlord::display_attention_list($type, $display_all);
- }
  
! titania::page_header('ATTENTION');
  
! titania::page_footer(true, 'manage/attention.html');
--- 159,176 ----
  		break;
  	}
  
  
! 	$options = array(
! 		'attention_type'	=> $type,
! 		'display_all'		=> $display_all,
! 	);
! 	attention_overlord::display_attention_list($options);
  
! 	phpbb::$template->assign_vars(array(
! 		'S_ACTION'		=> titania_url::build_url('manage/attention'),
! 	));
! 
! 	titania::page_header('ATTENTION');
! 
! 	titania::page_footer(true, 'manage/attention.html');
! }
\ No newline at end of file

Modified: trunk/titania/styles/default/template/manage/attention.html
==============================================================================
*** trunk/titania/styles/default/template/manage/attention.html (original)
--- trunk/titania/styles/default/template/manage/attention.html Mon Mar 15 20:53:52 2010
***************
*** 1,60 ****
  <!-- INCLUDE manage/manage_header.html -->
  
  <h3 class="section-name">{PAGE_TITLE}</h3>
  
! <!-- IF PAGINATION or TOTAL_RESULTS -->
! <div class="topic-actions">
! 	<div class="pagination">
! 		<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_RESULTS}
! 		<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
! 	</div>
! </div>
! <!-- ENDIF -->
! <div class="clear"></div>
  
! <!-- BEGIN attention -->
! 	<!-- IF attention.S_TOPIC_TYPE_SWITCH and not attention.S_FIRST_ROW -->
  		</ul>
- 	<!-- ENDIF -->
- 
- 	<!-- IF attention.S_FIRST_ROW or attention.S_TOPIC_TYPE_SWITCH -->
  		<ul class="topiclist">
  			<li class="header">
! 				<dl class="icon">
! 					<dt>{L_ATTENTION}</dt>
  				</dl>
  			</li>
  		</ul>
  		<ul class="topiclist cplist">
- 	<!-- ENDIF -->
  
! 		<li class="row<!-- IF attention.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
! 			<dl class="icon">
! 				<dt>
! 					<a href="{attention.U_VIEW_ATTENTION}" class="topictitle">{attention.ATTENTION_TITLE}</a>
! 				</dt>
! 			</dl>
! 		</li>
  
! 	<!-- IF attention.S_LAST_ROW -->
! 				</ul>
! 	<!-- ENDIF -->
  
! <!-- BEGINELSE -->
! 	<div class="panel">
! 		<div class="inner"><span class="corners-top"><span></span></span>
! 		<strong>{L_NO_ATTENTION}</strong>
! 		<span class="corners-bottom"><span></span></span></div>
! 	</div>
! <!-- END attention -->
  
! <!-- IF PAGINATION or TOTAL_RESULTS -->
! <div class="topic-actions">
! 	<div class="pagination">
! 		<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_RESULTS}
! 		<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
! 	</div>
  </div>
  <!-- ENDIF -->
  
  <!-- INCLUDE manage/manage_footer.html -->
\ No newline at end of file
--- 1,78 ----
  <!-- INCLUDE manage/manage_header.html -->
  
+ <form id="mcp" method="post" action="{S_ACTION}">
+ 
  <h3 class="section-name">{PAGE_TITLE}</h3>
  
! <div class="panel">
! 	<div class="inner"><span class="corners-top"><span></span></span>
  
! 	<!-- IF .attention -->
! 		<ul class="linklist">
! 			<li class="rightside pagination">
! 				<!-- IF TOTAL_RESULTS -->{TOTAL_RESULTS}<!-- ENDIF -->
! 				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
! 			</li>
  		</ul>
  		<ul class="topiclist">
  			<li class="header">
! 				<dl>
! 					<dt>{L_VIEW_DETAILS}</dt>
! 					<dd class="moderation"><span>{L_REPORTER}</span></dd>
! 					<!--<dd class="mark">{L_MARK}</dd>-->
  				</dl>
  			</li>
  		</ul>
  		<ul class="topiclist cplist">
  
! 		<!-- BEGIN attention -->
! 			<li class="row<!-- IF attention.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
! 				<dl>
! 					<dt>
! 						<a href="{attention.U_VIEW_DETAILS}" class="topictitle">{attention.ATTENTION_TITLE}</a><br />
! 						<span>{L_POSTED} {L_POST_BY_AUTHOR} {attention.USER_FULL} &raquo; {attention.ATTENTION_POST_TIME}</span>
! 					</dt>
! 					<dd class="moderation">
! 						<span>{attention.REPORTER_USER_FULL} &laquo; {attention.ATTENTION_TIME}</span>
! 					</dd>
! 					<!--<dd class="mark"><input type="checkbox" name="id_list[]" value="{attention.ATTENTION_ID}" /></dd>-->
! 				</dl>
! 			</li>
! 		<!-- END attention -->
! 		</ul>
  
! 		<fieldset class="display-options">
! 			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
! 			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
! 			<!-- IF S_SELECT_SORT_DAYS -->
! 				<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
! 				<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
! 				<input type="submit" name="sort" value="{L_GO}" class="button2" />
! 			<!-- ENDIF -->
! 		</fieldset>
! 		<hr />
! 		<ul class="linklist">
! 			<li class="rightside pagination">
! 				<!-- IF TOTAL_RESULTS -->{TOTAL_RESULTS}<!-- ENDIF -->
! 				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
! 			</li>
! 		</ul>
  
! 	<!-- ELSE -->
! 		<p><strong>{L_NO_REPORTS}</strong></p>
! 	<!-- ENDIF -->
  
! 	<span class="corners-bottom"><span></span></span></div>
  </div>
+ 
+ <!--
+ <!-- IF .attention -->
+ 	<fieldset class="display-actions">
+ 		<!-- IF not S_CLOSED -->&nbsp;<input class="button1" type="submit" name="close" value="{L_CLOSE_REPORTS}" /><!-- ENDIF -->
+ 		<div><a href="#" onclick="marklist('mcp', 'report_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'report_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
+ 	</fieldset>
  <!-- ENDIF -->
+ -->
+ </form>
  
  <!-- INCLUDE manage/manage_footer.html -->
\ No newline at end of file

Added: trunk/titania/styles/default/template/manage/attention_details.html
==============================================================================
*** trunk/titania/styles/default/template/manage/attention_details.html (added)
--- trunk/titania/styles/default/template/manage/attention_details.html Mon Mar 15 20:53:52 2010
***************
*** 0 ****
--- 1,91 ----
+ <!-- INCLUDE manage/manage_header.html -->
+ 
+ <!-- BEGIN attention -->
+ <div id="report" class="panel">
+ 	<div class="inner"><span class="corners-top"><span></span></span>
+ 
+ 	<div class="postbody">
+ 		<h3>{attention.ATTENTION_REASON}</h3>
+ 		<p class="author">{L_POST_BY_AUTHOR} {attention.REPORTER_USER_FULL} &laquo; {attention.ATTENTION_TIME}</p>
+ 		<div class="content">
+ 			{attention.ATTENTION_DESCRIPTION}
+ 		</div>
+ 
+ 		<!-- IF attention.S_UNAPPROVED -->
+ 			<form method="post" id="approve" action="{S_ACTION}">
+ 				<p class="rules">
+ 					<input class="button1" type="submit" value="{L_APPROVE}" name="approve" /> &nbsp;
+ 					<input class="button2" type="submit" value="{L_DISAPPROVE}" name="disapprove" />
+ 					{S_FORM_TOKEN}
+ 				</p>
+ 			</form>
+ 		<!-- ENDIF -->
+ 
+ 			<!-- IF attention.S_REPORTED -->
+ 			<form method="post" id="reported" action="{S_ACTION}">
+ 				<p class="rules">
+ 					<input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="close" />
+ 					{S_FORM_TOKEN}
+ 				</p>
+ 			</form>
+ 		<!-- ENDIF -->
+ 	</div>
+ 
+ 	<span class="corners-bottom"><span></span></span></div>
+ </div>
+ <!-- END attention -->
+ 
+ <div class="panel">
+ 	<div class="inner"><span class="corners-top"><span></span></span>
+ 
+ 	<div class="postbody">
+ 		<!-- IF U_EDIT -->
+ 		<ul class="profile-icons">
+ 			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li>
+ 		</ul>
+ 		<!-- ENDIF -->
+ 
+ 		<h3><a href="{U_VIEW}">{POST_SUBJECT}</a></h3>
+ 		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POSTER_USER_FULL} &raquo; {POST_DATE}</p>
+ 
+ 		<div class="content">
+ 			{POST_TEXT}
+ 		</div>
+ 
+ 		<!-- IF .attachment -->
+ 			<dl class="attachbox">
+ 				<dt>{L_ATTACHMENTS}</dt>
+ 				<!-- BEGIN attachment -->
+ 					<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
+ 				<!-- END attachment -->
+ 			</dl>
+ 		<!-- ENDIF -->
+ 
+ 		<!-- IF EDITED_MESSAGE or DELETED_MESSAGE -->
+ 			<div class="notice">
+ 				{EDITED_MESSAGE}<!-- IF EDITED_MESSAGE and DELETED_MESSAGE --><br /><!-- ENDIF -->{DELETED_MESSAGE}
+ 				<!-- IF POST_EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{POST_EDIT_REASON}</em><!-- ENDIF -->
+ 			</div>
+ 		<!-- ENDIF -->
+ 	</div>
+ 
+ 	<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 -->
+ 
+ <!-- INCLUDE manage/manage_footer.html -->
\ No newline at end of file




More information about the customisationdb-commits mailing list