projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import trimField
[irspy-moved-to-github.git]
/
web
/
htdocs
/
chrome
/
layout.mc
diff --git
a/web/htdocs/chrome/layout.mc
b/web/htdocs/chrome/layout.mc
index
972b9c6
..
60bd39d
100644
(file)
--- a/
web/htdocs/chrome/layout.mc
+++ b/
web/htdocs/chrome/layout.mc
@@
-1,4
+1,3
@@
-%# $Id: layout.mc,v 1.37 2007-07-16 11:55:57 mike Exp $
<%args>
$debug => undef
$title
<%args>
$debug => undef
$title
@@
-8,13
+7,14
@@
$component
use URI::Escape qw(uri_escape uri_escape_utf8);
use ZOOM;
use ZOOM::IRSpy::Web;
use URI::Escape qw(uri_escape uri_escape_utf8);
use ZOOM;
use ZOOM::IRSpy::Web;
-use ZOOM::IRSpy::Utils qw(utf8param isodate xml_encode cql_target cql_quote
+use ZOOM::IRSpy::Utils qw(utf8param trimField isodate xml_encode cql_target cql_quote
irspy_xpath_context irspy_make_identifier
irspy_record2identifier
irspy_identifier2target modify_xml_document
irspy_xpath_context irspy_make_identifier
irspy_record2identifier
irspy_identifier2target modify_xml_document
- bib1_access_point);
+ bib1_access_point calc_reliability_string);
</%once>
% $r->content_type("text/html; charset=utf-8");
</%once>
% $r->content_type("text/html; charset=utf-8");
+% my $text = $m->scomp($component, %ARGS);
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@
-102,20
+102,20
@@
my $id = utf8param($r, "id");
<div class="panel2">
<b>This Target</b>
<br/>
<div class="panel2">
<b>This Target</b>
<br/>
- <a href="<% xml_encode("/full.html?id=" . uri_escape($id)) %>">Show details</a>
+ <a href="<% xml_encode("/full.html?id=" . uri_escape_utf8($id)) %>">Show details</a>
<br/>
<br/>
- <a href="<% xml_encode("/admin/edit.html?op=edit&id=" . uri_escape($id)) %>">Edit details</a>
+ <a href="<% xml_encode("/admin/edit.html?op=edit&id=" . uri_escape_utf8($id)) %>">Edit details</a>
<br/>
<br/>
- <a href="<% xml_encode("/admin/edit.html?op=copy&id=" . uri_escape($id)) %>">Copy target</a>
+ <a href="<% xml_encode("/admin/edit.html?op=copy&id=" . uri_escape_utf8($id)) %>">Copy target</a>
<br/>
<br/>
- <a href="<% xml_encode("/admin/delete.html?id=" . uri_escape($id)) %>">Delete target</a>
+ <a href="<% xml_encode("/admin/delete.html?id=" . uri_escape_utf8($id)) %>">Delete target</a>
<p>
<p>
- <a href="<% xml_encode("/admin/check.html?id=" . uri_escape($id)) . "&test=Quick" %>">Quick Test</a>
+ <a href="<% xml_encode("/admin/check.html?id=" . uri_escape_utf8($id)) . "&test=Quick" %>">Quick Test</a>
<br/>
<br/>
- <a href="<% xml_encode("/admin/check.html?id=" . uri_escape($id)) . "&test=Main" %>">Full Test</a>
+ <a href="<% xml_encode("/admin/check.html?id=" . uri_escape_utf8($id)) . "&test=Main" %>">Full Test</a>
</p>
<p>
</p>
<p>
- <a href="<% xml_encode("/raw.html?id=" . uri_escape($id)) %>">XML</a>
+ <a href="<% xml_encode("/raw.html?id=" . uri_escape_utf8($id)) %>">XML</a>
</p>
<%doc><!-- Maybe this would be too heavyweight -->
<br/>
</p>
<%doc><!-- Maybe this would be too heavyweight -->
<br/>
@@
-144,7
+144,7
@@
my $id = utf8param($r, "id");
</td>
<td class="spacer"> </td>
<td valign="top">
</td>
<td class="spacer"> </td>
<td valign="top">
-<& $component, %ARGS &>
+% print $text;
</td>
</tr>
</table>
</td>
</tr>
</table>