| [vhffs-dev] [1953] switched to newstyle URLs (; as separator instead of & (or & ... )) |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1953
Author: gradator
Date: 2012-01-26 22:22:08 +0100 (Thu, 26 Jan 2012)
Log Message:
-----------
switched to newstyle URLs (; as separator instead of & (or & ...))
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm
trunk/vhffs-api/src/Vhffs/Panel/Commons.pm
trunk/vhffs-api/src/Vhffs/Panel/Cron.pm
trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
trunk/vhffs-api/src/Vhffs/Panel/Git.pm
trunk/vhffs-api/src/Vhffs/Panel/Group.pm
trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm
trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm
trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
trunk/vhffs-api/src/Vhffs/Panel/Object.pm
trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
trunk/vhffs-api/src/Vhffs/Panel/Public.pm
trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
trunk/vhffs-api/src/Vhffs/Panel/Tag.pm
trunk/vhffs-api/src/Vhffs/Panel/Web.pm
trunk/vhffs-panel/templates/acl/form.tt
trunk/vhffs-panel/templates/admin/broadcast/list.tt
trunk/vhffs-panel/templates/admin/group/list.tt
trunk/vhffs-panel/templates/admin/misc/list.tt
trunk/vhffs-panel/templates/admin/moderation/index.tt
trunk/vhffs-panel/templates/admin/object/edit.tt
trunk/vhffs-panel/templates/admin/object/list.tt
trunk/vhffs-panel/templates/admin/tag/request/details.tt
trunk/vhffs-panel/templates/admin/tag/request/list.tt
trunk/vhffs-panel/templates/admin/user/list.tt
trunk/vhffs-panel/templates/database/prefs.tt
trunk/vhffs-panel/templates/group/index.tt
trunk/vhffs-panel/templates/group/info.tt
trunk/vhffs-panel/templates/group/prefs.tt
trunk/vhffs-panel/templates/group/tags.tt
trunk/vhffs-panel/templates/menu/group.tt
trunk/vhffs-panel/templates/misc/header.tt
trunk/vhffs-panel/templates/misc/languages.tt
trunk/vhffs-panel/templates/misc/service-index.tt
trunk/vhffs-panel/templates/misc/welcome.tt
trunk/vhffs-panel/templates/user/prefs.tt
trunk/vhffs-public/templates/common/pager.tt
trunk/vhffs-public/templates/content/all-groups.tt
trunk/vhffs-public/templates/content/group-details.tt
trunk/vhffs-public/templates/content/groupsearch-form.tt
trunk/vhffs-public/templates/parts/group-general.tt
trunk/vhffs-public/templates/parts/tags-cloud.tt
trunk/vhffs-public/templates/parts/user-general.tt
Modified: trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -86,7 +86,7 @@
{ link => '?do=stats', label => gettext( 'Get Statistics' ) },
{ link => '?do=su', label => gettext( 'Change user-id' ) },
{ link => '?do=moderation', label => gettext( 'Moderation' ) },
- { link => '?do=objectsearch&name=', label => gettext( 'List all objects' ) },
+ { link => '?do=objectsearch;name=', label => gettext( 'List all objects' ) },
{ link => '?do=objectsearch', label => gettext( 'Search for an object' ) },
{ link => '?do=broadcastcreate', label => gettext( 'Mail to all hosted people' ) },
{ link => '?do=broadcastlist', label => gettext( 'Manage mailings' ) }
@@ -106,7 +106,7 @@
sub get_bazaar_category {
my $items = [
- { link => '?do=bazaarsearch&name=', label => gettext( 'List all Bazaar repos' ) },
+ { link => '?do=bazaarsearch;name=', label => gettext( 'List all Bazaar repos' ) },
{ link => '?do=bazaarsearch', label => gettext( 'Search for a Bazaar repository' ) }
];
return { name => gettext( 'Bazaar Admin' ), items => $items, type => 'bazaar' };
@@ -123,7 +123,7 @@
sub get_user_category {
my $items = [
- { link => '?do=usersearch&name=', label => gettext( 'List all users' ) },
+ { link => '?do=usersearch;name=', label => gettext( 'List all users' ) },
{ link => '?do=usersearch', label => gettext( 'Search for an user' ) }
];
return { name => gettext( 'User Admin' ), items => $items, type => 'user' };
@@ -140,7 +140,7 @@
sub get_group_category {
my $items = [
- { link => '?do=groupsearch&name=', label => gettext( 'List all groups' ) },
+ { link => '?do=groupsearch;name=', label => gettext( 'List all groups' ) },
{ link => '?do=groupsearch', label => gettext( 'Search for a group' ) }
];
return { name => gettext( 'Group Admin' ), items => $items, type => 'group' };
@@ -178,7 +178,7 @@
sub get_web_category {
my $items = [
- { link => '?do=websearch&name=', label => gettext( 'List all webareas' ) },
+ { link => '?do=websearch;name=', label => gettext( 'List all webareas' ) },
{ link => '?do=websearch', label => gettext( 'Search for a webarea' ) }
];
return { name => gettext( 'Web Admin' ), items => $items, type => 'web' };
@@ -195,7 +195,7 @@
sub get_svn_category {
my $items = [
- { link => '?do=svnsearch&name=', label => gettext( 'List all SVN repos' ) },
+ { link => '?do=svnsearch;name=', label => gettext( 'List all SVN repos' ) },
{ link => '?do=svnsearch', label => gettext( 'Search for a SVN repository' ) }
];
return { name => gettext( 'SVN Admin' ), items => $items, type => 'svn' };
@@ -213,7 +213,7 @@
sub get_cvs_category {
my $items = [
- { link => '?do=cvssearch&name=', label => gettext( 'List all CVS repos' ) },
+ { link => '?do=cvssearch;name=', label => gettext( 'List all CVS repos' ) },
{ link => '?do=cvssearch', label => gettext( 'Search for a CVS repository' ) }
];
return { name => gettext( 'CVS Admin' ), items => $items, type => 'cvs' };
@@ -231,7 +231,7 @@
sub get_git_category {
my $items = [
- { link => '?do=gitsearch&name=', label => gettext( 'List all Git repos' ) },
+ { link => '?do=gitsearch;name=', label => gettext( 'List all Git repos' ) },
{ link => '?do=gitsearch', label => gettext( 'Search for a Git repository' ) }
];
return { name => gettext( 'Git Admin' ), items => $items, type => 'git' };
@@ -249,7 +249,7 @@
sub get_mercurial_category {
my $items = [
- { link => '?do=mercurialsearch&name=', label => gettext( 'List all Mercurial repos' ) },
+ { link => '?do=mercurialsearch;name=', label => gettext( 'List all Mercurial repos' ) },
{ link => '?do=mercurialsearch', label => gettext( 'Search for a Mercurial repository' ) }
];
return { name => gettext( 'Mercurial Admin' ), items => $items, type => 'mercurial' };
@@ -266,7 +266,7 @@
sub get_mysql_category {
my $items = [
- { link => '?do=mysqlsearch&name=', label => gettext( 'List all MySQL databases' ) },
+ { link => '?do=mysqlsearch;name=', label => gettext( 'List all MySQL databases' ) },
{ link => '?do=mysqlsearch', label => gettext( 'Search for a MySQL database' ) }
];
return { name => gettext( 'MySQL Admin' ), items => $items, type => 'mysql' };
@@ -283,7 +283,7 @@
sub get_pgsql_category {
my $items = [
- { link => '?do=pgsqlsearch&name=', label => gettext( 'List all Pg databases' ) },
+ { link => '?do=pgsqlsearch;name=', label => gettext( 'List all Pg databases' ) },
{ link => '?do=pgsqlsearch', label => gettext( 'Search for a Pg database' ) }
];
return { name => gettext( 'PostgreSQL Admin' ), items => $items, type => 'pgsql' };
@@ -300,7 +300,7 @@
sub get_mail_category {
my $items = [
- { link => '?do=mailsearch&name=', label => gettext( 'List all mail domains' ) },
+ { link => '?do=mailsearch;name=', label => gettext( 'List all mail domains' ) },
{ link => '?do=mailsearch', label => gettext( 'Search for a mail domain' ) }
];
return { name => gettext( 'Mail domains Admin' ), items => $items, type => 'mail' };
@@ -318,7 +318,7 @@
sub get_mailing_category {
my $items = [
- { link => '?do=mailinglistsearch&name=', label => gettext( 'List all mailing lists' ) },
+ { link => '?do=mailinglistsearch;name=', label => gettext( 'List all mailing lists' ) },
{ link => '?do=mailinglistsearch', label => gettext( 'Search for a mailing list' ) }
];
return { name => gettext( 'Mailing lists Admin' ), items => $items, type => 'mailing' };
@@ -336,7 +336,7 @@
sub get_dns_category {
my $items = [
- { link => '?do=dnssearch&name=', label => gettext( 'List all domain names' ) },
+ { link => '?do=dnssearch;name=', label => gettext( 'List all domain names' ) },
{ link => '?do=dnssearch', label => gettext( 'Search for a domain name' ) }
];
return { name => gettext( 'DNS Admin' ), items => $items, type => 'dns' };
@@ -354,7 +354,7 @@
sub get_repo_category {
my $items = [
- { link => '?do=repositorysearch&name=', label => gettext( 'List all download repositories' ) },
+ { link => '?do=repositorysearch;name=', label => gettext( 'List all download repositories' ) },
{ link => '?do=repositorysearch', label => gettext( 'Search for a download repository' ) }
];
return { name => gettext( 'Download repositories Admin' ), items => $items, type => 'repository' };
@@ -371,7 +371,7 @@
sub get_cron_category {
my $items = [
- { link => '?do=cronsearch&name=', label => gettext( 'List all cron jobs' ) },
+ { link => '?do=cronsearch;name=', label => gettext( 'List all cron jobs' ) },
{ link => '?do=cronsearch', label => gettext( 'Search for a cron job' ) }
];
return { name => gettext( 'Crons Admin' ), items => $items, type => 'cron' };
Modified: trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Bazaar.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -150,7 +150,7 @@
unless( $panel->has_errors() ) {
my $bazaar = Vhffs::Panel::Bazaar::create_bazaar( $vhffs, $fullreponame, $description, $user, $group );
if( defined $bazaar ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The Bazaar object was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The Bazaar object was successfully created !');
$panel->redirect($url);
return;
}
@@ -243,7 +243,7 @@
if($bazaar->get_status == Vhffs::Constants::WAITING_FOR_MODIFICATION) {
if($bazaar->commit > 0) {
- my $url = '?do=groupview&group='.$bazaar->get_group->get_groupname.'&msg='.gettext('Modifications applied. Please wait while your repository is being updated');
+ my $url = '?do=groupview;group='.$bazaar->get_group->get_groupname.';msg='.gettext('Modifications applied. Please wait while your repository is being updated');
$panel->redirect($url);
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Commons.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Commons.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Commons.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -60,7 +60,7 @@
my $value = $url_params->{$key};
push @params, $key.'='.$value unless($value =~ /^\s*$/);
}
- $template->param( SEARCH_CRITERIA => join('&', @params) );
+ $template->param( SEARCH_CRITERIA => join(';', @params) );
$template->param( CURRENT_PAGE => $current_page );
my $pages = [];
if($current_page > 1) {
@@ -106,7 +106,7 @@
push @params, $key.'='.$value;
}
}
- $pager->{query_string} = join('&', @params);
+ $pager->{query_string} = join(';', @params);
my $pages = [];
for( ( ($current_page - $slider_size > 0) ? $current_page - $slider_size : 1 )..($current_page - 1) ) {
push @$pages, $_;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Cron.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Cron.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Cron.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -143,7 +143,7 @@
unless( $panel->has_errors() ) {
my $mail = Vhffs::Panel::Cron::create_cron($vhffs, $cronpath, $interval*60, $reportmail , $description, $user, $group);
if( defined $mail ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The Cron job was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The Cron job was successfully created !');
$panel->redirect($url);
return;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -152,7 +152,7 @@
#Create CVS
my $cvs = Vhffs::Panel::Cvs::create_cvs( $vhffs, $fullreponame, $description, $user , $group );
if( defined $cvs ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The CVS object was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The CVS object was successfully created !');
$panel->redirect($url);
return;
} else {
@@ -206,7 +206,7 @@
$cvs->set_public($want_public);
$cvs->set_status(Vhffs::Constants::WAITING_FOR_MODIFICATION);
if($cvs->commit > 0) {
- my $url = '?do=groupview&group='.$cvs->get_group->get_groupname.'&msg='.gettext('Modifications applied. Please wait while your repository is being updated');
+ my $url = '?do=groupview;group='.$cvs->get_group->get_groupname.';msg='.gettext('Modifications applied. Please wait while your repository is being updated');
$panel->redirect($url);
return;
} else {
Modified: trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -378,7 +378,7 @@
unless( $panel->has_errors() ) {
my $dns = Vhffs::Panel::DNS::create_dns( $vhffs, $domain_name, $description, $user, $group );
if( defined $dns ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The DNS object was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The DNS object was successfully created !');
$panel->redirect($url);
return;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Git.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Git.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Git.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -155,7 +155,7 @@
unless( $panel->has_errors() ) {
my $git = Vhffs::Panel::Git::create_git( $vhffs, $fullreponame, $description, $user, $group );
if( defined $git ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The GIT object was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The GIT object was successfully created !');
$panel->redirect($url);
return;
}
@@ -248,7 +248,7 @@
if($git->get_status == Vhffs::Constants::WAITING_FOR_MODIFICATION) {
if($git->commit > 0) {
- my $url = '?do=groupview&group='.$git->get_group->get_groupname.'&msg='.gettext('Modifications applied. Please wait while your repository is being updated');
+ my $url = '?do=groupview;group='.$git->get_group->get_groupname.';msg='.gettext('Modifications applied. Please wait while your repository is being updated');
$panel->redirect($url);
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -317,7 +317,7 @@
my $tag = Vhffs::Tag::get_by_tag_id($vhffs, $tag_id);
$group->add_tag($tag, $user) if defined $tag and $tag->get_category()->{visibility} == Vhffs::Constants::TAG_VISIBILITY_GROUP_CREATION;
}
- my $url = '?do=groupindex&msg='.gettext('Project Successfully created !');
+ my $url = '?do=groupindex;msg='.gettext('Project Successfully created !');
$panel->redirect($url);
return;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -158,7 +158,7 @@
unless( $panel->has_errors() ) {
my $mail = Vhffs::Panel::Mail::create_mail( $vhffs , $domain , $description, $user , $group );
if( defined $mail ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('Mail domain successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('Mail domain successfully created !');
$panel->redirect($url);
return;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -177,7 +177,7 @@
unless( $panel->has_errors() ) {
my $mailinglist = Vhffs::Panel::MailingList::create_list( $vhffs, $localpart, $domain, $description, $user, $group );
if( defined $mailinglist ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The mailing list object was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The mailing list object was successfully created !');
$panel->redirect( $url );
return;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mercurial.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -155,7 +155,7 @@
unless( $panel->has_errors() ) {
my $mercurial = Vhffs::Panel::Mercurial::create_mercurial( $vhffs, $fullreponame, $description, $user, $group );
if(defined $mercurial) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The Mercurial object was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The Mercurial object was successfully created !');
$panel->redirect($url);
return;
}
@@ -249,7 +249,7 @@
if($mercurial->get_status == Vhffs::Constants::WAITING_FOR_MODIFICATION) {
if($mercurial->commit > 0) {
- my $url = '?do=groupview&group='.$mercurial->get_group->get_groupname.'&msg='.gettext('Modifications applied. Please wait while your repository is being updated');
+ my $url = '?do=groupview;group='.$mercurial->get_group->get_groupname.';msg='.gettext('Modifications applied. Please wait while your repository is being updated');
$panel->redirect($url);
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -154,7 +154,7 @@
unless( $panel->has_errors() ) {
if(defined Vhffs::Panel::Mysql::create_mysql($vhffs, $dbname, $user, $group, $dbuser, $dbpass, $description)) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The MySQL DB was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The MySQL DB was successfully created !');
$panel->redirect($url);
return;
} else {
@@ -236,7 +236,7 @@
return 0;
}
- my $url = '?do=groupview&group='.$mysql->get_group->get_groupname.'&msg='.gettext('Password change request taken in account, please wait for processing');
+ my $url = '?do=groupview;group='.$mysql->get_group->get_groupname.';msg='.gettext('Password change request taken in account, please wait for processing');
$panel->redirect($url);
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Object.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Object.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Object.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -131,9 +131,9 @@
if ( $object->resubmit_for_moderation( $description ) ) {
my $url;
if( $object->get_type == Vhffs::Constants::TYPE_GROUP ) {
- $url = '?do=groupindex&msg='.gettext('The new description has been submitted');
+ $url = '?do=groupindex;msg='.gettext('The new description has been submitted');
} else {
- $url = '?do=groupview&group='.$object->get_group->get_groupname.'&msg='.gettext('The new description has been submitted');
+ $url = '?do=groupview;group='.$object->get_group->get_groupname.';msg='.gettext('The new description has been submitted');
}
$panel->redirect( $url );
return;
@@ -183,9 +183,9 @@
if( $object->delete ) {
my $url;
if( $object->get_type == Vhffs::Constants::TYPE_GROUP ) {
- $url = '?do=groupindex&msg='.gettext('This object has been deleted');
+ $url = '?do=groupindex;msg='.gettext('This object has been deleted');
} else {
- $url = '?do=groupview&group='.$object->get_group->get_groupname.'&msg='.gettext('This object has been deleted');
+ $url = '?do=groupview;group='.$object->get_group->get_groupname.';msg='.gettext('This object has been deleted');
}
$panel->redirect( $url );
return;
@@ -232,7 +232,7 @@
if( $object->get_type == Vhffs::Constants::TYPE_GROUP ) {
$vars->{refresh_url} = '?do=groupindex';
} else {
- $vars->{refresh_url} = '?do=groupview&group='.$object->get_owner_group;
+ $vars->{refresh_url} = '?do=groupview;group='.$object->get_owner_group;
}
$panel->render('misc/message.tt', $vars );
Modified: trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -144,7 +144,7 @@
unless( $panel->has_errors() ) {
if(defined Vhffs::Panel::Pgsql::create_pgsql($vhffs, $dbname, $user, $group, $dbuser, $dbpass, $description)) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The PostgreSQL DB was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The PostgreSQL DB was successfully created !');
$panel->redirect($url);
return;
} else {
@@ -226,7 +226,7 @@
return 0;
}
- my $url = '?do=groupview&group='.$pgsql->get_group->get_groupname.'&msg='.gettext('Password change request taken in account, please wait for processing');
+ my $url = '?do=groupview;group='.$pgsql->get_group->get_groupname.';msg='.gettext('Password change request taken in account, please wait for processing');
$panel->redirect($url);
return 1;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Public.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Public.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Public.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -159,9 +159,9 @@
my $query_string = '';
- $query_string .= 'included_tags='.(join('&included_tags=', @included_tags_ids)) if(scalar(@included_tags_ids));
- $query_string .= '&' if(scalar(@included_tags_ids) and scalar(@excluded_tags_ids));
- $query_string .= 'excluded_tags='.(join('&excluded_tags=', @excluded_tags_ids)) if(scalar(@excluded_tags_ids));
+ $query_string .= 'included_tags='.(join(';included_tags=', @included_tags_ids)) if(scalar(@included_tags_ids));
+ $query_string .= ';' if(scalar(@included_tags_ids) and scalar(@excluded_tags_ids));
+ $query_string .= 'excluded_tags='.(join(';excluded_tags=', @excluded_tags_ids)) if(scalar(@excluded_tags_ids));
my $vars = {
included_tags => Vhffs::Panel::Tag::get_by_tag_ids($panel->{vhffs}, @included_tags_ids),
@@ -536,7 +536,7 @@
foreach(@{$users}) {
$rss->add_item(
title => $_->{username},
- link => $url.'?do=user&name='.$_->{username},
+ link => $url.'?do=user;name='.$_->{username},
description => 'VHFFS User'
);
}
@@ -595,7 +595,7 @@
foreach(@{$groups}) {
$rss->add_item(
title => $_->{realname},
- link => $url.'?do=group&name='.$_->{groupname},
+ link => $url.'?do=group;name='.$_->{groupname},
description => 'Vhffs Group',
);
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -137,7 +137,7 @@
unless( $panel->has_errors() ) {
my $repository = Vhffs::Panel::Repository::create_repository( $vhffs, $group->get_groupname, $user, $group , $description );
if( defined $repository ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The repository was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The repository was successfully created !');
$panel->redirect($url);
return;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -156,7 +156,7 @@
unless( $panel->has_errors() ) {
my $svn = Vhffs::Panel::Svn::create_svn( $vhffs, $fullreponame, $description, $user, $group );
if( defined $svn ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The SVN object was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The SVN object was successfully created !');
$panel->redirect($url);
return;
}
@@ -246,7 +246,7 @@
if($svn->get_status == Vhffs::Constants::WAITING_FOR_MODIFICATION) {
if($svn->commit > 0) {
- my $url = '?do=groupview&group='.$svn->get_group->get_groupname.'&msg='.gettext('Modifications applied. Please wait while your repository is being updated');
+ my $url = '?do=groupview;group='.$svn->get_group->get_groupname.';msg='.gettext('Modifications applied. Please wait while your repository is being updated');
$panel->redirect($url);
return;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Tag.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Tag.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Tag.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -151,7 +151,7 @@
if(defined $cgi->param('create_tag_submit')) {
if(_create_tag( $panel , $vars )) {
- $panel->redirect('?do=taglist&msg='.gettext('Tag successfully created'));
+ $panel->redirect('?do=taglist;msg='.gettext('Tag successfully created'));
}
}
@@ -221,7 +221,7 @@
if(defined $cgi->param('create_tag_category_submit')) {
if(_create_category( $panel, $vars )) {
- $panel->redirect('?do=tagcategorylist&msg='.gettext('Tag category successfully created'));
+ $panel->redirect('?do=tagcategorylist;msg='.gettext('Tag category successfully created'));
}
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2012-01-26 21:22:08 UTC (rev 1953)
@@ -212,7 +212,7 @@
unless( $panel->has_errors() ) {
if( defined Vhffs::Panel::Web::create_web( $vhffs, $servername, $description, $user, $group) ) {
- my $url = '?do=groupview&group='.$group->get_groupname.'&msg='.gettext('The webarea was successfully created !');
+ my $url = '?do=groupview;group='.$group->get_groupname.';msg='.gettext('The webarea was successfully created !');
$panel->redirect($url);
return;
} else {
Modified: trunk/vhffs-panel/templates/acl/form.tt
===================================================================
--- trunk/vhffs-panel/templates/acl/form.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/acl/form.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -1,6 +1,6 @@
<h2>[% 'Access rights management for this object' | i18n | html %]</h2>
-<form method="post" action="?do=acl&oid=[% object.get_oid %]" accept-charset="utf-8">
+<form method="post" action="?do=acl;oid=[% object.get_oid %]" accept-charset="utf-8">
<p>[% 'You can adjust rights on this group for each user in the VHFFS database. Please read help before manage it.' | i18n | html %]</p>
<input type="hidden" name="oid" value="[% object.get_oid %]" />
<p class="button" id="buttonAclAdmin">
Modified: trunk/vhffs-panel/templates/admin/broadcast/list.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/broadcast/list.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/broadcast/list.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -20,11 +20,11 @@
<td class="mainColumn">[% m.body | truncate(200) | html_para %]</td>
<td>[% m.state %]</td>
<td>
- <form method="post" action="?do=broadcastdelete&mid=[% m.id %]" accept-charset="utf-8">
+ <form method="post" action="?do=broadcastdelete;mid=[% m.id %]" accept-charset="utf-8">
<p><input type="hidden" name="mid" value="[% m.id %]" />
<input type="submit" value="[% 'Delete' | i18n | html %]" /></p>
</form>
- <form method="post" action="?do=broadcastview&mid=[% m.id %]" accept-charset="utf-8">
+ <form method="post" action="?do=broadcastview;mid=[% m.id %]" accept-charset="utf-8">
<p><input type="hidden" name="mid" value="[% m.id %]" />
<input type="submit" value="[% 'View' | i18n | html %]" /></p>
</form>
Modified: trunk/vhffs-panel/templates/admin/group/list.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/group/list.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/group/list.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -16,7 +16,7 @@
<td>[% g.groupname | html %]</td>
<td>[% g.owner_user | html %]</td>
<td>[% g.state | stringify_status | html %]</td>
- <td><a href="?do=groupprefs&group=[% g.groupname | html %]">[% 'Preferences' | i18n | html %]</a></td>
+ <td><a href="?do=groupprefs;group=[% g.groupname | html %]">[% 'Preferences' | i18n | html %]</a></td>
</tr>
[% END %]
</tbody>
Modified: trunk/vhffs-panel/templates/admin/misc/list.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/list.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/misc/list.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -18,7 +18,7 @@
<td>[% o.owner_user | html %]</td>
<td>[% o.owner_group | html %]</td>
<td>[% o.state | stringify_status | html %]</td>
- <td><a href="?do=[% type %]prefs&name=[% o.label %]">[% 'Preferences' | i18n | html %]</a></td>
+ <td><a href="?do=[% type %]prefs;name=[% o.label %]">[% 'Preferences' | i18n | html %]</a></td>
</tr>
[% END %]
</tbody>
Modified: trunk/vhffs-panel/templates/admin/moderation/index.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/moderation/index.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/moderation/index.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -15,9 +15,9 @@
<tr>
<td>[% o.type | stringify_type | i18n | html %]</td>
<td>[% o.label | html %]</td>
- <td><a href="?do=userprefs&name=[% o.get_user.get_username | html %]">[% o.get_user.get_username | html %]</a>
+ <td><a href="?do=userprefs;name=[% o.get_user.get_username | html %]">[% o.get_user.get_username | html %]</a>
[% '(' _ o.get_user.get_note _ ')' IF use_notation %]</td>
- <td><a href="?do=groupview&group=[% o.get_group.get_groupname | html %]">[% o.get_group.get_groupname | html %]</a></td>
+ <td><a href="?do=groupview;group=[% o.get_group.get_groupname | html %]">[% o.get_group.get_groupname | html %]</a></td>
<td class="mainColumn">[% o.get_description | html_para %]</td>
<td>
<form action="?do=moderation" method="post" accept-charset="utf-8">
Modified: trunk/vhffs-panel/templates/admin/object/edit.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/object/edit.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/object/edit.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -60,6 +60,6 @@
[% IF use_avatars %]
<h2>[% 'Avatar management' | i18n | html %]</h2>
-<p><a href="?do=avatardelete&oid=[% object.get_oid %]">[% 'Delete avatar for this object' | i18n | html %]</a></p>
+<p><a href="?do=avatardelete;oid=[% object.get_oid %]">[% 'Delete avatar for this object' | i18n | html %]</a></p>
[% END %]
Modified: trunk/vhffs-panel/templates/admin/object/list.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/object/list.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/object/list.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -18,7 +18,7 @@
<td>[% o.owner_user | html %]</td>
<td>[% o.owner_group | html %]</td>
<td>[% o.state | stringify_status | html %]</td>
- <td><a href="?do=objectedit&oid=[% o.oid %]">[% 'Edit' | i18n | html %]</a></td>
+ <td><a href="?do=objectedit;oid=[% o.oid %]">[% 'Edit' | i18n | html %]</a></td>
</tr>
[% END %]
</tbody>
Modified: trunk/vhffs-panel/templates/admin/tag/request/details.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/tag/request/details.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/tag/request/details.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -7,7 +7,7 @@
<p class="info">[% 'You can either accept the request (and possibly change the name of the tag/category) or reattach it to an existing category and/or tag. If you choose to create a category, you\'ve to create the tag too.' | i18n | html %]</p>
<fieldset>
<legend>[% 'Manage request' | i18n | html %]</legend>
-<form class="table-like" name="manageTagRequestForm" id="manageTagRequestForm" action="?do=tagrequestdetails&request_id=[% request.request_id %]" method="post">
+<form class="table-like" name="manageTagRequestForm" id="manageTagRequestForm" action="?do=tagrequestdetails;request_id=[% request.request_id %]" method="post">
<div style="width:50%;float:left">
<h3>Category</h3>
<p><select name="category" id="tagRequestCategorySelect">
Modified: trunk/vhffs-panel/templates/admin/tag/request/list.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/tag/request/list.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/tag/request/list.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -14,7 +14,7 @@
<tbody>
[% FOREACH r IN requests %]
<tr>
- <td><a href="?do=tagrequestdetails&request_id=[% r.request_id %]">
+ <td><a href="?do=tagrequestdetails;request_id=[% r.request_id %]">
[% r.category_label | i18n | html %]</a></td>
<td>[% r.tag_label | i18n | html %]</td>
<td>[% (r.get_requester ? r.get_requester.get_username : 'DELETED') | html %]</td>
Modified: trunk/vhffs-panel/templates/admin/user/list.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/user/list.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/admin/user/list.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -16,7 +16,7 @@
<td>[% u.username | html %]</td>
<td>[% u.realname | html %]</td>
<td>[% u.state | stringify_status | html %]</td>
- <td><a href="?do=userprefs&name=[% u.username %]">[% 'Preferences' | i18n | html %]</a></td>
+ <td><a href="?do=userprefs;name=[% u.username %]">[% 'Preferences' | i18n | html %]</a></td>
</tr>
[% END %]
</tbody>
Modified: trunk/vhffs-panel/templates/database/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/database/prefs.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/database/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -1,4 +1,4 @@
-<form class="table-like" method="post" action="?do=[% type | html %]prefs&name=[% db.get_dbname | html %]" accept-charset="utf-8">
+<form class="table-like" method="post" action="?do=[% type | html %]prefs;name=[% db.get_dbname | html %]" accept-charset="utf-8">
<p>
<label>[% 'Name of the database:' | i18n | html %]</label>
[% db.get_dbname | html %]
Modified: trunk/vhffs-panel/templates/group/index.tt
===================================================================
--- trunk/vhffs-panel/templates/group/index.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/group/index.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -4,12 +4,12 @@
<ul>
[% FOR p IN owned_projects %]
[% IF p.active %]
- <li><a href="?do=groupview&group=[% p.groupname | html %]">[% p.groupname | html %]</a></li>
+ <li><a href="?do=groupview;group=[% p.groupname | html %]">[% p.groupname | html %]</a></li>
[% ELSE %]
<li>[% p.groupname | html %] — [% p.state | html %]
[% IF p.refused %]
- - <a href="?do=objectresubmit&oid=[% p.oid %]">[% 'Propose a new description' | i18n | html %]</a>
- - <a href="?do=objectcancel&oid=[% p.oid %]">[% 'Delete' | i18n | html %]</a>
+ - <a href="?do=objectresubmit;oid=[% p.oid %]">[% 'Propose a new description' | i18n | html %]</a>
+ - <a href="?do=objectcancel;oid=[% p.oid %]">[% 'Delete' | i18n | html %]</a>
[% END %]
</li>
[% END %]
@@ -23,12 +23,12 @@
<ul>
[% FOR p IN contributed_projects %]
[% IF p.active %]
- <li><a href="?do=groupview&group=[% p.groupname | html %]">[% p.groupname | html %]</a></li>
+ <li><a href="?do=groupview;group=[% p.groupname | html %]">[% p.groupname | html %]</a></li>
[% ELSE %]
<li>[% p.groupname | html %] — [% p.state | html %]
[% IF p.refused %]
- - <a href="?do=objectresubmit&oid=[% p.oid %]">[% 'Propose a new description' | i18n | html %]</a>
- - <a href="?do=objectcancel&oid=[% p.oid %]">[% 'Delete' | i18n | html %]</a>
+ - <a href="?do=objectresubmit;oid=[% p.oid %]">[% 'Propose a new description' | i18n | html %]</a>
+ - <a href="?do=objectcancel;oid=[% p.oid %]">[% 'Delete' | i18n | html %]</a>
[% END %]
</li>
[% END %]
Modified: trunk/vhffs-panel/templates/group/info.tt
===================================================================
--- trunk/vhffs-panel/templates/group/info.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/group/info.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -8,8 +8,8 @@
<span class="quota-used" style="width:[% (group.get_quota_used / group.get_quota * 100) | format('%d') %]%" title="[% (group.get_quota_used / group.get_quota * 100) | format('%.2f') %]%"></span>
</span>
</li>
- <li><a href="?do=grouphistory&group=[% group.get_groupname | html %]">[% 'Full history' | i18n | html %]</a></li>
- <li><a href="?do=groupprefs&group=[% group.get_groupname | html %]">[% 'Preferences' | i18n | html %]</a></li>
+ <li><a href="?do=grouphistory;group=[% group.get_groupname | html %]">[% 'Full history' | i18n | html %]</a></li>
+ <li><a href="?do=groupprefs;group=[% group.get_groupname | html %]">[% 'Preferences' | i18n | html %]</a></li>
[% IF help_url.defined %]
<li><a href="[% help_url %]">[% 'Help' | i18n | html %]</a></li>
[% END %]
Modified: trunk/vhffs-panel/templates/group/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/group/prefs.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/group/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -89,9 +89,9 @@
[% IF use_avatars %]
<h2>[% 'Logo' | i18n | html %]</h2>
<h3>[% 'Current logo' | i18n | html %]</h3>
- <p><img src="?do=avatarget&oid=[% group.get_oid %]" alt="[% 'Group logo' | i18n | html %]"/></p>
+ <p><img src="?do=avatarget;oid=[% group.get_oid %]" alt="[% 'Group logo' | i18n | html %]"/></p>
<h3>[% 'Update logo' | i18n | html %]</h3>
-<form class="table-like" method="post" action="?do=avatarput&oid=[% group.get_oid %]" enctype="multipart/form-data" accept-charset="utf-8">
+<form class="table-like" method="post" action="?do=avatarput;oid=[% group.get_oid %]" enctype="multipart/form-data" accept-charset="utf-8">
<p>[% 'You can upload a custom logo for your group.' | i18n | html %]</p>
<input type="hidden" name="oid" value="[% group.get_oid %]"/>
<p><input type="file" name="avatar"/></p>
Modified: trunk/vhffs-panel/templates/group/tags.tt
===================================================================
--- trunk/vhffs-panel/templates/group/tags.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/group/tags.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -5,7 +5,7 @@
[% FOREACH c IN current_tag_categories %]
<li>[% c.label | html %]:
[% FOREACH t IN c.tags %]
-<a href="?group=[% group.get_groupname | html %]&delete_tag_submit=true&tag_id=[% t.tag_id %]#tags">[% t.label | html %]</a>[% ', ' UNLESS loop.last %]
+<a href="?group=[% group.get_groupname | html %];delete_tag_submit=true;tag_id=[% t.tag_id %]#tags">[% t.label | html %]</a>[% ', ' UNLESS loop.last %]
[% END # t IN c.tags %]
[% ';' UNLESS loop.last() %]
[% END # c IN current_tag_categories%]
@@ -16,7 +16,7 @@
[% FOREACH c IN tag_categories %]
<li>[% c.label | html %]:
[% FOREACH t IN c.tags %]
-<a href="?do=groupprefs&group=[% group.get_groupname | html %]&add_tag_submit=true&tag_id=[% t.tag_id %]#tags">[% t.label | html %]</a>[% ', ' UNLESS loop.last() %]
+<a href="?do=groupprefs;group=[% group.get_groupname | html %];add_tag_submit=true;tag_id=[% t.tag_id %]#tags">[% t.label | html %]</a>[% ', ' UNLESS loop.last() %]
[% END # t IN c.tags %]
;</li>
[% END # c IN tag_categories %]
@@ -38,7 +38,7 @@
[% FOREACH r IN tag_requests %]
<li>
[% r.category_label | html %]::[% r.tag_label | html %]
-[<a href="?group=[% group.get_groupname | html %]&cancel_tag_request_submit=true&request_id=[% r.request_id %]">[% 'Cancel' | i18n | html %]</a>]
+[<a href="?group=[% group.get_groupname | html %];cancel_tag_request_submit=true;request_id=[% r.request_id %]">[% 'Cancel' | i18n | html %]</a>]
</li>
[% END # r IN tag_requests %]
</ul>
Modified: trunk/vhffs-panel/templates/menu/group.tt
===================================================================
--- trunk/vhffs-panel/templates/menu/group.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/menu/group.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -1,88 +1,88 @@
<ul>
<li><a href="#">[% 'Project' | i18n | html %]</a>
<ul>
- <li><a href="?do=groupview&group=[% current_group.get_groupname %]">[% 'Home' | i18n | html %]</a></li>
- <li><a href="?do=groupprefs&group=[% current_group.get_groupname %]">[% 'Preferences' | i18n | html %]</a></li>
+ <li><a href="?do=groupview;group=[% current_group.get_groupname %]">[% 'Home' | i18n | html %]</a></li>
+ <li><a href="?do=groupprefs;group=[% current_group.get_groupname %]">[% 'Preferences' | i18n | html %]</a></li>
</ul>
</li>
<li><a href="#">[% 'Services' | i18n | html %]</a>
<ul>
- [% IF panel_header.available_services.web %]<li><a href="?do=webindex&group=[% current_group.get_groupname %]">[% 'Web' | i18n | html %]</a>
+ [% IF panel_header.available_services.web %]<li><a href="?do=webindex;group=[% current_group.get_groupname %]">[% 'Web' | i18n | html %]</a>
<ul>
- <li><a href="?do=webindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=webcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=webindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=webcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.mysql %]<li><a href="?do=mysqlindex&group=[% current_group.get_groupname %]">[% 'MySQL' | i18n | html %]</a>
+ [% IF panel_header.available_services.mysql %]<li><a href="?do=mysqlindex;group=[% current_group.get_groupname %]">[% 'MySQL' | i18n | html %]</a>
<ul>
- <li><a href="?do=mysqlindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=mysqlcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=mysqlindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=mysqlcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.pgsql %]<li><a href="?do=pgsqlindex&group=[% current_group.get_groupname %]">[% 'PgSQL' | i18n | html %]</a>
+ [% IF panel_header.available_services.pgsql %]<li><a href="?do=pgsqlindex;group=[% current_group.get_groupname %]">[% 'PgSQL' | i18n | html %]</a>
<ul>
- <li><a href="?do=pgsqlindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=pgsqlcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=pgsqlindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=pgsqlcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.cvs %]<li><a href="?do=cvsindex&group=[% current_group.get_groupname %]">[% 'CVS' | i18n | html %]</a>
+ [% IF panel_header.available_services.cvs %]<li><a href="?do=cvsindex;group=[% current_group.get_groupname %]">[% 'CVS' | i18n | html %]</a>
<ul>
- <li><a href="?do=cvsindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=cvscreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=cvsindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=cvscreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.svn %]<li><a href="?do=svnindex&group=[% current_group.get_groupname %]">[% 'SVN' | i18n | html %]</a>
+ [% IF panel_header.available_services.svn %]<li><a href="?do=svnindex;group=[% current_group.get_groupname %]">[% 'SVN' | i18n | html %]</a>
<ul>
- <li><a href="?do=svnindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=svncreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=svnindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=svncreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.git %]<li><a href="?do=gitindex&group=[% current_group.get_groupname %]">[% 'Git' | i18n | html %]</a>
+ [% IF panel_header.available_services.git %]<li><a href="?do=gitindex;group=[% current_group.get_groupname %]">[% 'Git' | i18n | html %]</a>
<ul>
- <li><a href="?do=gitindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=gitcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=gitindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=gitcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.mercurial %]<li><a href="?do=mercurialindex&group=[% current_group.get_groupname %]">[% 'Mercurial' | i18n | html %]</a>
+ [% IF panel_header.available_services.mercurial %]<li><a href="?do=mercurialindex;group=[% current_group.get_groupname %]">[% 'Mercurial' | i18n | html %]</a>
<ul>
- <li><a href="?do=mercurialindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=mercurialcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=mercurialindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=mercurialcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.bazaar %]<li><a href="?do=bazaarindex&group=[% current_group.get_groupname %]">[% 'Bazaar' | i18n | html %]</a>
+ [% IF panel_header.available_services.bazaar %]<li><a href="?do=bazaarindex;group=[% current_group.get_groupname %]">[% 'Bazaar' | i18n | html %]</a>
<ul>
- <li><a href="?do=bazaarindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=bazaarcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=bazaarindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=bazaarcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.dns %]<li><a href="?do=dnsindex&group=[% current_group.get_groupname %]">[% 'DNS' | i18n | html %]</a>
+ [% IF panel_header.available_services.dns %]<li><a href="?do=dnsindex;group=[% current_group.get_groupname %]">[% 'DNS' | i18n | html %]</a>
<ul>
- <li><a href="?do=dnsindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=dnscreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=dnsindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=dnscreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.repository %]<li><a href="?do=repositoryindex&group=[% current_group.get_groupname %]">[% 'Dl repos' | i18n | html %]</a>
+ [% IF panel_header.available_services.repository %]<li><a href="?do=repositoryindex;group=[% current_group.get_groupname %]">[% 'Dl repos' | i18n | html %]</a>
<ul>
- <li><a href="?do=repositoryindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=repositorycreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=repositoryindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=repositorycreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.mail %]<li><a href="?do=mailindex&group=[% current_group.get_groupname %]">[% 'Mail' | i18n | html %]</a>
+ [% IF panel_header.available_services.mail %]<li><a href="?do=mailindex;group=[% current_group.get_groupname %]">[% 'Mail' | i18n | html %]</a>
<ul>
- <li><a href="?do=mailindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=mailcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=mailindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=mailcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.mailinglist %]<li><a href="?do=mailinglistindex&group=[% current_group.get_groupname %]">[% 'ML' | i18n | html %]</a>
+ [% IF panel_header.available_services.mailinglist %]<li><a href="?do=mailinglistindex;group=[% current_group.get_groupname %]">[% 'ML' | i18n | html %]</a>
<ul>
- <li><a href="?do=mailinglistindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=mailinglistcreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=mailinglistindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=mailinglistcreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
- [% IF panel_header.available_services.cron %]<li><a href="?do=cronindex&group=[% current_group.get_groupname %]">[% 'Crons' | i18n | html %]</a>
+ [% IF panel_header.available_services.cron %]<li><a href="?do=cronindex;group=[% current_group.get_groupname %]">[% 'Crons' | i18n | html %]</a>
<ul>
- <li><a href="?do=cronindex&group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
- <li><a href="?do=croncreate&group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
+ <li><a href="?do=cronindex;group=[% current_group.get_groupname %]">[% 'List' | i18n | html %]</a></li>
+ <li><a href="?do=croncreate;group=[% current_group.get_groupname %]">[% 'Create' | i18n | html %]</a></li>
</ul>
</li>[% END %]
</ul>
Modified: trunk/vhffs-panel/templates/misc/header.tt
===================================================================
--- trunk/vhffs-panel/templates/misc/header.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/misc/header.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -4,9 +4,9 @@
</div>
<!-- Flag navigations -->
<div class="navflag">
- <a href="?[% query_string %]&lang=en_US"><img src="/themes/light-grey/img/en_US.png" alt="en_US"/></a>
- <a href="?[% query_string %]&lang=fr_FR"><img src="/themes/light-grey/img/fr_FR.png" alt="fr_FR"/></a>
- <a href="?[% query_string %]&lang=es_ES"><img src="/themes/light-grey/img/es_ES.png" alt="es_ES"/></a>
+ <a href="?[% query_string %];lang=en_US"><img src="/themes/light-grey/img/en_US.png" alt="en_US"/></a>
+ <a href="?[% query_string %];lang=fr_FR"><img src="/themes/light-grey/img/fr_FR.png" alt="fr_FR"/></a>
+ <a href="?[% query_string %];lang=es_ES"><img src="/themes/light-grey/img/es_ES.png" alt="es_ES"/></a>
</div>
<!-- Navigation Level 1 -->
Modified: trunk/vhffs-panel/templates/misc/languages.tt
===================================================================
--- trunk/vhffs-panel/templates/misc/languages.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/misc/languages.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -1,5 +1,5 @@
<div class="navflag">
[% FOREACH l IN languages %]
- <a href="?do=login&lang=[% l | html %]"><img src="/themes/[% theme %]/img/[% l | html %].png" alt="[% l %]"/></a>
+ <a href="?do=login;lang=[% l | html %]"><img src="/themes/[% theme %]/img/[% l | html %].png" alt="[% l %]"/></a>
[% END %]
</div>
Modified: trunk/vhffs-panel/templates/misc/service-index.tt
===================================================================
--- trunk/vhffs-panel/templates/misc/service-index.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/misc/service-index.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -5,21 +5,21 @@
[% FOREACH s IN list %]
<li>[% s.displayname | html %]
[% IF s.active %]
- — <a href="?do=[% type %]prefs&name=[% s.displayname | html %]">[% 'Go to administration' | i18n | html %]</a>
+ — <a href="?do=[% type %]prefs;name=[% s.displayname | html %]">[% 'Go to administration' | i18n | html %]</a>
[% ELSE %]
([% s.state | html %])
[% IF s.refused %]
- — <a href="?do=objectresubmit&oid=[% s.oid %]">[% 'Propose a new description' | i18n | html %]</a>
- — <a href="?do=objectcancel&oid=[% s.oid %]">[% 'Cancel request' | i18n | html %]</a>
+ — <a href="?do=objectresubmit;oid=[% s.oid %]">[% 'Propose a new description' | i18n | html %]</a>
+ — <a href="?do=objectcancel;oid=[% s.oid %]">[% 'Cancel request' | i18n | html %]</a>
[% END %]
[% END %]
- — <a href="?do=objecthistory&oid=[% s.oid %]">[% 'History' | i18n | html %]</a>
+ — <a href="?do=objecthistory;oid=[% s.oid %]">[% 'History' | i18n | html %]</a>
</li>
[% END # s IN list %]
[% ELSE %]
<li>[% 'None' | i18n | html %]</li>
[% END # list.size() %]
- <li><a href="?do=[% type %]create&group=[% group.get_groupname | html %]">[% 'New' | i18n | html %]</a></li>
+ <li><a href="?do=[% type %]create;group=[% group.get_groupname | html %]">[% 'New' | i18n | html %]</a></li>
[% IF help_url %]
<li><a href="[% help_url | html %]"> [% 'Help' | i18n | html %]</a></li>
[% END %]
Modified: trunk/vhffs-panel/templates/misc/welcome.tt
===================================================================
--- trunk/vhffs-panel/templates/misc/welcome.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/misc/welcome.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -4,7 +4,7 @@
<h2>[% 'The following projects have reached or are going to reach the disk quota limit, please take a look !' | i18n | html %]</h2>
<ul>
[% FOR g IN overquota %]
- <li><a href="?do=groupview&group=[% g %]">[% g %]</a></li>
+ <li><a href="?do=groupview;group=[% g %]">[% g %]</a></li>
[% END %]
</ul>
</div>
Modified: trunk/vhffs-panel/templates/user/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/user/prefs.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-panel/templates/user/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -142,9 +142,9 @@
[% IF use_avatars %]
<h2>[% 'Send my avatar' | i18n | html %]</h2>
- <form class="table-like" method="post" action="?do=avatarput&oid=[% user.get_oid %]" enctype="multipart/form-data" accept-charset="utf-8">
+ <form class="table-like" method="post" action="?do=avatarput;oid=[% user.get_oid %]" enctype="multipart/form-data" accept-charset="utf-8">
<h3>[% 'Current avatar' | i18n | html %]</h3>
- <img alt="[% 'User\'s avatar' | i18n | html %]" src="?do=avatarget&oid=[% user.get_oid %]"/>
+ <img alt="[% 'User\'s avatar' | i18n | html %]" src="?do=avatarget;oid=[% user.get_oid %]"/>
<p>[% 'The avatar is a PNG image that will appear next to your username in the public section.' | i18n | html %]
</p>
<input type="hidden" name="oid" value="[% user.get_oid %]"/>
Modified: trunk/vhffs-public/templates/common/pager.tt
===================================================================
--- trunk/vhffs-public/templates/common/pager.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-public/templates/common/pager.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -2,10 +2,10 @@
[% IF (pager.size) %]
<div class="pager">
[% IF (pager.current_page != 1) %]
-<a class="first-page ajax" href="[% pager.url %]?[% pager.query_string %]&page=1"><<</a>
-<a class="previous-page ajax" href="[% pager.url %]?[% pager.query_string %]&page=[% pager.current_page - 1 %]"><</a>
+<a class="first-page ajax" href="[% pager.url %]?[% pager.query_string %];page=1"><<</a>
+<a class="previous-page ajax" href="[% pager.url %]?[% pager.query_string %];page=[% pager.current_page - 1 %]"><</a>
[% FOR p IN pager.previous_pages %]
-<a class="previous-page-number ajax" href="[% pager.url %]?[% pager.query_string %]&page=[% p %]">[% p %]</a>
+<a class="previous-page-number ajax" href="[% pager.url %]?[% pager.query_string %];page=[% p %]">[% p %]</a>
[% END %]
[% ELSE %]
<span class="first-page-disabled"><<</span>
@@ -14,10 +14,10 @@
<span class="current-page">[% pager.current_page %]</span>
[% IF (pager.current_page != pager.last_page) %]
[% FOR p IN pager.next_pages %]
-<a class="next-page-number ajax" href="[% pager.url %]?[% pager.query_string %]&page=[% p %]">[% p %]</a>
+<a class="next-page-number ajax" href="[% pager.url %]?[% pager.query_string %];page=[% p %]">[% p %]</a>
[% END %]
-<a class="next-page ajax" href="[% pager.url %]?[% pager.query_string %]&page=[% pager.current_page + 1 %]">></a>
-<a class="last-page ajax" href="[% pager.url %]?[% pager.query_string %]&page=[% pager.last_page %]">>></a>
+<a class="next-page ajax" href="[% pager.url %]?[% pager.query_string %];page=[% pager.current_page + 1 %]">></a>
+<a class="last-page ajax" href="[% pager.url %]?[% pager.query_string %];page=[% pager.last_page %]">>></a>
[% ELSE %]
<span class="next-page-disabled">></span>
<span class="last-page-disabled">>></span>
Modified: trunk/vhffs-public/templates/content/all-groups.tt
===================================================================
--- trunk/vhffs-public/templates/content/all-groups.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-public/templates/content/all-groups.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -3,10 +3,10 @@
[% INCLUDE common/pager.tt pager=pager%]
<div class="pages-tabs">
-[<a href="?do=allgroups&letter=all" class="ajax">[% 'All' | i18n%]</a>]
+[<a href="?do=allgroups;letter=all" class="ajax">[% 'All' | i18n%]</a>]
[% title_str = '%s (%d groups)' | i18n %]
[% FOREACH l = letters %]
-[<a class="ajax" href="?do=allgroups&letter=[% l.letter %]" title="[% title_str | pretty_print(l.letter, l.count) %]">[% l.letter %]</a>]
+[<a class="ajax" href="?do=allgroups;letter=[% l.letter %]" title="[% title_str | pretty_print(l.letter, l.count) %]">[% l.letter %]</a>]
[% END %]
</div>
Modified: trunk/vhffs-public/templates/content/group-details.tt
===================================================================
--- trunk/vhffs-public/templates/content/group-details.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-public/templates/content/group-details.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -3,13 +3,13 @@
<h1 class="groupname">[% group.realname | html | format(title_str) %]</h1>
<h2>[% 'General information' | i18n %]</h2>
[% IF groups_avatar %]
-<img class="group-avatar" src="?do=avatar&oid=[% group.object_id %]"/>
+<img class="group-avatar" src="?do=avatar;oid=[% group.object_id %]"/>
[% END %]
<ul>
<li>[% 'Groupname' | i18n %]: [% group.groupname | html %]</li>
<li>[% 'Users' | i18n %]:
[% FOREACH u = group.get_users() %]
-<a href="?do=user&name=[% u.username %]" class="ajax">[% u.username %]</a>[% UNLESS loop.last() %], [% END %]
+<a href="?do=user;name=[% u.username %]" class="ajax">[% u.username %]</a>[% UNLESS loop.last() %], [% END %]
[% END %]
</li>
@@ -22,7 +22,7 @@
[% FOREACH cat = tag_categories %]
<li>[% cat.label %]:
[% FOREACH t = cat.tags %]
- <a class="ajax" href="?do=tags&search=[% cat.label | uri %]::[% t.label | uri %]">[% t.label %]</a>[% ',' UNLESS loop.last %]
+ <a class="ajax" href="?do=tags;search=[% cat.label | uri %]::[% t.label | uri %]">[% t.label %]</a>[% ',' UNLESS loop.last %]
[% END %]
</li>
[% END %]
Modified: trunk/vhffs-public/templates/content/groupsearch-form.tt
===================================================================
--- trunk/vhffs-public/templates/content/groupsearch-form.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-public/templates/content/groupsearch-form.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -4,14 +4,14 @@
<p>[% 'Matches' | i18n %]:
<span id="searchTagInclude">
[% FOREACH t = included_tags %]
-<span>[% t.tag_label %] <a href="?[% query_string %]&discard_inc=[% t.tag_id %]">X</a></span>
+<span>[% t.tag_label %] <a href="?[% query_string %];discard_inc=[% t.tag_id %]">X</a></span>
<input type="hidden" name="included_tags" id="included_tags[% t.tag_id %]" value="[% t.tag_id %]"/>
[% END %]
</span></p>
<p>[% "Doesn't matches" | i18n %]:
<span id="searchTagExclude">
[% FOREACH t = excluded_tags %]
-<span>[% t.tag_label %] <a href="?[% query_string %]&discard_ex=[% t.tag_id %]">X</a></span>
+<span>[% t.tag_label %] <a href="?[% query_string %];discard_ex=[% t.tag_id %]">X</a></span>
<input type="hidden" name="excluded_tags" id="excluded_tags[% t.tag_id %]" value="[% t.tag_id %]"/>
[% END %]
</span></p>
@@ -26,7 +26,7 @@
<li><span class="category">[% c %]: </span>
[% END %]
<span id="tag[% t.tag_id %]">
- <span class="label">[% t.tag_label %]</span> <a class="include" href="?[% query_string %]&included_tags=[% t.tag_id %]">+</a>/<a class="exclude" href="?[% query_string %]&excluded_tags=[% t.tag_id %]">-</a>
+ <span class="label">[% t.tag_label %]</span> <a class="include" href="?[% query_string %];included_tags=[% t.tag_id %]">+</a>/<a class="exclude" href="?[% query_string %];excluded_tags=[% t.tag_id %]">-</a>
</span>
[% END %]
</li>
Modified: trunk/vhffs-public/templates/parts/group-general.tt
===================================================================
--- trunk/vhffs-public/templates/parts/group-general.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-public/templates/parts/group-general.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -1,16 +1,16 @@
<h2 class="groupname">[% g.realname | html%]</h2>
<div class="group-info">
[% IF groups_avatar %]
-<img class="group-avatar" src="?do=avatar&oid=[% g.object_id %]" alt="[% g.groupname %]"/>
+<img class="group-avatar" src="?do=avatar;oid=[% g.object_id %]" alt="[% g.groupname %]"/>
[% END %]
-<p><a href="?do=group&name=[% g.groupname %]" class="groupname ajax">[% g.groupname %]</a> (<span class="owner">[% g.owner_name %]</span>)</p>
+<p><a href="?do=group;name=[% g.groupname %]" class="groupname ajax">[% g.groupname %]</a> (<span class="owner">[% g.owner_name %]</span>)</p>
<div class="description">
[% g.description | html | html_para %]
</div>
<div class="tags">
[% FOREACH t = g.tags %]
- <a href="?do=tags&search=[% t.category_label | uri %]::[% t.tag_label | uri %]" class="ajax">[% t.category_label | html %]::[% t.tag_label | html %]</a>[% ', ' UNLESS loop.last() %]
+ <a href="?do=tags;search=[% t.category_label | uri %]::[% t.tag_label | uri %]" class="ajax">[% t.category_label | html %]::[% t.tag_label | html %]</a>[% ', ' UNLESS loop.last() %]
[% END %]
</div>
-<p class="more-group"><a href="?do=group&name=[% g.groupname %]" class="ajax">[% 'More info...' | i18n %]</a></p>
+<p class="more-group"><a href="?do=group;name=[% g.groupname %]" class="ajax">[% 'More info...' | i18n %]</a></p>
</div>
Modified: trunk/vhffs-public/templates/parts/tags-cloud.tt
===================================================================
--- trunk/vhffs-public/templates/parts/tags-cloud.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-public/templates/parts/tags-cloud.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -2,7 +2,7 @@
<div class="menu tags-menu">
<p>
[% FOREACH t = popular_tags %]
- <a href="?do=tags&search=[% t.category_label | uri %]::[% t.tag_label | uri %]" class="tag[%t.weight%] ajax">
+ <a href="?do=tags;search=[% t.category_label | uri %]::[% t.tag_label | uri %]" class="tag[%t.weight%] ajax">
[<span title="[% t.category_description | html %]">[% t.category_label | html %]</span>::<span title="[% t.tag_description | html %]">[% t.tag_label | html %]</span>]
</a>
[% END %]
@@ -14,7 +14,7 @@
<div class="menu tags-menu">
<p>
[% FOREACH t = random_tags %]
- <a href="?do=tags&search=[% t.category_label | uri %]::[% t.tag_label %]" class="tag[%t.weight%] ajax">
+ <a href="?do=tags;search=[% t.category_label | uri %]::[% t.tag_label %]" class="tag[%t.weight%] ajax">
[<span title="[% t.category_description | html %]">[% t.category_label | html %]</span>::<span title="[% t.tag_description | html %]">[% t.tag_label | html %]</span>]
</a>
[% END %]
Modified: trunk/vhffs-public/templates/parts/user-general.tt
===================================================================
--- trunk/vhffs-public/templates/parts/user-general.tt 2012-01-26 20:34:51 UTC (rev 1952)
+++ trunk/vhffs-public/templates/parts/user-general.tt 2012-01-26 21:22:08 UTC (rev 1953)
@@ -1,14 +1,14 @@
<h2 class="username">[% u.username | html%]</h2>
<div class="user-info">
[% IF users_avatar %]
-<img class="user-avatar" src="?do=avatar&oid=[% u.object_id %]"/>
+<img class="user-avatar" src="?do=avatar;oid=[% u.object_id %]"/>
[% END %]
<ul>
<li>[% 'First name' | i18n %]: [% u.firstname | html %]</li>
<li>[% 'Last name' | i18n %]: [% u.lastname | html %]</li>
<li>[% 'Groups' | i18n %]:
[% FOREACH ug = u.groups %]
-<a href="?do=group&name=[% ug | html %]" class="ajax">[% ug | html %]</a>[% ', ' UNLESS loop.last() %]
+<a href="?do=group;name=[% ug | html %]" class="ajax">[% ug | html %]</a>[% ', ' UNLESS loop.last() %]
[% END %]
</li>
</ul>