Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

pull/1/head
Michael Peter Christen 11 years ago
commit 0e6729f9bc

@ -6,9 +6,9 @@
<link rel="alternate" type="application/xml" title="Tables" href="Tables.rss?table=#[table]#" /> <link rel="alternate" type="application/xml" title="Tables" href="Tables.rss?table=#[table]#" />
#(/showtable)# #(/showtable)#
#%env/templates/metas.template%# #%env/templates/metas.template%#
<script src="/yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script> <script src="yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script>
<script src="/yacy/ui/js/jquery.dimensions.min.js" type="text/javascript"></script> <script src="yacy/ui/js/jquery.dimensions.min.js" type="text/javascript"></script>
<script type="text/javascript" src="/js/sorttable.js"></script> <script type="text/javascript" src="js/sorttable.js"></script>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
function setall(name, check){ function setall(name, check){
@ -45,7 +45,7 @@
<h2>YMark Table Administration</h2> <h2>YMark Table Administration</h2>
<div id="content_area" style="float: left;"> <div id="content_area" style="float: left;">
#(showtable)#:: #(showtable)#::
<form action="Table_YMark_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8" id="tablelisting"> <form action="Table_YMark_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8" id="tablelisting" name="tablelisting">
<fieldset> <fieldset>
<legend><label for="tablelisting">Table Editor: showing table '#[table]#' containing #[bmksize]# bookmarks with #[tagsize]# tags in #[foldersize]# folders <legend><label for="tablelisting">Table Editor: showing table '#[table]#' containing #[bmksize]# bookmarks with #[tagsize]# tags in #[foldersize]# folders
</label></legend> </label></legend>
@ -180,10 +180,10 @@
</form> </form>
<fieldset> <fieldset>
<legend>Import Bookmarks</legend> <legend>Import Bookmarks</legend>
<form action="/api/ymarks/import_ymark.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8"> <form action="api/ymarks/import_ymark.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
<fieldset> <fieldset>
<input type="hidden" name="table" value="#[table]#" /> <input type="hidden" name="table" value="#[table]#" />
<input type="hidden" name="redirect" value="/Table_YMark_p.html?table=#[table]#&amp;count=100" /> <input type="hidden" name="redirect" value="Table_YMark_p.html?table=#[table]#&amp;count=100" />
<dl> <dl>
<dt> <dt>
<label for="importer">Importer:</label> <label for="importer">Importer:</label>

@ -23,14 +23,14 @@
} }
--> -->
</script> </script>
<script type="text/javascript" src="/js/sorttable.js"></script> <script type="text/javascript" src="js/sorttable.js"></script>
</head> </head>
<body id="Tables"> <body id="Tables">
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
if (window.location.search.length > 1) { if (window.location.search.length > 1) {
document.write("<div id=\"api\">\<a href=\"/api/table_p.xml" + window.location.search + "\"\><img src=\"env/grafics/api.png\" width=\"60\" height=\"40\" alt=\"API\"/></a></div>"); document.write("<div id=\"api\">\<a href=\"api/table_p.xml" + window.location.search + "\"\><img src=\"env/grafics/api.png\" width=\"60\" height=\"40\" alt=\"API\"/></a></div>");
} }
//]]> //]]>
</script> </script>
@ -71,7 +71,7 @@ document.write("<div id=\"api\">\<a href=\"/api/table_p.xml" + window.location.s
</form> </form>
#(/showselection)# #(/showselection)#
#(showtable)#:: #(showtable)#::
<form action="Tables_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8" id="tablelisting"> <form action="Tables_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8" id="tablelisting" name="tablelisting">
<fieldset> <fieldset>
<legend><label for="tablelisting">Table Editor: showing table '#[table]#'</label></legend> <legend><label for="tablelisting">Table Editor: showing table '#[table]#'</label></legend>
<table class="sortable" border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">

Loading…
Cancel
Save