[Customisation Database Commits] r1106 - in /branches/stable: ./ titania/includes/objects/queue.php titania/styles/default/template/manage/attention.html

[Nathan Guse]

Author: exreaction
Date: Tue Apr 20 23:01:47 2010
New Revision: 1106

Log:
Merge to stable

Modified:
    branches/stable/   (props changed)
    branches/stable/titania/includes/objects/queue.php
    branches/stable/titania/styles/default/template/manage/attention.html

Propchange: branches/stable/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Tue Apr 20 23:01:47 2010
***************
*** 1 ****
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102
--- 1 ----
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105

Modified: branches/stable/titania/includes/objects/queue.php
==============================================================================
*** branches/stable/titania/includes/objects/queue.php (original)
--- branches/stable/titania/includes/objects/queue.php Tue Apr 20 23:01:47 2010
***************
*** 438,444 ****
  			$body = sprintf(phpbb::$user->lang[titania_types::$types[$contrib->contrib_type]->create_public],
  				$contrib->contrib_name,
  				$contrib->author->get_url(),
! 				$contrib->author->username,
  				$contrib->contrib_desc,
  				$revision->revision_version,
  				titania_url::build_url('download', array('id' => $revision->attachment_id)),
--- 438,444 ----
  			$body = sprintf(phpbb::$user->lang[titania_types::$types[$contrib->contrib_type]->create_public],
  				$contrib->contrib_name,
  				$contrib->author->get_url(),
! 				users_overlord::get_user($contrib->author->user_id, '_username'),
  				$contrib->contrib_desc,
  				$revision->revision_version,
  				titania_url::build_url('download', array('id' => $revision->attachment_id)),

Modified: branches/stable/titania/styles/default/template/manage/attention.html
==============================================================================
*** branches/stable/titania/styles/default/template/manage/attention.html (original)
--- branches/stable/titania/styles/default/template/manage/attention.html Tue Apr 20 23:01:47 2010
***************
*** 2,63 ****
  
  <form id="mcp" method="post" action="{S_ACTION}">
  
! 	<!-- 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_CLOSED --> bg3<!-- ELSEIF 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>
! 			<!-- ENDIF -->
! 			<input type="checkbox" name="open" id="open"<!-- IF S_OPEN_CHECKED --> checked="checked"<!-- ENDIF -->> <label for="open">{L_OPEN_ITEMS}</label> &nbsp;
! 			<input type="checkbox" name="closed" id="closed"<!-- IF S_CLOSED_CHECKED --> checked="checked"<!-- ENDIF -->> <label for="closed">{L_CLOSED_ITEMS}</label>
! 			<input type="submit" name="sort" value="{L_GO}" class="button2" />
! 		</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 -->
  
  <!--
  <!-- IF .attention -->
--- 2,63 ----
  
  <form id="mcp" method="post" action="{S_ACTION}">
  
! <!-- 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_CLOSED --> bg3<!-- ELSEIF 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>
  
! <!-- ELSE -->
! 	<p><strong>{L_NO_REPORTS}</strong></p>
! <!-- ENDIF -->
  
! <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>
  	<!-- ENDIF -->
+ 	<input type="checkbox" name="open" id="open"<!-- IF S_OPEN_CHECKED --> checked="checked"<!-- ENDIF -->> <label for="open">{L_OPEN_ITEMS}</label> &nbsp;
+ 	<input type="checkbox" name="closed" id="closed"<!-- IF S_CLOSED_CHECKED --> checked="checked"<!-- ENDIF -->> <label for="closed">{L_CLOSED_ITEMS}</label>
+ 	<input type="submit" name="sort" value="{L_GO}" class="button2" />
+ </fieldset>
+ <!-- IF TOTAL_RESULTS --><hr /><!-- ENDIF -->
+ <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>
  
  <!--
  <!-- IF .attention -->