[vhffs-dev] [1954] changed text/html to application/ xhtml+xml if current browser support it, fixed most XHTML issues in templates |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
- To: vhffs-dev@xxxxxxxxx
- Subject: [vhffs-dev] [1954] changed text/html to application/ xhtml+xml if current browser support it, fixed most XHTML issues in templates
- From: subversion@xxxxxxxxxxxxx
- Date: Fri, 27 Jan 2012 00:24:15 +0100
Revision: 1954
Author: gradator
Date: 2012-01-27 00:24:14 +0100 (Fri, 27 Jan 2012)
Log Message:
-----------
changed text/html to application/xhtml+xml if current browser support it, fixed most XHTML issues in templates
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Panel/Main.pm
trunk/vhffs-panel/templates/acl/view.tt
trunk/vhffs-panel/templates/admin/tag/request/details.tt
trunk/vhffs-panel/templates/dns/prefs.tt
trunk/vhffs-panel/templates/group/create.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/layouts/anonymous.tt
trunk/vhffs-panel/templates/layouts/panel.tt
trunk/vhffs-panel/templates/mail/prefs.tt
trunk/vhffs-panel/templates/mailinglist/prefs.tt
trunk/vhffs-panel/templates/menu/admin.tt
trunk/vhffs-panel/templates/menu/group.tt
trunk/vhffs-panel/templates/misc/history.tt
trunk/vhffs-panel/templates/misc/infos.tt
trunk/vhffs-panel/templates/misc/service-index.tt
trunk/vhffs-panel/templates/repository/prefs.tt
trunk/vhffs-public/templates/common/pager.tt
trunk/vhffs-public/templates/content/all-groups.tt
trunk/vhffs-public/templates/content/groupsearch-form.tt
trunk/vhffs-public/templates/layouts/public.tt
Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2012-01-26 23:24:14 UTC (rev 1954)
@@ -513,7 +513,8 @@
my $template = new Template($create_vars);
- print $cgi->header( -cookie=>[ @{$self->{cookies}} ], -type=>'text/html', -charset=>'utf-8' );
+ my $http_accept = ( $cgi->http('HTTP_ACCEPT') or '' );
+ print $cgi->header( -cookie=>[ @{$self->{cookies}} ], -type=>( $http_accept =~ /application\/xhtml\+xml/ ? 'application/xhtml+xml' : 'text/html' ), -charset=>'utf-8' );
my $data;
unless( $template->process($file, $vars, \$data) ) {
@@ -521,6 +522,10 @@
return;
}
# FCGI does not handle UTF9
+ open ( my $tmpfile , '>', '/tmp/output' );
+ print $tmpfile Encode::encode_utf8( $data );
+ close ( $tmpfile );
+
print Encode::encode_utf8( $data );
}
Modified: trunk/vhffs-panel/templates/acl/view.tt
===================================================================
--- trunk/vhffs-panel/templates/acl/view.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/acl/view.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -47,6 +47,6 @@
</p>
</form>
[% END %]
-<span class="clear"> </span>
+<span class="clear"> </span>
</div>
</div>
Modified: trunk/vhffs-panel/templates/admin/tag/request/details.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/tag/request/details.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/admin/tag/request/details.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -32,7 +32,7 @@
</div>
<div style="clear:both"></div>
<p class="button">
- <input type="submit" name="accept_request_submit" value="[% 'Accept' | i18n | html %]"/>
+ <input type="submit" name="accept_request_submit" value="[% 'Accept' | i18n | html %]"/> 
<input type="submit" name="discard_request_submit" value="[% 'Refuse' | i18n | html %]"/>
</p>
<input type="hidden" name="request_id" value="[% request.request_id %]"/>
Modified: trunk/vhffs-panel/templates/dns/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/dns/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/dns/prefs.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -10,7 +10,7 @@
[% FOREACH a IN sorted_a %]
<form class="table-like" method="post" action="#" accept-charset="utf-8">
<p>
- <label for="data_[% a.id %]">[% (a.name == '@' ? dns.get_domain : a.name) | html %]-></label>
+ <label for="data_[% a.id %]">[% (a.name == '@' ? dns.get_domain : a.name) | html %]-></label>
<input type="text" name="data" id="data_[% a.id %]" value="[% a.data | html %]" />
<input type="hidden" name="name" value="[% dns.get_domain | html %]" />
<input type="hidden" name="rr_id" value="[% a.id %]" />
@@ -59,7 +59,7 @@
[% FOREACH aaaa IN sorted_aaaa %]
<form class="table-like" method="post" action="#" accept-charset="utf-8">
<p>
- <label for="data_[% aaaa.id %]">[% (aaaa.name == '@' ? dns.get_domain : aaaa.name) | html %]-></label>
+ <label for="data_[% aaaa.id %]">[% (aaaa.name == '@' ? dns.get_domain : aaaa.name) | html %]-></label>
<input type="text" name="data" id="data_[% aaaa.id %]" value="[% aaaa.data | html %]" />
<input type="hidden" name="name" value="[% dns.get_domain | html %]"/>
<input type="hidden" name="rr_id" value="[% aaaa.id %]"/>
@@ -107,7 +107,7 @@
[% FOREACH mx IN sorted_mx %]
<form class="table-like" method="post" action="#" accept-charset="utf-8">
<p><label for="data_[% mx.id %]">
- [% (mx.name == '@' ? dns.get_domain : mx.name) | html %] ([% 'Priority:' | i18n | html %] [% mx.aux | html %])->
+ [% (mx.name == '@' ? dns.get_domain : mx.name) | html %] ([% 'Priority:' | i18n | html %] [% mx.aux | html %])->
</label>
<input type="text" name="data" id="data_[% mx.id %]" value="[% mx.data | html %]" />
<input type="hidden" name="name" value="[% dns.get_domain | html %]" />
@@ -152,7 +152,7 @@
[% FOREACH cname IN sorted_cname %]
<form class="table-like" method="post" action="#" accept-charset="utf-8">
<p>
- <label for="data_[% cname.id %]">[% (cname.name == '@' ? dns.get_domain : cname.name) | html %]-></label>
+ <label for="data_[% cname.id %]">[% (cname.name == '@' ? dns.get_domain : cname.name) | html %]-></label>
<input type="text" name="data" id="data_[% cname.id %]"value="[% cname.data | html %]" />
<input type="hidden" name="action" value="manage_cname" />
<input type="hidden" name="rr_id" value="[% cname.id %]"/>
@@ -192,7 +192,7 @@
[% FOREACH ns IN sorted_ns %]
<form class="table-like" method="post" action="#" accept-charset="utf-8">
<p>
- <label>[% (ns.name == '@' ? dns.get_domain : ns.name) | html %] -> [% ns.data | html %]</label>
+ <label>[% (ns.name == '@' ? dns.get_domain : ns.name) | html %] -> [% ns.data | html %]</label>
<input type="hidden" name="action" value="manage_ns" />
<input type="hidden" name="rr_id" value="[% ns.id %]" />
<input type="hidden" name="name" value="[% dns.domain | html %]" />
@@ -222,7 +222,7 @@
[% FOREACH srv IN sorted_srv %]
<form class="table-like" method="post" action="#" accept-charset="utf-8">
<p>
- <label>[% srv.name | html %] -></label>
+ <label>[% srv.name | html %] -></label>
<input type="text" name="host" id="host_[% srv.id %]" value="[% srv.host | html %]" title="[% 'Host' | i18n | html %]"/>
<input type="text" name="port" id="port_[% srv.id %]" value="[% srv.port %]" maxlength="5" size="5" style="width:auto" title="[% 'Port' | i18n | html %]"/>
<input type="text" name="aux" id="aux_[% srv.id %]" value="[% srv.aux %]" maxlength="5" size="5" style="width:auto" title="[% 'Priority' | i18n | html %]"/>
Modified: trunk/vhffs-panel/templates/group/create.tt
===================================================================
--- trunk/vhffs-panel/templates/group/create.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/group/create.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -30,7 +30,7 @@
[% FOREACH c IN tag_categories %]
<li>[% c.label %]:
[% FOREACH t IN c.tags %]
- <input type="checkbox" name="tags" value="[% t.tag_id %]" id="tag_[% t.tag_id %]"/> <label class="checkbox" for="tag_[% t.tag_id %]">[% t.label | html %]</label>[% ', ' UNLESS loop.last() %]
+ <input type="checkbox" name="tags" value="[% t.tag_id %]" id="tag_[% t.tag_id %]"/> <label class="checkbox" for="tag_[% t.tag_id %]">[% t.label | html %]</label>[% ', ' UNLESS loop.last() %]
[% END %]
[% loop.last() ? '.' : ';' %]
</li>
Modified: trunk/vhffs-panel/templates/group/index.tt
===================================================================
--- trunk/vhffs-panel/templates/group/index.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/group/index.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -6,7 +6,7 @@
[% IF p.active %]
<li><a href="?do=groupview;group=[% p.groupname | html %]">[% p.groupname | html %]</a></li>
[% ELSE %]
- <li>[% p.groupname | html %] — [% p.state | html %]
+ <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>
@@ -25,7 +25,7 @@
[% IF p.active %]
<li><a href="?do=groupview;group=[% p.groupname | html %]">[% p.groupname | html %]</a></li>
[% ELSE %]
- <li>[% p.groupname | html %] — [% p.state | html %]
+ <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>
Modified: trunk/vhffs-panel/templates/group/info.tt
===================================================================
--- trunk/vhffs-panel/templates/group/info.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/group/info.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -3,7 +3,7 @@
<fieldset>
<legend>[% 'General' | i18n | html %]</legend>
<ul class="generalList">
- <li>[% 'Quota (used/total): %d/%dMB' | i18n | pretty_print(group.get_quota_used, group.get_quota) | html %] —
+ <li>[% 'Quota (used/total): %d/%dMB' | i18n | pretty_print(group.get_quota_used, group.get_quota) | html %] —
<span class="quota">
<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>
Modified: trunk/vhffs-panel/templates/group/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/group/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/group/prefs.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -46,14 +46,14 @@
<input type="submit" value="[% 'Remove' | i18n | html %]" name="remove_user_submit"/></p>
</form>
[% ELSE %]
-<p>[% u.username | html %] ([% u.firstname | html %] [% u.lastname | html %]) — [% u.state %]</p>
+<p>[% u.username | html %] ([% u.firstname | html %] [% u.lastname | html %]) — [% u.state %]</p>
[% END # u.active %]
[% END # u IN group_users %]
[% IF current_user.is_admin() %]
<p>
[% FOREACH u IN group_users %]
-[% u.firstname | html %] [% u.lastname | html %] <[% u.mail | html %]>[% ', ' UNLESS loop.last() %]
+[% u.firstname | html %] [% u.lastname | html %] <[% u.mail | html %]>[% ', ' UNLESS loop.last() %]
[% END %]
</p>
[% END # current_user.is_admin() %]
@@ -111,9 +111,9 @@
object = group %]
<h2>[% 'Group quota' | i18n | html %]</h2>
<form class="table-like" method="post" action="#">
- <p><label>[% 'Space used:' | i18n | html %]</label>[% group.get_quota_used %]/[% group.get_quota %] [% 'MB' | i18n | html %]</p>
+ <p><label>[% 'Space used:' | i18n | html %]</label>[% group.get_quota_used %]/[% group.get_quota %] [% 'MB' | i18n | html %]</p>
<p><label for="new_quota">[% 'New quota:' | i18n | html %]</label>
- <input type="text" name="new_quota" id="new_quota" value="[% group.get_quota %]"/> [% 'MB' | i18n | html %]</p>
+ <input type="text" name="new_quota" id="new_quota" value="[% group.get_quota %]"/> [% 'MB' | i18n | html %]</p>
<input type="hidden" name="group" value="[% group.get_groupname | html %]"/>
<p><input type="submit" name="update_quota_submit" value="[% 'Update quota' | i18n | html %]"/></p>
</form>
Modified: trunk/vhffs-panel/templates/group/tags.tt
===================================================================
--- trunk/vhffs-panel/templates/group/tags.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/group/tags.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -8,6 +8,7 @@
<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() %]
+</li>
[% END # c IN current_tag_categories%]
</ul>
[% END %]
Modified: trunk/vhffs-panel/templates/layouts/anonymous.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/anonymous.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/layouts/anonymous.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -4,7 +4,7 @@
<title>[% title | html %]</title>
<link rel="stylesheet" type="text/css" href="/js/dijit/themes/tundra/tundra.css"/>
<link rel="stylesheet" type="text/css" href="/themes/[% theme %]/main.css"/>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-type" content="application/xhtml+xml; charset=utf-8"/>
<script language="javascript" type="text/javascript" charset="utf-8" src="/js/dojo/dojo.js"></script>
</head>
<body class="tundra">
Modified: trunk/vhffs-panel/templates/layouts/panel.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/panel.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/layouts/panel.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -3,7 +3,7 @@
<head>
<title>[% title | html %]</title>
<link rel="stylesheet" type="text/css" href="/themes/[% theme %]/main.css"/>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-type" content="application/xhtml+xml; charset=utf-8"/>
<script language="javascript" type="text/javascript" charset="utf-8" src="/js/prototype.js"></script>
<script language="javascript" type="text/javascript" charset="utf-8" src="/js/commons.js"></script>
<script language="javascript" type="text/javascript" charset="utf-8" src="/js/tooltip.js"></script>
Modified: trunk/vhffs-panel/templates/mail/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/mail/prefs.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -41,15 +41,15 @@
<p>[% 'New password:' | i18n | html %]<input type="password" name="box_password" value="" autocomplete="off"/></p>
[% IF nospam %]
<p>[% 'Enable antispam?' | i18n | html %]
- <input type="radio" name="use_antispam"[% ' checked="checked"' IF b.nospam %] value="yes"/> [% 'Yes' | i18n | html %]
- <input type="radio" name="use_antispam"[% ' checked="checked"' UNLESS b.nospam %] value="no"/> [% 'No' | i18n | html %]</p>
+ <input type="radio" name="use_antispam"[% ' checked="checked"' IF b.nospam %] value="yes"/> [% 'Yes' | i18n | html %]
+ <input type="radio" name="use_antispam"[% ' checked="checked"' UNLESS b.nospam %] value="no"/> [% 'No' | i18n | html %]</p>
[% END %]
[% IF novirus %]
<p>[% 'Enable antivirus?' | i18n | html %]
- <input type="radio" name="use_antivirus"[% ' checked="checked"' IF b.novirus %] value="yes"/> [% 'Yes' | i18n | html %]
- <input type="radio" name="use_antivirus"[% ' checked="checked"' UNLESS b.novirus %] value="no"/> [% 'No' | i18n | html %]</p>
+ <input type="radio" name="use_antivirus"[% ' checked="checked"' IF b.novirus %] value="yes"/> [% 'Yes' | i18n | html %]
+ <input type="radio" name="use_antivirus"[% ' checked="checked"' UNLESS b.novirus %] value="no"/> [% 'No' | i18n | html %]</p>
[% END %]
- <p><input type="submit" name="update_box_submit" value="[% 'Update' | i18n | html %]"/> <input type="submit" name="delete_box_submit" value="[% 'Delete this mail account' | i18n | html %]"/></p>
+ <p><input type="submit" name="update_box_submit" value="[% 'Update' | i18n | html %]"/> <input type="submit" name="delete_box_submit" value="[% 'Delete this mail account' | i18n | html %]"/></p>
<input type="hidden" name="localpart" value="[% b.local_part | html %]" />
<input type="hidden" name="name" value="[% b.domain | html %]" />
</form>
@@ -87,7 +87,7 @@
<p>
<input type="text" name="forward" value="[% f.remote_name | html %]" /></p>
<p><input type="submit" value="[% 'Update forward' | i18n | html %]"
- name="update_forward_submit"/> <input type="submit"
+ name="update_forward_submit"/> <input type="submit"
value="[% 'Delete forward' | i18n | html %]"
name="delete_forward_submit"/></p>
<input type="hidden" name="localpart" value="[% f.local_part | html %]" />
Modified: trunk/vhffs-panel/templates/mailinglist/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/mailinglist/prefs.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -2,7 +2,7 @@
<fieldset>
<legend>[% 'Options' | i18n | html %]</legend>
<p>[% 'Prefix on subject:' | i18n | html %]
- <input type="text" size=20 name="prefix" value="[% list.get_prefix %]"/>
+ <input type="text" size="20" name="prefix" value="[% list.get_prefix %]"/>
</p>
<p>[% 'Subscribe control:' | i18n | html %]
<select name="subscribe_control" id="SUBSCRIBE_CONTROL">
@@ -51,8 +51,7 @@
<p><textarea name="signature" rows="7" cols="50">[% list.get_signature | html %]</textarea></p>
<input type="hidden" name="domain" value="[% list.get_domain | html %]" />
<input type="hidden" name="local" value="[% list.get_localpart | html %]" />
- <input type="submit" name="options_submit" value="[% 'Save options' | i18n | html %]"/>
- </p>
+ <p><input type="submit" name="options_submit" value="[% 'Save options' | i18n | html %]"/></p>
</fieldset>
</form>
Modified: trunk/vhffs-panel/templates/menu/admin.tt
===================================================================
--- trunk/vhffs-panel/templates/menu/admin.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/menu/admin.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -2,18 +2,18 @@
<li><a href="?do=admin">[% 'General' | i18n | html %]</a></li>
<li><a href="?do=adminuserindex">[% 'Users' | i18n | html %]</a></li>
<li><a href="?do=admingroupindex">[% 'Groups' | i18n | html %]</a></li>
-[% IF panel_header.available_services.web %]<li><a/ href="?do=adminwebindex">[% 'Web' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.mysql %]<li><a/ href="?do=adminmysqlindex">[% 'MySQL' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.pgsql %]<li><a/ href="?do=adminpgsqlindex">[% 'PgSQL' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.cvs %]<li><a/ href="?do=admincvsindex">[% 'CVS' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.svn %]<li><a/ href="?do=adminsvnindex">[% 'SVN' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.git %]<li><a/ href="?do=admingitindex">[% 'Git' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.mercurial %]<li><a/ href="?do=adminmercurialindex">[% 'Mercurial' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.bazaar %]<li><a/ href="?do=adminbazaarindex">[% 'Bazaar' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.dns %]<li><a/ href="?do=admindnsindex">[% 'DNS' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.repository %]<li><a/ href="?do=adminrepositoryindex">[% 'Dl repos' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.mail %]<li><a/ href="?do=adminmailindex">[% 'Mail' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.mailinglist %]<li><a/ href="?do=adminmailinglistindex">[% 'ML' | i18n | html %]</a></li>[% END %]
-[% IF panel_header.available_services.cron %]<li><a/ href="?do=admincronindex">[% 'Crons' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.web %]<li><a href="?do=adminwebindex">[% 'Web' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.mysql %]<li><a href="?do=adminmysqlindex">[% 'MySQL' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.pgsql %]<li><a href="?do=adminpgsqlindex">[% 'PgSQL' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.cvs %]<li><a href="?do=admincvsindex">[% 'CVS' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.svn %]<li><a href="?do=adminsvnindex">[% 'SVN' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.git %]<li><a href="?do=admingitindex">[% 'Git' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.mercurial %]<li><a href="?do=adminmercurialindex">[% 'Mercurial' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.bazaar %]<li><a href="?do=adminbazaarindex">[% 'Bazaar' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.dns %]<li><a href="?do=admindnsindex">[% 'DNS' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.repository %]<li><a href="?do=adminrepositoryindex">[% 'Dl repos' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.mail %]<li><a href="?do=adminmailindex">[% 'Mail' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.mailinglist %]<li><a href="?do=adminmailinglistindex">[% 'ML' | i18n | html %]</a></li>[% END %]
+[% IF panel_header.available_services.cron %]<li><a href="?do=admincronindex">[% 'Crons' | i18n | html %]</a></li>[% END %]
<li><a href="?do=admintagindex">[% 'Tags' | i18n | html %]</a></li>
</ul>
Modified: trunk/vhffs-panel/templates/menu/group.tt
===================================================================
--- trunk/vhffs-panel/templates/menu/group.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/menu/group.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -87,3 +87,4 @@
</li>[% END %]
</ul>
</li>
+</ul>
Modified: trunk/vhffs-panel/templates/misc/history.tt
===================================================================
--- trunk/vhffs-panel/templates/misc/history.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/misc/history.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -7,7 +7,7 @@
[% IF history.0.object.defined() %]<th>[% 'Object type' | i18n %]</th>
<th>[% 'Object label' | i18n %]</th>[% END %]
<th>[% 'Event' | i18n | html %]</th>
- [% IF current_user.is_moderator() || current_user.is_admin() %]<th>[% 'Source' | i18n | html %]</td>[% END %]
+ [% IF current_user.is_moderator() || current_user.is_admin() %]<th>[% 'Source' | i18n | html %]</th>[% END %]
</tr>
</thead>
<tbody>
Modified: trunk/vhffs-panel/templates/misc/infos.tt
===================================================================
--- trunk/vhffs-panel/templates/misc/infos.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/misc/infos.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -3,6 +3,5 @@
[% FOREACH i IN infos %]
<p class="info">[% i.msg | html %]</p>
[% END %]
-</TMPL_LOOP>
</div>
[% END %]
Modified: trunk/vhffs-panel/templates/misc/service-index.tt
===================================================================
--- trunk/vhffs-panel/templates/misc/service-index.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/misc/service-index.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -5,15 +5,15 @@
[% 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 %]
Modified: trunk/vhffs-panel/templates/repository/prefs.tt
===================================================================
--- trunk/vhffs-panel/templates/repository/prefs.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-panel/templates/repository/prefs.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -1,7 +1,7 @@
<h2>[% repository.get_name | html %]</h2>
<div class="info_quota">
- <p>[% 'Quota (used/total): %d/%dMB' | i18n | pretty_print(repository.get_quota_used, repository.get_quota) | html %] —
+ <p>[% 'Quota (used/total): %d/%dMB' | i18n | pretty_print(repository.get_quota_used, repository.get_quota) | html %] —
<span class="quota">
<span class="quota-used" style="width:[% (repository.get_quota_used / repository.get_quota * 100) | format('%d') %]%" title="[% (repository.get_quota_used / repository.get_quota * 100) | format('%.2f') %]%"></span>
</span>
@@ -22,9 +22,9 @@
<h2>[% 'Repository quota' | i18n | html %]</h2>
<form class="table-like" method="post" action="#">
<input type="hidden" name="name" value="[% repository.get_name | html %]"/>
- <p><label>[% 'Space used:' | i18n | html %]</label>[% repository.get_quota_used %]/[% repository.get_quota %] [% 'MB' | i18n | html %]</p>
+ <p><label>[% 'Space used:' | i18n | html %]</label>[% repository.get_quota_used %]/[% repository.get_quota %] [% 'MB' | i18n | html %]</p>
<p><label for="new_quota">[% 'New quota:' | i18n | html %]</label>
- <input type="text" name="new_quota" id="new_quota" value="[% repository.get_quota %]"/> [% 'MB' | i18n | html %]</p>
+ <input type="text" name="new_quota" id="new_quota" value="[% repository.get_quota %]"/> [% 'MB' | i18n | html %]</p>
<p><input type="submit" name="update_quota_submit" value="[% 'Update quota' | i18n | html %]"/></p>
</form>
[% END %]
Modified: trunk/vhffs-public/templates/common/pager.tt
===================================================================
--- trunk/vhffs-public/templates/common/pager.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-public/templates/common/pager.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -2,25 +2,25 @@
[% 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>
[% END %]
[% ELSE %]
-<span class="first-page-disabled"><<</span>
-<span class="previous-page-disabled"><</span>
+<span class="first-page-disabled"><<</span>
+<span class="previous-page-disabled"><</span>
[% END %]
<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>
[% 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>
+<span class="next-page-disabled">></span>
+<span class="last-page-disabled">>></span>
[% END %]
</div>
-[% END %]
\ No newline at end of file
+[% END %]
Modified: trunk/vhffs-public/templates/content/all-groups.tt
===================================================================
--- trunk/vhffs-public/templates/content/all-groups.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-public/templates/content/all-groups.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -6,7 +6,7 @@
[<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/groupsearch-form.tt
===================================================================
--- trunk/vhffs-public/templates/content/groupsearch-form.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-public/templates/content/groupsearch-form.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -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/layouts/public.tt
===================================================================
--- trunk/vhffs-public/templates/layouts/public.tt 2012-01-26 21:22:08 UTC (rev 1953)
+++ trunk/vhffs-public/templates/layouts/public.tt 2012-01-26 23:24:14 UTC (rev 1954)
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
<meta name="author" content="VHFFS Team, based on G. Wolfgang original design" />
<link rel="stylesheet" type="text/css" media="screen,projection" href="/themes/[% theme %]/main.css" />