idok-commit AT lists.psi.ch

Subject: Commit emails of the iDok project

List archive

[idok-commit] idok commit r124 - in branches/1.0.x: java/ch/idok/qtgui python/pydok/test scripts/admin

From: "Apache" <apache AT savannah.psi.ch>
To: idok-commit AT lists.psi.ch
Subject: [idok-commit] idok commit r124 - in branches/1.0.x: java/ch/idok/qtgui python/pydok/test scripts/admin
Date: Wed, 11 Jun 2008 10:32:17 +0200
List-archive: <https://lists.web.psi.ch/pipermail/idok-commit/>
List-id: Commit emails of the iDok project <idok-commit.lists.psi.ch>

Author: huebner AT PSI.CH
Date: Wed Jun 11 10:32:17 2008
New Revision: 124

Log:
Merged trunk revisions r121:123 into branches/1.0.x

Added:
branches/1.0.x/scripts/admin/idok_admin_bulk.sh (props changed)
- copied unchanged from r123, /trunk/scripts/admin/idok_admin_bulk.sh
Modified:
branches/1.0.x/java/ch/idok/qtgui/MainWindow.java
branches/1.0.x/python/pydok/test/idok_upload_cgi.py

Modified: branches/1.0.x/java/ch/idok/qtgui/MainWindow.java
==============================================================================
--- branches/1.0.x/java/ch/idok/qtgui/MainWindow.java (original)
+++ branches/1.0.x/java/ch/idok/qtgui/MainWindow.java Wed Jun 11 10:32:17
2008
@@ -834,7 +834,8 @@
viewDocumentAction_.setEnabled(true);
String fn = item.text(0).toLowerCase();
viewAsPdfAction_.setEnabled(fn
- .matches(".*(tiff|tif|gif|jpg|jpeg|png|ps|eps)"));
+// .matches(".*(tiff|tif|gif|jpg|jpeg|png|ps|eps)"));
+
.matches(".*(odt|sxw|rtf|doc|wpd|ods|sxc|xls|csv|tsv|odp|sxi|ppt)"));
viewDocumentAction_.setEnabled(true);
editMetaDataAction_.setEnabled(true);
saveDocumentAction_.setEnabled(true);

Modified: branches/1.0.x/python/pydok/test/idok_upload_cgi.py
==============================================================================
--- branches/1.0.x/python/pydok/test/idok_upload_cgi.py (original)
+++ branches/1.0.x/python/pydok/test/idok_upload_cgi.py Wed Jun 11 10:32:17
2008
@@ -234,7 +234,7 @@
if output_mode == "iframe":
link_url = generate_self_url(output_mode, "link_file",
repository, folder) \
+ "&dir_entry=" + urllib.quote_plus(entry)
- fo.write('<li
style="list-style-image:url(/icons/small/text.gif);white-space:nowrap"><a
href="%s">%s</a> <a href="%s">→</a></li>' % (view_url,
escape(entry), link_url))
+ fo.write('<li
style="list-style-image:url(/icons/small/text.gif);white-space:nowrap"><a
href="%s">%s</a> <a href="%s">→ <i style="color:gray">copy link to
iDok</i></a></li>' % (view_url, escape(entry), link_url))
else:
fo.write('<li
style="list-style-image:url(/icons/small/text.gif);white-space:nowrap"><a
href="%s">%s</a></li>' % (view_url, escape(entry)))
fo.write('</ul>')

[idok-commit] idok commit r124 - in branches/1.0.x: java/ch/idok/qtgui python/pydok/test scripts/admin, Apache, 06/11/2008