[Customisation Database Commits] r577 - in /trunk/titania: ./ authors/ includes/ includes/overlords/ includes/tools/ js/ language/en/ styles/default/template/ styles/default/template/common/
Nathan Guse
exreaction at phpbb.com
Thu Feb 4 04:59:42 GMT 2010
Author: exreaction
Date: Thu Feb 4 04:59:42 2010
New Revision: 577
Log:
Reworking the titania_display_contribs function to be the same as the others like it (accept $sort, $pagination)
Add TOTAL_RESULTS output from pagination (%d Results)
Page X of X JS now works
Added:
trunk/titania/js/forum_fn.js
Modified:
trunk/titania/authors/contributions.php
trunk/titania/common.php
trunk/titania/includes/functions_display.php
trunk/titania/includes/overlords/posts.php
trunk/titania/includes/overlords/topics.php
trunk/titania/includes/tools/pagination.php
trunk/titania/index.php
trunk/titania/install.php
trunk/titania/js/editor.js
trunk/titania/language/en/common.php
trunk/titania/styles/default/template/common/overall_header.html
trunk/titania/styles/default/template/common/post_list.html
trunk/titania/styles/default/template/common/topic_list.html
trunk/titania/styles/default/template/index_body.html
Modified: trunk/titania/authors/contributions.php
==============================================================================
*** trunk/titania/authors/contributions.php (original)
--- trunk/titania/authors/contributions.php Thu Feb 4 04:59:42 2010
***************
*** 18,24 ****
titania::_include('functions_display', 'titania_display_contribs');
! titania_display_contribs('author', titania::$author->user_id, titania::$author->get_url('contributions'));
titania::page_header('AUTHOR_CONTRIBUTIONS');
titania::page_footer(true, 'authors/author_contributions.html');
\ No newline at end of file
--- 18,24 ----
titania::_include('functions_display', 'titania_display_contribs');
! titania_display_contribs('author', titania::$author->user_id);
titania::page_header('AUTHOR_CONTRIBUTIONS');
titania::page_footer(true, 'authors/author_contributions.html');
\ No newline at end of file
Modified: trunk/titania/common.php
==============================================================================
*** trunk/titania/common.php (original)
--- trunk/titania/common.php Thu Feb 4 04:59:42 2010
***************
*** 17,23 ****
}
// Version number (only used for the installer)
! define('TITANIA_VERSION', '0.1.31');
define('PHPBB_MSG_HANDLER', 'titania_msg_handler');
define('PHPBB_USE_BOARD_URL_PATH', true);
--- 17,23 ----
}
// Version number (only used for the installer)
! define('TITANIA_VERSION', '0.1.32');
define('PHPBB_MSG_HANDLER', 'titania_msg_handler');
define('PHPBB_USE_BOARD_URL_PATH', true);
Modified: trunk/titania/includes/functions_display.php
==============================================================================
*** trunk/titania/includes/functions_display.php (original)
--- trunk/titania/includes/functions_display.php Thu Feb 4 04:59:42 2010
***************
*** 89,105 ****
* @param string $pagination_url The url to display for pagination.
* @param string $blockname The name of the template block to use (contribs by default)
*/
! function titania_display_contribs($mode, $id, $pagination_url, $blockname = 'contribs')
{
! // Setup sorting.
! $sort = new titania_sort();
! $sort->sort_request();
switch ($mode)
{
case 'author' :
$sort->set_sort_keys(array(
! array('SORT_CONTRIB_NAME', 'c.contrib_name', true),
));
// Get the contrib_ids this user is an author in (includes as a co-author)
--- 89,118 ----
* @param string $pagination_url The url to display for pagination.
* @param string $blockname The name of the template block to use (contribs by default)
*/
! function titania_display_contribs($mode, $id, $sort = false, $pagination = false, $blockname = 'contribs')
{
! if ($sort === false)
! {
! // Setup the sort tool
! $sort = new titania_sort();
! $sort->default_key = 'c';
! }
!
! if ($pagination === false)
! {
! // Setup the pagination tool
! $pagination = new titania_pagination();
! $pagination->default_limit = phpbb::$config['topics_per_page'];
! $pagination->request();
! }
! $pagination->result_lang = 'TOTAL_CONTRIBS';
switch ($mode)
{
case 'author' :
$sort->set_sort_keys(array(
! 't' => array('UPDATE_TIME', 'c.contrib_last_update'),
! 'c' => array('SORT_CONTRIB_NAME', 'c.contrib_name'),
));
// Get the contrib_ids this user is an author in (includes as a co-author)
***************
*** 130,136 ****
case 'category' :
$sort->set_sort_keys(array(
! array('SORT_CONTRIB_NAME', 'c.contrib_name', true),
));
$sql_ary = array(
--- 143,151 ----
case 'category' :
$sort->set_sort_keys(array(
! 'a' => array('AUTHOR', 'u.username_clean'),
! 't' => array('UPDATE_TIME', 'c.contrib_last_update'),
! 'c' => array('SORT_CONTRIB_NAME', 'c.contrib_name'),
));
$sql_ary = array(
***************
*** 175,191 ****
OR cc.active = 1)';
}
- // Setup the pagination tool
- $pagination = new titania_pagination();
- $pagination->default_limit = phpbb::$config['topics_per_page'];
- $pagination->request();
-
// Main SQL Query
$sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
// Handle pagination
$pagination->sql_count($sql_ary, 'c.contrib_id');
! $pagination->build_pagination($pagination_url);
// Setup some objects we'll use for temps
$contrib = new titania_contribution();
--- 190,201 ----
OR cc.active = 1)';
}
// Main SQL Query
$sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
// Handle pagination
$pagination->sql_count($sql_ary, 'c.contrib_id');
! $pagination->build_pagination(titania_url::build_url(titania_url::$current_page, titania_url::$params));
// Setup some objects we'll use for temps
$contrib = new titania_contribution();
Modified: trunk/titania/includes/overlords/posts.php
==============================================================================
*** trunk/titania/includes/overlords/posts.php (original)
--- trunk/titania/includes/overlords/posts.php Thu Feb 4 04:59:42 2010
***************
*** 233,238 ****
--- 233,239 ----
$pagination->default_limit = phpbb::$config['posts_per_page'];
$pagination->request();
}
+ $pagination->result_lang = 'TOTAL_POSTS';
$sql_ary = array(
'SELECT' => 'p.*',
Modified: trunk/titania/includes/overlords/topics.php
==============================================================================
*** trunk/titania/includes/overlords/topics.php (original)
--- trunk/titania/includes/overlords/topics.php Thu Feb 4 04:59:42 2010
***************
*** 218,223 ****
--- 218,224 ----
$pagination->default_limit = phpbb::$config['topics_per_page'];
$pagination->request();
}
+ $pagination->result_lang = 'TOTAL_TOPICS';
$topic_ids = array();
Modified: trunk/titania/includes/tools/pagination.php
==============================================================================
*** trunk/titania/includes/tools/pagination.php (original)
--- trunk/titania/includes/tools/pagination.php Thu Feb 4 04:59:42 2010
***************
*** 43,49 ****
'default_limit' => array('default' => self::OFFSET_LIMIT_DEFAULT),
'max_limit' => array('default' => self::OFFSET_LIMIT_MAX),
'total' => array('default' => 0),
! 'result_lang' => array('default' => 'RETURNED_RESULTS'),
'template_vars' => array(
'default' => array(
'PAGINATION' => 'PAGINATION',
--- 43,49 ----
'default_limit' => array('default' => self::OFFSET_LIMIT_DEFAULT),
'max_limit' => array('default' => self::OFFSET_LIMIT_MAX),
'total' => array('default' => 0),
! 'result_lang' => array('default' => 'TOTAL_RESULTS'), // sprintf'd into 'TOTAL_RESULTS' output; Should have TOTAL_RESULTS and TOTAL_RESULTS_ONE strings
'template_vars' => array(
'default' => array(
'PAGINATION' => 'PAGINATION',
***************
*** 106,111 ****
--- 106,113 ----
public function sql_count($sql_ary, $field)
{
$sql_ary['SELECT'] = "COUNT($field) AS cnt";
+ unset($sql_ary['ORDER_BY']);
+
$count_sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
phpbb::$db->sql_query($count_sql);
$this->total = phpbb::$db->sql_fetchfield('cnt');
***************
*** 161,233 ****
$seperator = '<span class="page-sep">' . phpbb::$user->lang['COMMA_SEPARATOR'] . '</span>';
$total_pages = ceil($num_items / $per_page);
$on_page = floor($start_item / $per_page) + 1;
! $page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
! if ($total_pages == 1 || !$num_items)
{
return false;
}
! if ($total_pages > 5)
{
! $start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
! $end_cnt = max(min($total_pages, $on_page + 4), 6);
! $page_string .= ($start_cnt > 1) ? ' ... ' : $seperator;
! for ($i = $start_cnt + 1; $i < $end_cnt; $i++)
{
! $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($i - 1) * $per_page))) . '">' . $i . '</a>';
! if ($i < $end_cnt - 1)
{
! $page_string .= $seperator;
}
}
! $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator;
! }
! else
! {
! $page_string .= $seperator;
! for ($i = 2; $i < $total_pages; $i++)
{
! $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($i - 1) * $per_page))) . '">' . $i . '</a>';
! if ($i < $total_pages)
{
! $page_string .= $seperator;
}
}
}
! $page_string .= ($on_page == $total_pages) ? '<strong>' . $total_pages . '</strong>' : '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($total_pages - 1) * $per_page))) . '">' . $total_pages . '</a>';
!
! if ($add_prevnext_text)
{
! if ($on_page == 2)
! {
! $page_string = '<a href="' . $base_url . '">' . phpbb::$user->lang['PREVIOUS'] . '</a> ' . $page_string;
! }
! else if ($on_page != 1)
! {
! $page_string = '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($on_page - 2) * $per_page))) . '">' . phpbb::$user->lang['PREVIOUS'] . '</a> ' . $page_string;
! }
!
! if ($on_page != $total_pages)
! {
! $page_string .= ' <a href="' . titania_url::append_url($base_url, array($this->start_name => ($on_page * $per_page))) . '">' . phpbb::$user->lang['NEXT'] . '</a>';
! }
}
phpbb::$template->assign_vars(array(
$tpl_prefix . 'BASE_URL' => $base_url,
'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url),
$tpl_prefix . 'PER_PAGE' => $per_page,
$tpl_prefix . 'PREVIOUS_PAGE' => ($on_page == 2) ? $base_url : (($on_page == 1) ? '' : titania_url::append_url($base_url, array($this->start_name => (($on_page - 2) * $per_page)))),
$tpl_prefix . 'NEXT_PAGE' => ($on_page == $total_pages) ? '' : titania_url::append_url($base_url, array($this->start_name => ($on_page * $per_page))),
$tpl_prefix . 'TOTAL_PAGES' => $total_pages,
$tpl_prefix . 'TOTAL_ITEMS' => $num_items,
));
return $page_string;
--- 163,251 ----
$seperator = '<span class="page-sep">' . phpbb::$user->lang['COMMA_SEPARATOR'] . '</span>';
$total_pages = ceil($num_items / $per_page);
$on_page = floor($start_item / $per_page) + 1;
! $page_string = '';
! if (!$num_items)
{
return false;
}
! if ($total_pages > 1)
{
! $page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
! if ($total_pages > 5)
! {
! $start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
! $end_cnt = max(min($total_pages, $on_page + 4), 6);
! $page_string .= ($start_cnt > 1) ? ' ... ' : $seperator;
!
! for ($i = $start_cnt + 1; $i < $end_cnt; $i++)
! {
! $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($i - 1) * $per_page))) . '">' . $i . '</a>';
! if ($i < $end_cnt - 1)
! {
! $page_string .= $seperator;
! }
! }
!
! $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator;
! }
! else
{
! $page_string .= $seperator;
!
! for ($i = 2; $i < $total_pages; $i++)
{
! $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($i - 1) * $per_page))) . '">' . $i . '</a>';
! if ($i < $total_pages)
! {
! $page_string .= $seperator;
! }
}
}
! $page_string .= ($on_page == $total_pages) ? '<strong>' . $total_pages . '</strong>' : '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($total_pages - 1) * $per_page))) . '">' . $total_pages . '</a>';
! if ($add_prevnext_text)
{
! if ($on_page == 2)
{
! $page_string = '<a href="' . $base_url . '">' . phpbb::$user->lang['PREVIOUS'] . '</a> ' . $page_string;
! }
! else if ($on_page != 1)
! {
! $page_string = '<a href="' . titania_url::append_url($base_url, array($this->start_name => (($on_page - 2) * $per_page))) . '">' . phpbb::$user->lang['PREVIOUS'] . '</a> ' . $page_string;
! }
!
! if ($on_page != $total_pages)
! {
! $page_string .= ' <a href="' . titania_url::append_url($base_url, array($this->start_name => ($on_page * $per_page))) . '">' . phpbb::$user->lang['NEXT'] . '</a>';
}
}
}
! if ($num_items == 1)
{
! $total_results = (isset(phpbb::$user->lang[$this->result_lang . '_ONE'])) ? phpbb::$user->lang[$this->result_lang . '_ONE'] : phpbb::$user->lang['TOTAL_RESULTS_ONE'];
! }
! else
! {
! $total_results = (isset(phpbb::$user->lang[$this->result_lang])) ? sprintf(phpbb::$user->lang[$this->result_lang], $num_items) : sprintf(phpbb::$user->lang['TOTAL_RESULTS'], $num_items);
}
phpbb::$template->assign_vars(array(
$tpl_prefix . 'BASE_URL' => $base_url,
'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url),
$tpl_prefix . 'PER_PAGE' => $per_page,
+ $tpl_prefix . 'ON_PAGE' => $on_page,
$tpl_prefix . 'PREVIOUS_PAGE' => ($on_page == 2) ? $base_url : (($on_page == 1) ? '' : titania_url::append_url($base_url, array($this->start_name => (($on_page - 2) * $per_page)))),
$tpl_prefix . 'NEXT_PAGE' => ($on_page == $total_pages) ? '' : titania_url::append_url($base_url, array($this->start_name => ($on_page * $per_page))),
$tpl_prefix . 'TOTAL_PAGES' => $total_pages,
$tpl_prefix . 'TOTAL_ITEMS' => $num_items,
+ $tpl_prefix . 'TOTAL_RESULTS' => $total_results,
));
return $page_string;
Modified: trunk/titania/index.php
==============================================================================
*** trunk/titania/index.php (original)
--- trunk/titania/index.php Thu Feb 4 04:59:42 2010
***************
*** 173,179 ****
if ($category_id != 0)
{
! titania_display_contribs('category', $category_id, titania_url::$current_page);
}
phpbb::$template->assign_vars(array(
--- 173,179 ----
if ($category_id != 0)
{
! titania_display_contribs('category', $category_id);
}
phpbb::$template->assign_vars(array(
Modified: trunk/titania/install.php
==============================================================================
*** trunk/titania/install.php (original)
--- trunk/titania/install.php Thu Feb 4 04:59:42 2010
***************
*** 496,501 ****
--- 496,522 ----
),
// Merged in 0.1.31
+ '0.1.32' => array(
+ 'table_index_add' => array(
+ array(TITANIA_CONTRIBS_TABLE, 'contrib_last_update'),
+ ),
+ 'table_remove' => array(
+ TITANIA_WATCH_TABLE,
+ ),
+ 'table_add' => array(
+ array(TITANIA_WATCH_TABLE, array(
+ 'COLUMNS' => array(
+ 'watch_type' => array('TINT:1', 0),
+ 'watch_object_type' => array('UINT', 0),
+ 'watch_object_id' => array('UINT', 0),
+ 'watch_user_id' => array('UINT', 0),
+ 'watch_mark_time' => array('UINT:11', 0),
+ ),
+ 'PRIMARY_KEY' => array('watch_object_type', 'watch_object_id', 'watch_user_id', 'watch_type'),
+ )),
+ )
+ ),
+
// IF YOU ADD A NEW VERSION DO NOT FORGET TO INCREMENT THE VERSION NUMBER IN common.php!
);
Modified: trunk/titania/js/editor.js
==============================================================================
*** trunk/titania/js/editor.js (original)
--- trunk/titania/js/editor.js Thu Feb 4 04:59:42 2010
***************
*** 192,236 ****
}
/**
- * Alternate display of subPanels
- */
- function subPanels(p)
- {
- var i, e, t;
-
- if (typeof(p) == 'string')
- {
- show_panel = p;
- }
-
- for (i = 0; i < panels.length; i++)
- {
- e = document.getElementById(panels[i]);
- t = document.getElementById(panels[i] + '-tab');
-
- if (e)
- {
- if (panels[i] == show_panel)
- {
- e.style.display = 'block';
- if (t)
- {
- t.className = 'activetab';
- }
- }
- else
- {
- e.style.display = 'none';
- if (t)
- {
- t.className = '';
- }
- }
- }
- }
- }
-
- /**
* Add quote text to message
*/
function addquote(post_id, username)
--- 192,197 ----
Added: trunk/titania/js/forum_fn.js
==============================================================================
*** trunk/titania/js/forum_fn.js (added)
--- trunk/titania/js/forum_fn.js Thu Feb 4 04:59:42 2010
***************
*** 0 ****
--- 1,438 ----
+ /**
+ * phpBB3 forum functions
+ */
+
+ /**
+ * Window popup
+ */
+ function popup(url, width, height, name)
+ {
+ if (!name)
+ {
+ name = '_popup';
+ }
+
+ window.open(url.replace(/&/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+ return false;
+ }
+
+ /**
+ * Jump to page
+ */
+ function jumpto()
+ {
+ var page = prompt(jump_page, on_page);
+
+ if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
+ {
+ if (base_url.substring(base_url.length - 1) == '/')
+ {
+ document.location.href = base_url + 'start_' + ((page - 1) * per_page);
+ }
+ else
+ {
+ document.location.href = base_url + '-start_' + ((page - 1) * per_page);
+ }
+ }
+ }
+
+ /**
+ * Mark/unmark checklist
+ * id = ID of parent container, name = name prefix, state = state [true/false]
+ */
+ function marklist(id, name, state)
+ {
+ var parent = document.getElementById(id);
+ if (!parent)
+ {
+ eval('parent = document.' + id);
+ }
+
+ if (!parent)
+ {
+ return;
+ }
+
+ var rb = parent.getElementsByTagName('input');
+
+ for (var r = 0; r < rb.length; r++)
+ {
+ if (rb[r].name.substr(0, name.length) == name)
+ {
+ rb[r].checked = state;
+ }
+ }
+ }
+
+ /**
+ * Resize viewable area for attached image or topic review panel (possibly others to come)
+ * e = element
+ */
+ function viewableArea(e, itself)
+ {
+ if (!e) return;
+ if (!itself)
+ {
+ e = e.parentNode;
+ }
+
+ if (!e.vaHeight)
+ {
+ // Store viewable area height before changing style to auto
+ e.vaHeight = e.offsetHeight;
+ e.vaMaxHeight = e.style.maxHeight;
+ e.style.height = 'auto';
+ e.style.maxHeight = 'none';
+ e.style.overflow = 'visible';
+ }
+ else
+ {
+ // Restore viewable area height to the default
+ e.style.height = e.vaHeight + 'px';
+ e.style.overflow = 'auto';
+ e.style.maxHeight = e.vaMaxHeight;
+ e.vaHeight = false;
+ }
+ }
+
+ /**
+ * Set display of page element
+ * s[-1,0,1] = hide,toggle display,show
+ */
+ function dE(n, s)
+ {
+ var e = document.getElementById(n);
+
+ if (!s)
+ {
+ s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+ }
+ e.style.display = (s == 1) ? 'block' : 'none';
+ }
+
+ /**
+ * Alternate display of subPanels
+ */
+ function subPanels(p)
+ {
+ var i, e, t;
+
+ if (typeof(p) == 'string')
+ {
+ show_panel = p;
+ }
+
+ for (i = 0; i < panels.length; i++)
+ {
+ e = document.getElementById(panels[i]);
+ t = document.getElementById(panels[i] + '-tab');
+
+ if (e)
+ {
+ if (panels[i] == show_panel)
+ {
+ e.style.display = 'block';
+ if (t)
+ {
+ t.className = 'activetab';
+ }
+ }
+ else
+ {
+ e.style.display = 'none';
+ if (t)
+ {
+ t.className = '';
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Call print preview
+ */
+ function printPage()
+ {
+ if (is_ie)
+ {
+ printPreview();
+ }
+ else
+ {
+ window.print();
+ }
+ }
+
+ /**
+ * Show/hide groups of blocks
+ * c = CSS style name
+ * e = checkbox element
+ * t = toggle dispay state (used to show 'grip-show' image in the profile block when hiding the profiles)
+ */
+ function displayBlocks(c, e, t)
+ {
+ var s = (e.checked == true) ? 1 : -1;
+
+ if (t)
+ {
+ s *= -1;
+ }
+
+ var divs = document.getElementsByTagName("DIV");
+
+ for (var d = 0; d < divs.length; d++)
+ {
+ if (divs[d].className.indexOf(c) == 0)
+ {
+ divs[d].style.display = (s == 1) ? 'none' : 'block';
+ }
+ }
+ }
+
+ function selectCode(a)
+ {
+ // Get ID of code block
+ var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
+
+ // Not IE
+ if (window.getSelection)
+ {
+ var s = window.getSelection();
+ // Safari
+ if (s.setBaseAndExtent)
+ {
+ s.setBaseAndExtent(e, 0, e, e.innerText.length - 1);
+ }
+ // Firefox and Opera
+ else
+ {
+ // workaround for bug # 42885
+ if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) == '<BR>')
+ {
+ e.innerHTML = e.innerHTML + ' ';
+ }
+
+ var r = document.createRange();
+ r.selectNodeContents(e);
+ s.removeAllRanges();
+ s.addRange(r);
+ }
+ }
+ // Some older browsers
+ else if (document.getSelection)
+ {
+ var s = document.getSelection();
+ var r = document.createRange();
+ r.selectNodeContents(e);
+ s.removeAllRanges();
+ s.addRange(r);
+ }
+ // IE
+ else if (document.selection)
+ {
+ var r = document.body.createTextRange();
+ r.moveToElementText(e);
+ r.select();
+ }
+ }
+
+ /**
+ * Play quicktime file by determining it's width/height
+ * from the displayed rectangle area
+ */
+ function play_qt_file(obj)
+ {
+ var rectangle = obj.GetRectangle();
+
+ if (rectangle)
+ {
+ rectangle = rectangle.split(',');
+ var x1 = parseInt(rectangle[0]);
+ var x2 = parseInt(rectangle[2]);
+ var y1 = parseInt(rectangle[1]);
+ var y2 = parseInt(rectangle[3]);
+
+ var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
+ var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
+ }
+ else
+ {
+ var width = 200;
+ var height = 0;
+ }
+
+ obj.width = width;
+ obj.height = height + 16;
+
+ obj.SetControllerVisible(true);
+ obj.Play();
+ }
+
+ /**
+ * Check if the nodeName of elem is name
+ * @author jQuery
+ */
+ function is_node_name(elem, name)
+ {
+ return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+ }
+
+ /**
+ * Check if elem is in array, return position
+ * @author jQuery
+ */
+ function is_in_array(elem, array)
+ {
+ for (var i = 0, length = array.length; i < length; i++)
+ // === is correct (IE)
+ if (array[i] === elem)
+ return i;
+
+ return -1;
+ }
+
+ /**
+ * Find Element, type and class in tree
+ * Not used, but may come in handy for those not using JQuery
+ * @author jQuery.find, Meik Sievertsen
+ */
+ function find_in_tree(node, tag, type, class_name)
+ {
+ var result, element, i = 0, length = node.childNodes.length;
+
+ for (element = node.childNodes[0]; i < length; element = node.childNodes[++i])
+ {
+ if (!element || element.nodeType != 1) continue;
+
+ if ((!tag || is_node_name(element, tag)) && (!type || element.type == type) && (!class_name || is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1))
+ {
+ return element;
+ }
+
+ if (element.childNodes.length)
+ result = find_in_tree(element, tag, type, class_name);
+
+ if (result) return result;
+ }
+ }
+
+ var in_autocomplete = false;
+ var last_key_entered = '';
+
+ /**
+ * Check event key
+ */
+ function phpbb_check_key(event)
+ {
+ // Keycode is array down or up?
+ if (event.keyCode && (event.keyCode == 40 || event.keyCode == 38))
+ in_autocomplete = true;
+
+ // Make sure we are not within an "autocompletion" field
+ if (in_autocomplete)
+ {
+ // If return pressed and key changed we reset the autocompletion
+ if (!last_key_entered || last_key_entered == event.which)
+ {
+ in_autocompletion = false;
+ return true;
+ }
+ }
+
+ // Keycode is not return, then return. ;)
+ if (event.which != 13)
+ {
+ last_key_entered = event.which;
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Usually used for onkeypress event, to submit a form on enter
+ */
+ function submit_default_button(event, selector, class_name)
+ {
+ // Add which for key events
+ if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
+ event.which = event.charCode || event.keyCode;
+
+ if (phpbb_check_key(event))
+ return true;
+
+ var current = selector['parentNode'];
+
+ // Search parent form element
+ while (current && (!current.nodeName || current.nodeType != 1 || !is_node_name(current, 'form')) && current != document)
+ current = current['parentNode'];
+
+ // Find the input submit button with the class name
+ //current = find_in_tree(current, 'input', 'submit', class_name);
+ var input_tags = current.getElementsByTagName('input');
+ current = false;
+
+ for (var i = 0, element = input_tags[0]; i < input_tags.length; element = input_tags[++i])
+ {
+ if (element.type == 'submit' && is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1)
+ current = element;
+ }
+
+ if (!current)
+ return true;
+
+ // Submit form
+ current.focus();
+ current.click();
+ return false;
+ }
+
+ /**
+ * Apply onkeypress event for forcing default submit button on ENTER key press
+ * The jQuery snippet used is based on http://greatwebguy.com/programming/dom/default-html-button-submit-on-enter-with-jquery/
+ * The non-jQuery code is a mimick of the jQuery code ;)
+ */
+ function apply_onkeypress_event()
+ {
+ // jQuery code in case jQuery is used
+ if (jquery_present)
+ {
+ $('form input').live('keypress', function (e)
+ {
+ var default_button = $(this).parents('form').find('input[type=submit].default-submit-action');
+
+ if (!default_button || default_button.length <= 0)
+ return true;
+
+ if (phpbb_check_key(e))
+ return true;
+
+ if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13))
+ {
+ default_button.click();
+ return false;
+ }
+
+ return true;
+ });
+
+ return;
+ }
+
+ var input_tags = document.getElementsByTagName('input');
+
+ for (var i = 0, element = input_tags[0]; i < input_tags.length ; element = input_tags[++i])
+ {
+ if (element.type == 'hidden')
+ continue;
+
+ // onkeydown is possible too
+ element.onkeypress = function (evt) { submit_default_button((evt || window.event), this, 'default-submit-action'); };
+ }
+ }
+
+ /**
+ * Detect JQuery existance. We currently do not deliver it, but some styles do, so why not benefit from it. ;)
+ */
+ var jquery_present = typeof jQuery == 'function';
Modified: trunk/titania/language/en/common.php
==============================================================================
*** trunk/titania/language/en/common.php (original)
--- trunk/titania/language/en/common.php Thu Feb 4 04:59:42 2010
***************
*** 42,47 ****
--- 42,56 ----
'CAT_SMILIES' => 'Smilies',
'CAT_AVATARS' => 'Avatars',
'CAT_RANKS' => 'Ranks',
+ 'TOTAL_RESULTS' => '%d Results',
+ 'TOTAL_RESULTS_ONE' => '1 Result',
+ 'TOTAL_TOPICS' => '%d Topics',
+ 'TOTAL_TOPICS_ONE' => '1 Topic',
+ 'TOTAL_POSTS' => '%d Posts',
+ 'TOTAL_POSTS_ONE' => '1 Post',
+ 'TOTAL_CONTRIBS' => '%d Contributions',
+ 'TOTAL_CONTRIBS_ONE' => '1 Contribution',
+ 'UPDATE_TIME' => 'Updated',
'AUTHOR_BY' => 'By %s',
'BAD_RATING' => 'Rating attempt failed.',
Modified: trunk/titania/styles/default/template/common/overall_header.html
==============================================================================
*** trunk/titania/styles/default/template/common/overall_header.html (original)
--- trunk/titania/styles/default/template/common/overall_header.html Thu Feb 4 04:59:42 2010
***************
*** 17,22 ****
--- 17,23 ----
<script type="text/javascript" src="{TITANIA_ROOT_PATH}js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="{TITANIA_ROOT_PATH}js/jquery-ui-1.7.2.custom.min.js"></script>
<script type="text/javascript" src="{TITANIA_ROOT_PATH}js/common.js"></script>
+ <script type="text/javascript" src="{TITANIA_ROOT_PATH}js/forum_fn.js"></script>
<!-- IF S_LIGHTBOX -->
<script type="text/javascript" src="{TITANIA_ROOT_PATH}js/jquery.lightbox-0.5.js"></script>
***************
*** 24,31 ****
<script type="text/javascript">
// <![CDATA[
! var spacer_img = '{U_BASE_URL}/images/spacer.gif';
! var jump_page = '{LA_JUMP_PAGE}:';
var on_page = '{ON_PAGE}';
var per_page = '{PER_PAGE}';
var base_url = '{A_BASE_URL}';
--- 25,32 ----
<script type="text/javascript">
// <![CDATA[
! var spacer_img = '{TITANIA_ROOT_PATH}/images/spacer.gif';
! var jump_page = '{BASE_URL}:';
var on_page = '{ON_PAGE}';
var per_page = '{PER_PAGE}';
var base_url = '{A_BASE_URL}';
Modified: trunk/titania/styles/default/template/common/post_list.html
==============================================================================
*** trunk/titania/styles/default/template/common/post_list.html (original)
--- trunk/titania/styles/default/template/common/post_list.html Thu Feb 4 04:59:42 2010
***************
*** 1,4 ****
! <!-- IF U_POST_REPLY or PAGINATION or TOTAL_POSTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_REPLY -->
--- 1,4 ----
! <!-- IF U_POST_REPLY or PAGINATION or TOTAL_RESULTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_REPLY -->
***************
*** 6,14 ****
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_POSTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
--- 6,14 ----
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_RESULTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_RESULTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
***************
*** 126,132 ****
<!-- INCLUDE posting/quickreply_editor.html -->
<!-- ENDIF -->
! <!-- IF U_POST_REPLY or PAGINATION or TOTAL_POSTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_REPLY -->
--- 126,132 ----
<!-- INCLUDE posting/quickreply_editor.html -->
<!-- ENDIF -->
! <!-- IF U_POST_REPLY or PAGINATION or TOTAL_RESULTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_REPLY -->
***************
*** 134,142 ****
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_POSTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
--- 134,142 ----
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_RESULTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_RESULTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
Modified: trunk/titania/styles/default/template/common/topic_list.html
==============================================================================
*** trunk/titania/styles/default/template/common/topic_list.html (original)
--- trunk/titania/styles/default/template/common/topic_list.html Thu Feb 4 04:59:42 2010
***************
*** 1,4 ****
! <!-- IF U_POST_TOPIC or PAGINATION or TOTAL_POSTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_TOPIC -->
--- 1,4 ----
! <!-- IF U_POST_TOPIC or PAGINATION or TOTAL_RESULTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_TOPIC -->
***************
*** 6,14 ****
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_POSTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
--- 6,14 ----
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_RESULTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_RESULTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
***************
*** 63,69 ****
</div>
<!-- END topics -->
! <!-- IF U_POST_TOPIC or PAGINATION or TOTAL_POSTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_TOPIC -->
--- 63,69 ----
</div>
<!-- END topics -->
! <!-- IF U_POST_TOPIC or PAGINATION or TOTAL_RESULTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_POST_TOPIC -->
***************
*** 71,79 ****
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_POSTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
--- 71,79 ----
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_RESULTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_RESULTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
Modified: trunk/titania/styles/default/template/index_body.html
==============================================================================
*** trunk/titania/styles/default/template/index_body.html (original)
--- trunk/titania/styles/default/template/index_body.html Thu Feb 4 04:59:42 2010
***************
*** 2,8 ****
<h2 class="solo">{L_CUSTOMISATION_DATABASE}</h2>
! <!-- IF U_CREATE_CONTRIBUTION or PAGINATION or TOTAL_POSTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_CREATE_CONTRIBUTION -->
--- 2,8 ----
<h2 class="solo">{L_CUSTOMISATION_DATABASE}</h2>
! <!-- IF U_CREATE_CONTRIBUTION or PAGINATION or TOTAL_RESULTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_CREATE_CONTRIBUTION -->
***************
*** 10,18 ****
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_POSTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_ITEMS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
--- 10,18 ----
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_RESULTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_RESULTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
***************
*** 25,31 ****
<!-- INCLUDE common/contrib_list.html -->
<!-- ENDIF -->
! <!-- IF U_CREATE_CONTRIBUTION or PAGINATION or TOTAL_POSTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_CREATE_CONTRIBUTION -->
--- 25,31 ----
<!-- INCLUDE common/contrib_list.html -->
<!-- ENDIF -->
! <!-- IF U_CREATE_CONTRIBUTION or PAGINATION or TOTAL_RESULTS -->
<div class="topic-actions">
<div class="buttons">
<!-- IF U_CREATE_CONTRIBUTION -->
***************
*** 33,41 ****
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_POSTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_ITEMS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
--- 33,41 ----
<!-- ENDIF -->
</div>
! <!-- IF PAGINATION or TOTAL_RESULTS -->
<div class="pagination">
! <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_RESULTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
More information about the customisationdb-commits
mailing list