[Customisation Database Commits] r989 - in /trunk/titania: includes/overlords/queue.php language/en/common.php manage/queue.php styles/default/template/manage/queue.html

[Nathan Guse]

Author: exreaction
Date: Sun Apr  4 21:58:52 2010
New Revision: 989

Log:
All category for the queue

Modified:
    trunk/titania/includes/overlords/queue.php
    trunk/titania/language/en/common.php
    trunk/titania/manage/queue.php
    trunk/titania/styles/default/template/manage/queue.html

Modified: trunk/titania/includes/overlords/queue.php
==============================================================================
*** trunk/titania/includes/overlords/queue.php (original)
--- trunk/titania/includes/overlords/queue.php Sun Apr  4 21:58:52 2010
***************
*** 119,126 ****
  				TITANIA_TOPICS_TABLE	=> 't',
  			),
  
! 			'WHERE' => 'q.queue_type = ' . (int) $type . '
! 				AND q.queue_status = ' . (int) $queue_status . '
  				AND c.contrib_id = q.contrib_id
  				AND r.revision_id = q.revision_id
  				AND t.topic_id = q.queue_topic_id',
--- 119,126 ----
  				TITANIA_TOPICS_TABLE	=> 't',
  			),
  
! 			'WHERE' => 'q.queue_type = ' . (int) $type .
! 				(($queue_status) ? ' AND q.queue_status = ' . (int) $queue_status : ' AND q.queue_status > 0 ') . '
  				AND c.contrib_id = q.contrib_id
  				AND r.revision_id = q.revision_id
  				AND t.topic_id = q.queue_topic_id',
***************
*** 283,291 ****
  	*
  	* @param int $type
  	*/
! 	public static function display_categories($type)
  	{
  		$tags = titania::$cache->get_tags(TITANIA_QUEUE);
  
  		$sql = 'SELECT queue_status, COUNT(queue_id) AS cnt FROM ' . TITANIA_QUEUE_TABLE . '
  			WHERE queue_type = ' . (int) $type . '
--- 283,293 ----
  	*
  	* @param int $type
  	*/
! 	public static function display_categories($type, $selected = false)
  	{
  		$tags = titania::$cache->get_tags(TITANIA_QUEUE);
+ 		$tag_count = array();
+ 		$total = 0;
  
  		$sql = 'SELECT queue_status, COUNT(queue_id) AS cnt FROM ' . TITANIA_QUEUE_TABLE . '
  			WHERE queue_type = ' . (int) $type . '
***************
*** 293,302 ****
--- 295,312 ----
  		$result = phpbb::$db->sql_query($sql);
  		while ($row = phpbb::$db->sql_fetchrow($result))
  		{
+ 			$total += ($row['queue_status'] > 0) ? $row['cnt'] : 0;
  			$tag_count[$row['queue_status']] = $row['cnt'];
  		}
  		phpbb::$db->sql_freeresult($result);
  
+ 		phpbb::$template->assign_block_vars('queue_tags', array(
+ 			'TAG_NAME'		=> phpbb::$user->lang['ALL'],
+ 			'TAG_COUNT'		=> $total,
+ 			'U_VIEW_TAG'	=> titania_url::append_url(titania_url::$current_page_url, array('tag' => 'all')),
+ 			'S_SELECTED'	=> ($selected == 0) ? true : false,
+ 		));
+ 
  		foreach ($tags as $tag_id => $row)
  		{
  			if (!isset($tag_count[$tag_id]))
***************
*** 308,314 ****
  			phpbb::$template->assign_block_vars('queue_tags', array(
  				'TAG_NAME'		=> (isset(phpbb::$user->lang[$row['tag_field_name']])) ? phpbb::$user->lang[$row['tag_field_name']] : $row['tag_field_name'],
  				'TAG_COUNT'		=> $tag_count[$tag_id],
! 				'U_VIEW_TAG'	=> titania_url::append_url(titania_url::$current_page_url, array('tag' => $tag_id))
  			));
  		}
  	}
--- 318,325 ----
  			phpbb::$template->assign_block_vars('queue_tags', array(
  				'TAG_NAME'		=> (isset(phpbb::$user->lang[$row['tag_field_name']])) ? phpbb::$user->lang[$row['tag_field_name']] : $row['tag_field_name'],
  				'TAG_COUNT'		=> $tag_count[$tag_id],
! 				'U_VIEW_TAG'	=> titania_url::append_url(titania_url::$current_page_url, array('tag' => $tag_id)),
! 				'S_SELECTED'	=> ($selected == $tag_id) ? true : false,
  			));
  		}
  	}

Modified: trunk/titania/language/en/common.php
==============================================================================
*** trunk/titania/language/en/common.php (original)
--- trunk/titania/language/en/common.php Sun Apr  4 21:58:52 2010
***************
*** 42,47 ****
--- 42,48 ----
  $lang = array_merge($lang, array(
  	'ACCESS_LIMIT_AUTHORS'		=> 'Author-level access limit',
  	'ACCESS_LIMIT_TEAMS'		=> 'Team-level access limit',
+ 	'ALL'						=> 'All',
  	'ALL_CONTRIBUTIONS'			=> 'All contributions',
  	'AUTHOR_BY'					=> 'By %s',
  

Modified: trunk/titania/manage/queue.php
==============================================================================
*** trunk/titania/manage/queue.php (original)
--- trunk/titania/manage/queue.php Sun Apr  4 21:58:52 2010
***************
*** 269,275 ****
  
  	$tag = request_var('tag', TITANIA_QUEUE_NEW);
  	queue_overlord::display_queue($queue_type, $tag);
! 	queue_overlord::display_categories($queue_type);
  
  	titania::page_header('VALIDATION_QUEUE');
  }
--- 269,275 ----
  
  	$tag = request_var('tag', TITANIA_QUEUE_NEW);
  	queue_overlord::display_queue($queue_type, $tag);
! 	queue_overlord::display_categories($queue_type, $tag);
  
  	titania::page_header('VALIDATION_QUEUE');
  }

Modified: trunk/titania/styles/default/template/manage/queue.html
==============================================================================
*** trunk/titania/styles/default/template/manage/queue.html (original)
--- trunk/titania/styles/default/template/manage/queue.html Sun Apr  4 21:58:52 2010
***************
*** 14,24 ****
  	<ul class="topiclist forums">
  
  	<!-- BEGIN queue_tags -->
! 		<li class="row">
  			<dl>
! 				<dt>
! 					<a href="{queue_tags.U_VIEW_TAG}" class="forumtitle">{queue_tags.TAG_NAME}</a>
! 				</dt>
  				<dd class="general">{queue_tags.TAG_COUNT} <dfn>{L_CONTRIBUTIONS}</dfn></dd>
  			</dl>
  		</li>
--- 14,22 ----
  	<ul class="topiclist forums">
  
  	<!-- BEGIN queue_tags -->
! 		<li class="row<!-- IF queue_tags.S_SELECTED --> bg3<!-- ELSEIF queue_tags.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
  			<dl>
! 				<dt><a class="topictitle" href="{queue_tags.U_VIEW_TAG}" class="forumtitle">{queue_tags.TAG_NAME}</a></dt>
  				<dd class="general">{queue_tags.TAG_COUNT} <dfn>{L_CONTRIBUTIONS}</dfn></dd>
  			</dl>
  		</li>