Commit 71788f6a authored by sylvieg's avatar sylvieg

Instant-Auto-Merge from BRANCH-1-9 to HEAD

parent c78b0b15
......@@ -5646,6 +5646,7 @@ tiki/temp/mail_attachs/README -text
tiki/temp/mail_attachs/index.php -text
tiki/templates/.cvsignore -text
tiki/templates/_htaccess -text
tiki/templates/antibot.tpl -text
tiki/templates/attachments.tpl -text
tiki/templates/babelfish.tpl -text
tiki/templates/bidi.tpl -text
......@@ -5673,6 +5674,7 @@ tiki/templates/error_simple.tpl -text
tiki/templates/error_ticket.tpl -text
tiki/templates/fck-edit.tpl -text
tiki/templates/file_galleries.tpl -text
tiki/templates/find.tpl -text
tiki/templates/footer.tpl -text
tiki/templates/freetag.tpl -text
tiki/templates/freetag_list.tpl -text
......
......@@ -2,7 +2,7 @@
// $start_time = microtime(true);
// $Header: /cvsroot/tikiwiki/tiki/comments.php,v 1.71 2007-03-06 19:29:44 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/comments.php,v 1.72 2007-03-21 19:21:39 sylvieg Exp $
// Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -158,6 +158,11 @@ $in_reply_to = '';
if ( ($tiki_p_post_comments == 'y' && (!isset($forum_mode) || $forum_mode == 'n'))
|| ($tiki_p_forum_post == 'y' && isset($forum_mode) && $forum_mode == 'y') ) {
if (isset($_REQUEST["comments_postComment"])) {
if (empty($user) && $feature_antibot == 'y' && (!isset($_SESSION['random_number']) || $_SESSION['random_number'] != $_REQUEST['antibotcode'])) {
$smarty->assign('msg',tra("You have mistyped the anti-bot verification code; please try again."));
$smarty->display("error.tpl");
die;
}
$comments_show = 'y';
if (!empty($_REQUEST["comments_title"]) && !empty($_REQUEST["comments_data"]) && !($feature_contribution == 'y' && ((isset($forum_mode) && $forum_mode == 'y' && $feature_contribution_mandatory_forum == 'y') || ((empty($forum_mode) || $forum_mode == 'n') && $feature_contribution_mandatory_comment == 'y')) && empty($_REQUEST['contributions']))) {
......@@ -187,7 +192,6 @@ if ( ($tiki_p_post_comments == 'y' && (!isset($forum_mode) || $forum_mode == 'n'
} else {
$parent_id = $_REQUEST["comments_parentId"];
}
$qId = $commentslib->post_new_comment($comments_objectId, $parent_id,
$user,
$_REQUEST["comments_title"],
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/lib/phplayers_tiki/tiki-phplayers.php,v 1.12 2007-03-06 20:41:18 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/phplayers_tiki/tiki-phplayers.php,v 1.13 2007-03-21 19:21:41 sylvieg Exp $
class TikiPhplayers extends TikiLib {
/* Build the input to the phplayers lib for a category tree */
function mkCatEntry($categId, $indent="", $back, $categories, $urlEnd, $tpl='') {
......@@ -48,29 +48,51 @@ class TikiPhplayers extends TikiLib {
} elseif (preg_match('/tiki-index.php/', $url)) {
$url = strtolower($url);
}
foreach ($channels["data"] as $key=>$cd) {
$realKey = 0;
$level = 0;
foreach ($channels['data'] as $key=>$cd) {
$cd["name"] = tra($cd["name"]);
if ($cd['type'] == 'o') {
$res .= $indented;
} elseif ($cd['type'] == 's' or $cd['type'] == 'r') {
$indented = '.';
$level = 1;
} elseif ($cd['type'] == '-') {
$indented = substr($indented, 1);
--$level;
continue;
} else {
$indented = str_pad('', $cd['type'], '.');
$level = $cd['type'] + 1;
$res .= $indented;
$indented .= '.';
}
$res .= ".|".$cd["name"]."|".$cd["url"]."\n";
if (!empty($cd['url']) && $curOption == -1) {
++$realKey;
if (!empty($cd['url']) && empty($curOption)) {
if ($cd['url'] == 'tiki-index.php') {
$cd['url'] .= "?page=$homePage";
}
if (($pos = strpos($url, strtolower($cd['url']))) !== false && ($pos == 0 || $url[$pos -1] == '/' || $url[$pos - 1] == '\\')) {
$curOption = $key+1;
if (preg_match('/tiki-index.php/', $cd['url'])) {
$cd['url'] = strtolower($cd['url']);
}
if (($pos = strpos($url, $cd['url'])) !== false && ($pos == 0 || $url[$pos -1] == '/' || $url[$pos - 1] == '\\' || $url[$pos-1] == '=')) {
$last = $pos + strlen($cd['url']);
if ($last >= strlen($url) || $url['last'] == '#' || $url['last'] == '?' || $url['last'] == '&') {
$curOption = $realKey;
if ($cd['type'] != 's' && $cd['type'] != 'r') {
for ($i = $level - 1; $i >= 0; --$i) {
$res = str_replace($cur[$i], $cur[$i].'||||1', $res);
}
}
}
}
}
$res.= ".|".$cd["name"]."|".$cd["url"];
if (empty($curOption) && $cd['type'] != 'o' && $cd['type'] != '-') {
$cur[$level - 1] = $res;
}
$res .= "\n";
}
return $res;
}
......
<?php
// $Id: outputfilter.highlight.php,v 1.13 2007-03-20 09:22:51 nyloth Exp $
// $Id: outputfilter.highlight.php,v 1.14 2007-03-21 19:21:42 sylvieg Exp $
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
header("location: index.php");
......@@ -45,6 +45,13 @@ if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
if (!isset($highlight) || empty($highlight)) {
return $source;
}
if (strstr($source, 'id="rightcolumn"')) {
preg_match('~(.* id="centercolumn"[^>]*>)(.*)(<td[^>]* id="rightcolumn".*)~xsi', $source, $matches);
} elseif (!preg_match('~(.* id="centercolumn"[^>]*>)(.*)~xsi', $source, $matches)) {
return $source;
} else {
$matches[3] = '';
}
if (!preg_match('~(.*id="centercolumn"[^>]*>)(.*)(<td[^>]* id="rightcolumn".*)~xsi', $source, $matches))
if (!preg_match('~(.*id="centercolumn"[^>]*>)(.*)~xsi', $source, $matches))
......@@ -52,7 +59,7 @@ if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
$source = preg_replace_callback(
'~(?:<head>.*</head> # head blocks
|<div[^>]*nohighlight.*</div>\{\*nohighlight # div with nohightlight
|<div[^>]*nohighlight.*</div><!--nohighlight--> # div with nohightlight
|<script[^>]+>.*</script> # script blocks
|<a[^>]*onmouseover.*onmouseout[^>]*> # onmouseover (user popup)
|<[^>]*> # all html tags
......
<?php
// CVS: $Id: tikilib.php,v 1.732 2007-03-20 15:39:10 sylvieg Exp $
// CVS: $Id: tikilib.php,v 1.733 2007-03-21 19:21:40 sylvieg Exp $
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
header("location: index.php");
......@@ -3615,7 +3615,7 @@ function add_pageview() {
function get_perm_object($objectId, $objectType, $global=true) {
global $tiki_p_admin, $user, $feature_categories, $userlib, $smarty;
$ret = array();
if ($tiki_p_admin) {
if ($tiki_p_admin == 'y') {
if (!$global) {
$perms = $userlib->get_permissions(0, -1, 'permName_desc', '', $this->get_permGroup_from_objectType($objectType));
foreach ($perms['data'] as $perm) {
......@@ -3682,6 +3682,29 @@ function add_pageview() {
switch ($objectType) {
case 'tracker':
return 'trackers';
case 'image gallery':
case 'image':
return 'image galleries';
case 'file gallery':
case 'file':
return 'file galleries';
case 'article':
case 'submission':
return 'cms';
case 'forum':
return 'forums';
case 'blog':
case 'blog post':
return 'blogs';
case 'wiki page':
case 'history':
return 'wiki';
case 'faq':
return 'faqs';
case 'survey':
return 'surveys';
case 'newsletter':
return 'newsletters';
/* TODO */
default:
return $objectType;
......@@ -3691,6 +3714,29 @@ function add_pageview() {
switch ($objectType) {
case 'tracker':
return 'tiki_p_admin_trackers';
case 'image gallery':
case 'image':
return 'tiki_p_admin_galleries';
case 'file gallery':
case 'file':
return 'tiki_p_admin_file_galleries';
case 'article':
case 'submission':
return 'tiki_p_admin_cms';
case 'forum':
return 'tiki_p_admin_forum';
case 'blog':
case 'blog post':
return 'tiki_p_blog_admin';
case 'wiki page':
case 'history':
return 'tiki_p_admin_wiki';
case 'faq':
return 'tiki_p_admin_faqs';
case 'survey':
return 'tiki_p_admin_surveys';
case 'newsletter':
return 'tiki_p_admin_newsletters';
/* TODO */
default:
return "tiki_p_admin_$objectType";
......@@ -3708,9 +3754,42 @@ function add_pageview() {
switch ($objectType) {
case 'tracker':
$ret['tiki_p_view_trackers'] = 'y';
break;
case 'image gallery':
case 'image':
$ret['tiki_p_view_image_gallery'] = 'y';
break;
case 'file gallery':
case 'file':
$ret['tiki_p_view_file_gallery'] = 'y';
break;
case 'article':
case 'submission':
$ret['tiki_p_read_article'] = 'y';
break;
case 'forum':
$ret['tiki_p_forum_read'] = 'y';
break;
case 'blog':
case 'blog post':
$ret['tiki_p_read_blog'] = 'y';
break;
case 'wiki page':
case 'history':
$ret['tiki_p_view'] = 'y';
break;
case 'faq':
$ret['tiki_p_view_faqs'] = 'y';
break;
case 'survey':
break;
case 'newsletter':
$ret['tiki_p_subscribe_newsletters'] = 'y';
break;
/* TODO */
default:
$ret["tiki_p_view_$objectType"] = 'y';
break;
}
return $ret;
}
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/lib/trackers/trackerlib.php,v 1.186 2007-03-21 18:24:36 gillesm Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/trackers/trackerlib.php,v 1.187 2007-03-21 19:21:42 sylvieg Exp $
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
header("location: index.php");
......@@ -1013,7 +1013,7 @@ class TrackerLib extends TikiLib {
include_once ('lib/webmail/tikimaillib.php');
$mail = new TikiMail();
$mail->setSubject(tra('Tracker was modified at '). $_SERVER["SERVER_NAME"]);
$mail->setSubject($smarty->fetch('mail/tracker_changed_notification_subject.tpl'));
$mail->setText($mail_data);
$mail->setHeader("From", $sender_email);
$mail->send($emails);
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_group.php,v 1.5 2007-02-08 13:51:22 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_group.php,v 1.6 2007-03-21 19:21:42 sylvieg Exp $
// Display wiki text if user is in one of listed groups
// Usage:
// {GROUP(groups=>Admins|Developers)}wiki text{GROUP}
function wikiplugin_group_help() {
$help = tra("Display wiki text if user is in one of listed groups").":\n";
$help.= "~np~{GROUP(groups=>Admins|Developers)}wiki text{GROUP}~/np~";
$help.= "~np~<br />{GROUP(groups=>Admins|Developers)}wiki text{GROUP}<br />
{GROUP(notgroups=>Developers)}wiki text for other groups{GROUP}<br />
{GROUP(groups=>Registered)}wiki text{ELSE}alternate text for other groups{GROUP}~/np~";
return $help;
}
function wikiplugin_group($data, $params) {
......
......@@ -33,7 +33,18 @@ if (isset($module_params['sort'])) {
} else {
$sort = 'publishDate_desc';
}
$ranking = $tikilib->list_articles($start, $module_rows, $sort, '', '', $user, $type, $topicId, 'y', $topic);
if (isset($module_params['lang'])) {
$lang = $module_params['lang'];
} else {
$lang = '';
}
if (isset($module_params['categId'])) {
$categId = $module_params['categId'];
} else {
$categId = '';
}
$ranking = $tikilib->list_articles($start, $module_rows, 'publishDate_desc', '', '', $user, $type, $topicId, 'y', $topic, $categId, $lang);
$smarty->assign('modArticles', $ranking["data"]);
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/modules/mod-last_articles.php,v 1.12 2007-02-04 20:09:46 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/modules/mod-last_articles.php,v 1.13 2007-03-21 19:21:42 sylvieg Exp $
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
......@@ -17,8 +17,10 @@ $mod_topicId = isset($module_params["topicId"]) ? $module_params["topicId"] : ''
$mod_topic = isset($module_params["topic"]) ? $module_params["topic"] : '';
$smarty->assign('type',$mod_type);
$smarty->assign('topicId',$mod_topicId);
$categId = isset($module_params['categId']) ? $module_params['categId'] : '';
$lang = isset($module_params['lang']) ? $module_params['lang'] : '';
$ranking = $tikilib->list_articles(0,$module_rows,'publishDate_desc', '', date("U"), '', $mod_type, $mod_topicId, 'y', $mod_topic);
$ranking = $tikilib->list_articles(0,$module_rows,'publishDate_desc', '', date("U"), '', $mod_type, $mod_topicId, 'y', $mod_topic, $categId, $lang);
$smarty->assign('modLastArticles',$ranking["data"]);
$smarty->assign('nonums', isset($module_params["nonums"]) ? $module_params["nonums"] : 'n');
$smarty->assign('absurl', isset($module_params["absurl"]) ? $module_params["absurl"] : 'n');
......
{if empty($user)}
<tr>
<td class="formcolor">{tr}Anti-Bot verification code{/tr}:</td>
<td class="formcolor"><img src="tiki-random_num_img.php" alt='{tr}Random Image{/tr}'/></td>
</tr>
<tr>
<td class="formcolor">{tr}Enter the code you see above{/tr}:</td>
<td class="formcolor"><input type="text" maxlength="8" size="8" name="antibotcode" /></td>
</tr>
{/if}
\ No newline at end of file
{* $Header: /cvsroot/tikiwiki/tiki/templates/categobjects.tpl,v 1.6 2006-03-16 13:43:12 sylvieg Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/categobjects.tpl,v 1.7 2007-03-21 19:21:43 sylvieg Exp $ *}
<div class="catblock">
<div class="cattitle">
{foreach name=for key=id item=title from=$titles}
<a href="tiki-browse_categories.php?parentId={$id}">{$title}</a>
<a href="tiki-browse_categories.php?parentId={$id}">{$title|tr_if}</a>
{if !$smarty.foreach.for.last} &amp; {/if}
{/foreach}
</div>
......
{if $feature_categories eq 'y' and (count($categories) gt 0 or $tiki_p_admin_categories eq 'y')}
<tr class="formcolor">
<td>{tr}Categorize{/tr}</td>
<td{if $cols} colspan="{$cols}"{/if}>
<td{if $colsCategorize} colspan="{$colsCategorize}"{/if}>
{if $mandatory_category >= 0}
<div id="categorizator">
{else}
......
<span class="categpath">
{foreach name=u key=k item=i from=$catp}
<a class="categpath" href="tiki-browse_categories.php?parentId={$k}" title="{tr}browse category{/tr}">{$i|replace:' ':'&nbsp;'}</a>{if !$smarty.foreach.u.last}&nbsp;{$site_crumb_seper|escape:"html"}&nbsp;{/if}
<a class="categpath" href="tiki-browse_categories.php?parentId={$k}" title="{tr}browse category{/tr}">{$i|tr_if|replace:' ':'&nbsp;'}</a>{if !$smarty.foreach.u.last}&nbsp;{$site_crumb_seper|escape:"html"}&nbsp;{/if}
{/foreach}
</span><br />
{* $Header: /cvsroot/tikiwiki/tiki/templates/comments.tpl,v 1.78 2007-03-08 17:12:01 gillesm Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/comments.tpl,v 1.79 2007-03-21 19:21:43 sylvieg Exp $ *}
{if $forum_mode eq 'y'}
<tr><td>
......@@ -225,29 +225,6 @@
<input type="hidden" name="{$comments_request_data[i].name|escape}" value="{$comments_request_data[i].value|escape}" />
{/section}
<table class="normal">
<tr>
{if $parent_coms}
<td class="formcolor">{tr}Reply to parent post{/tr}</td>
{else}
<td class="formcolor">
{if $forum_mode eq 'y'}
{tr}Post new reply{/tr}
{else}
{tr}Post new comment{/tr}
{/if}
</td>
{/if}
<td class="formcolor">
<input type="submit" name="comments_previewComment" value="{tr}preview{/tr}"/>
<input type="submit" name="comments_postComment" value="{tr}post{/tr}"/>
{if $forum_mode eq 'y'}
<input type="button" name="comments_cancelComment" value="{tr}cancel{/tr}" onclick="hide('{$postclass}');"/>
{/if}
</td>
</tr>
{if $feature_contribution eq 'y'}
{include file="contribution.tpl" in_comment="y"}
{/if}
<tr>
<td class="formcolor"><label for="comments-title">{tr}Title{/tr}: </label><div class="attention">{tr}Required{/tr}</div></td>
<td class="formcolor"><input type="text" size="40" name="comments_title" id="comments-title" value="{$comment_title|escape}" /></td>
......@@ -304,6 +281,33 @@
</td>
</tr>
{/if}
{if $feature_contribution eq 'y'}
{include file="contribution.tpl" in_comment="y"}
{/if}
{if $feature_antibot eq 'y'}
{include file="antibot.tpl"}
{/if}
<tr>
{if $parent_coms}
<td class="formcolor">{tr}Reply to parent post{/tr}</td>
{else}
<td class="formcolor">
{if $forum_mode eq 'y'}
{tr}Post new reply{/tr}
{else}
{tr}Post new comment{/tr}
{/if}
</td>
{/if}
<td class="formcolor">
<input type="submit" name="comments_previewComment" value="{tr}preview{/tr}"/>
<input type="submit" name="comments_postComment" value="{tr}post{/tr}"/>
{if $forum_mode eq 'y'}
<input type="button" name="comments_cancelComment" value="{tr}cancel{/tr}" onclick="hide('{$postclass}');"/>
{/if}
</td>
</tr>
</table>
</form>
<br />
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/find.tpl,v 1.2 2007-03-21 19:21:43 sylvieg Exp $ *}
<div align="center">
<form method="post" action="{$smarty.server.PHP_SELF}">
{if !empty($sort_mode)}<input type="hidden" name="sort_mode" value="{$sort_mode}" />{/if}
{if !empty($offset)}<input type="hidden" name="offset" value="{$offset}" />{/if}
<table class="findtable">
<tr>
<td class="findtitle">{if empty($what)}{tr}Find{/tr}{else}{tr}{$what}{/tr}{/if}</td>
<td class="findtitle">
<input type="text" name="find" value="{$find|escape}" />
{if isset($exact_match)}{tr}Exact&nbsp;match{/tr}<input type="checkbox" name="exact_match" {if $exact_match ne 'n'}checked="checked"{/if}/>{/if}
</td>
{if !empty($types)}
<td class="findtitle">
<select name="type">
<option value='' {if $find_type eq ''}selected="selected"{/if}>{tr}any type{/tr}</option>
{section name=t loop=$types}
<option value="{$types[t].type|escape}" {if $find_type eq $types[t].type}selected="selected"{/if}>{tr}{$types[t].type}{/tr}</option>
{/section}
</select>
</td>
{/if}
{if !empty($topics)}
<td class="findtitle">
<select name="topic">
<option value='' {if $find_topic eq ''}selected="selected"{/if}>{tr}all topic{/tr}</option>
{section name=ix loop=$topics}
<option value="{$topics[ix].topicId|escape}" {if $find_topic eq $topics[ix].topicId}selected="selected"{/if}>{tr}{$topics[ix].name}{/tr}</option>
{/section}
</select>
</td>
{/if}
{if $feature_multilingual eq 'y'}
<td class="findtitle">
<select name="lang">
<option value='' {if $find_lang eq ''}selected="selected"{/if}>{tr}any language{/tr}</option>
{section name=ix loop=$languages}
{if count($available_languages) == 0 || in_array($languages[ix].value, $available_languages)}
<option value="{$languages[ix].value|escape}" {if $find_lang eq $languages[ix].value}selected="selected"{/if}>{tr}{$languages[ix].name}{/tr}</option>
{/if}
{/section}
</select>
</td>
{/if}
{if $feature_categories eq 'y'}
<td class="findtitle">
<select name="categId">
<option value='' {if $find_categId eq ''}selected="selected"{/if}>{tr}any category{/tr}</option>
{section name=ix loop=$categories}
<option value="{$categories[ix].categId|escape}" {if $find_categId eq $categories[ix].categId}selected="selected"{/if}>{tr}{$categories[ix].categpath}{/tr}</option>
{/section}
</select>
</td>
{/if}
<td class="findtitle"><input type="submit" name="search" value="{tr}find{/tr}" /></td>
</tr>
</table>
</form>
</div>
\ No newline at end of file
......@@ -35,7 +35,7 @@ You are most likely wanting to modify the top of your Tiki site. Please consider
{else}
{$siteTitle}
{if !empty($headtitle)} : {$headtitle}
{elseif !empty($page)} : {$page|escape} {* add $description|escape if you want to put the description *}
{elseif !empty($page)} : {$page|escape} {* add $description|escape if you want to put the description + update breadcrumb_build replace return $crumbs->title; with return empty($crumbs->description)? $crumbs->title: $crumbs->description; *}
{elseif !empty($arttitle)} : {$arttitle}
{elseif !empty($title)} : {$title}
{elseif !empty($thread_info.title)} : {$thread_info.title}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_menu_options.tpl,v 1.37 2007-03-21 19:21:43 sylvieg Exp $ *}
<h1><a class="pagetitle" href="tiki-admin_menu_options.php?menuId={$menuId}">{tr}Admin Menu{/tr}: {$menu_info.name}</a><br /><br />
<span class="button2"><a href="tiki-admin_menus.php" class="linkbut">{tr}List menus{/tr}</a></span>
<span class="button2"><a href="tiki-admin_menus.php?menuId={$menuId}" class="linkbut">{tr}Edit this menu{/tr}</a></span></h1>
......@@ -21,6 +22,7 @@
<input type="hidden" name="optionId" value="{$optionId|escape}" />
<input type="hidden" name="menuId" value="{$menuId|escape}" />
<input type="hidden" name="offset" value="{$offset|escape}" />
{if !empty($nbRecords)}<input type="hidden" name="nbRecords" value="{$nbRecords|escape}" />{/if}
<table>
<tr class="formcolor"><td>{tr}Name{/tr}:</td><td colspan="3"><input id="menu_name" type="text" name="name" value="{$name|escape}" size="34" /></td></tr>
<tr class="formcolor"><td>{tr}URL{/tr}:</td><td colspan="3"><input id="menu_url" type="text" name="url" value="{$url|escape}" size="34" /></td></tr>
......@@ -128,18 +130,21 @@
</div>
</td></tr></table>
<a name="options"></a>
<h2>{tr}Menu options{/tr}</h2>
<div align="center">
<form method="get" action="tiki-admin_menu_options.php">
<table class="findtable">
<tr><td>{tr}Find{/tr}</td>
<td>
<form method="get" action="tiki-admin_menu_options.php">
<input type="text" name="find" value="{$find|escape}" />
<input type="submit" value="{tr}find{/tr}" name="search" />
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
<input type="hidden" name="menuId" value="{$menuId}" />
</form>
</td>
<td>{tr}Number of lines{/tr}</td><td><input type="text" name="nbRecords" value="{if !empty($nbRecords)}{$nbRecords}{else}{$maxRecords}{/if}" size="3" /></td>
<td><input type="submit" value="{tr}find{/tr}" name="search" /></td>
<td><input type="submit" value="{tr}find{/tr}" name="search" />
</tr>
</table>
......@@ -151,15 +156,15 @@
<table class="normal">
<tr>
<td class="heading"></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'optionId_desc'}optionId_asc{else}optionId_desc{/if}">{tr}ID{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'optionId_desc'}optionId_asc{else}optionId_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}ID{/tr}</a></td>
<td class="heading">&nbsp;</td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'position_desc'}position_asc{else}position_desc{/if}">{tr}position{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}name{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'url_desc'}url_asc{else}url_desc{/if}">{tr}url{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'type_desc'}type_asc{else}type_desc{/if}">{tr}type{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'section_desc'}section_asc{else}section_desc{/if}">{tr}sections{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'perm_desc'}perm_asc{else}perm_desc{/if}">{tr}permissions{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'groupnam_desc'}groupname_asc{else}groupname_desc{/if}">{tr}group{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'position_desc'}position_asc{else}position_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}position{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}name{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'url_desc'}url_asc{else}url_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}url{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'type_desc'}type_asc{else}type_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}type{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'section_desc'}section_asc{else}section_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}sections{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'perm_desc'}perm_asc{else}perm_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}permissions{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'groupnam_desc'}groupname_asc{else}groupname_desc{/if}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}group{/tr}</a></td>
<td class="heading">&nbsp;</td>
</tr>
......@@ -168,7 +173,7 @@
<tr>
<td class="{cycle advance=false}"><input type="checkbox" name="checked[]" value="{$channels[user].optionId|escape}" {if $smarty.request.checked and in_array($channels[user].optionId,$smarty.request.checked)}checked="checked"{/if} /></td>
<td class="{cycle advance=false}">{$channels[user].optionId}</td>
<td class="{cycle advance=false}"><a class="link" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;optionId={$channels[user].optionId}"
<td class="{cycle advance=false}"><a class="link" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;optionId={$channels[user].optionId}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}"
title="{tr}edit{/tr}"><img src="pics/icons/page_edit.png" border="0" width="16" height="16" alt='{tr}edit{/tr}' /></a></td>
<td class="{cycle advance=false}">{$channels[user].position}</td>
<td class="{cycle advance=false}">{$channels[user].name}</td>
......@@ -178,7 +183,7 @@ title="{tr}edit{/tr}"><img src="pics/icons/page_edit.png" border="0" width="16"
<td class="{cycle advance=false}">{$channels[user].perm}</td>
<td class="{cycle advance=false}">{$channels[user].groupname}</td>
<td class="{cycle advance=true}">
&nbsp;&nbsp;<a class="link" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].optionId}"
&nbsp;&nbsp;<a class="link" href="tiki-admin_menu_options.php?menuId={$menuId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].optionId}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}"
title="{tr}delete{/tr}"><img src="pics/icons/cross.png" border="0" height="16" width="16" alt='{tr}delete{/tr}' /></a>
</td>
</tr>
......@@ -197,17 +202,17 @@ title="{tr}delete{/tr}"><img src="pics/icons/cross.png" border="0" height="16" w
<div class="mini">
{if $prev_offset >= 0}
[<a class="prevnext" href="tiki-admin_menu_options.php?find={$find}&amp;menuId={$menuId}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
[<a class="prevnext" href="tiki-admin_menu_options.php?find={$find}&amp;menuId={$menuId}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}prev{/tr}</a>]&nbsp;
{/if}
{tr}Page{/tr}: {$actual_page}/{$cant_pages}
{if $next_offset >= 0}
&nbsp;[<a class="prevnext" href="tiki-admin_menu_options.php?find={$find}&amp;menuId={$menuId}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
&nbsp;[<a class="prevnext" href="tiki-admin_menu_options.php?find={$find}&amp;menuId={$menuId}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">{tr}next{/tr}</a>]
{/if}
{if $direct_pagination eq 'y'}
<br />
{section loop=$cant_pages name=foo}
{assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
<a class="prevnext" href="tiki-admin_menu_options.php?find={$find}&amp;menuId={$menuId}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
<a class="prevnext" href="tiki-admin_menu_options.php?find={$find}&amp;menuId={$menuId}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}{if !empty($nbRecords)}&amp;nbRecords={$nbRecords}{/if}">
{$smarty.section.foo.index_next}</a>&nbsp;
{/section}
{/if}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_trackers.tpl,v 1.74 2007-03-14 20:18:33 sylvieg Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_trackers.tpl,v 1.75 2007-03-21 19:21:43 sylvieg Exp $ *}
<h1><a class="pagetitle" href="tiki-admin_trackers.php">{tr}Admin trackers{/tr}</a>
{if $feature_help eq 'y'}
......@@ -98,8 +98,7 @@
<table class="normal">
<tr class="formcolor"><td>{tr}Name{/tr}:</td><td><input type="text" name="name" value="{$name|escape}" /></td><td></td></tr>
<tr class="formcolor"><td>{tr}Description{/tr}:</td><td colspan="2"><textarea name="description" rows="4" cols="40">{$description|escape}</textarea></td></tr>
{assign var=cols value="2"}
{include file=categorize.tpl}
{include file=categorize.tpl colsCategorize=2}
{if $feature_categories}
<tr class="formcolor"><td class="auto" colspan="2">{tr}Auto create corresponding categories{/tr}</td><td>
<input type="checkbox" name="autoCreateCategories" {if $autoCreateCategories eq 'y' }checked="checked"{/if} /></td></tr>
......@@ -186,6 +185,7 @@ for a tracker and they must be valid in SQL{/tr}</em>
{tr}and display attachments in listing?{/tr} <input type="checkbox" name="showAttachments" {if $showAttachments eq 'y'}checked="checked"{/if} />
</span>
</td></tr>
<tr class="formcolor"><td class="auto" colspan="3">
<div id="attachmentsconf" style="display:{if $useAttachments eq 'y'}block{else}none{/if};">
{tr}Attachment display options (Use numbers to order items, 0 will not be displayed, and negative values display in popups){/tr}<br />
......@@ -214,6 +214,10 @@ for a tracker and they must be valid in SQL{/tr}</em>
&nbsp;{$siteTimeZone}
</td></tr>
<tr class="formcolor"><td class="auto" colspan="2">{tr}Do not show empty fields in item view?{/tr}</td><td>
<input type="checkbox" name="doNotShowEmptyField" {if $doNotShowEmptyField eq 'y'}checked="checked"{/if} />
</td></tr>
<tr class="formcolor"><td>&nbsp;</td><td colspan="2"><input type="submit" name="save" value="{tr}Save{/tr}" /></td></tr>
</table>
</form>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-browse_categories.tpl,v 1.22 2007-03-06 19:30:39 sylvieg Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-browse_categories.tpl,v 1.23 2007-03-21 19:21:43 sylvieg Exp $ *}
<h1><a class="pagetitle" href="tiki-browse_categories.php">{if $parentId ne 0}{tr}Category{/tr} {$p_info.name}{else}{tr}Categories{/tr}{/if}</a></h1>