Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -N -r1.55.2.9 -r1.55.2.10
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl 24 May 2019 17:44:09 -0000 1.55.2.9
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl 24 Jun 2019 05:51:00 -0000 1.55.2.10
@@ -595,7 +595,7 @@
if {$::__xowiki_with_publish_status} {
ImageAnchorField create publish_status -orderby publish_status.src -src "" \
-width 8 -height 8 -border 0 -title "Toggle Publish Status" \
- -alt "publish status" -label [_ xowiki.publish_status]
+ -alt "publish status" -label "" ;#[_ xowiki.publish_status]
}
Field create object_type -label [_ xowiki.page_kind] -orderby object_type -richtext false \
-hide $::hidden(object_type)
@@ -613,6 +613,7 @@
# TODO: why filter on title and name?
if {[info exists regexp]} {set extra_where_clause "(bt.title ~ '$regexp' OR ci.name ~ '$regexp' )"}
+ :log "child-resources of folder_id ${:current_folder_id}"
set items [::xowiki::FormPage get_all_children \
-folder_id ${:current_folder_id} \
-publish_status $publish_status \
@@ -634,7 +635,7 @@
-folder_ids $folder_ids \
-path_encode false \
$name]
- array set icon [$c render_icon]
+ set icon [$c render_icon]
ad_try {
set prettyName [$c pretty_name]
@@ -648,8 +649,8 @@
-name $prettyName \
-name.href [export_vars -base $page_link {template_file html-content}] \
-name.title [$c set title] \
- -object_type $icon(text) \
- -object_type.richtext $icon(is_richtext) \
+ -object_type [dict get $icon text] \
+ -object_type.richtext [dict get $icon is_richtext] \
-last_modified [$c set last_modified] \
-edit "" \
-edit.href [export_vars -base $page_link {{m edit} return_url}] \
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.542.2.26 -r1.542.2.27
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 11 Jun 2019 18:55:08 -0000 1.542.2.26
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 24 Jun 2019 05:51:00 -0000 1.542.2.27
@@ -4567,30 +4567,25 @@
}
File instproc render_icon {} {
- return [list text "" is_richtext true]
+ return {text " " is_richtext true}
}
-
+
FormPage instproc render_icon {} {
set page_template [:page_template]
if {[$page_template istype ::xowiki::FormPage]} {
return [list text [$page_template property icon_markup] is_richtext true]
}
switch [$page_template name] {
en:folder.form {
- return [list text "" is_richtext true]
+ return {text " " is_richtext true}
}
en:link.form {
set link_type [:get_property_from_link_page link_type "unresolved"]
- set link_icon "http://www.ejoe.at/typo3/sysext/rtehtmlarea/res/accessibilityicons/img/internal_link.gif"
if {$link_type eq "unresolved"} {
- return [list text " \
- " is_richtext true]
+ return {text " " is_richtext true}
+ } else {
+ return {text " " is_richtext true}
}
- if {$link_type eq "folder_link"} {
- return [list text " \
- " is_richtext true]
- }
- return [list text "" is_richtext true]
}
default {
return [list text [$page_template title] is_richtext false]
Index: openacs-4/packages/xowiki/www/resources/xowiki-bootstrap3-specific.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/Attic/xowiki-bootstrap3-specific.css,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/www/resources/xowiki-bootstrap3-specific.css 12 May 2019 19:55:44 -0000 1.1.2.1
+++ openacs-4/packages/xowiki/www/resources/xowiki-bootstrap3-specific.css 24 Jun 2019 05:51:00 -0000 1.1.2.2
@@ -2,6 +2,11 @@
* Appearance of item-buttons based on bootstrap glyphicons.
*/
+div.xowiki-content a.file-icon,
+div.xowiki-content a.folder-open-icon,
+div.xowiki-content a.level-up-icon,
+div.xowiki-content a.link-icon,
+div.xowiki-content a.broken-link-icon,
div.xowiki-content a.edit-item-button,
div.xowiki-content a.delete-item-button,
div.xowiki-content a.view-item-button,
@@ -41,7 +46,40 @@
content: "\2709";
}
+/*
+ * Icons file file listings
+ */
+div.xowiki-content a.file-icon::before {
+ /* glyphicon-file */
+ font-family: 'Glyphicons Halflings';
+ content: "\e022";
+}
+div.xowiki-content a.folder-open-icon::before {
+ /* glyphicon-folder-open */
+ font-family: 'Glyphicons Halflings';
+ content: "\e118";
+}
+div.xowiki-content a.level-up-icon::before {
+ /* glyphicon-level-up */
+ font-family: 'Glyphicons Halflings';
+ content: "\e204";
+}
+div.xowiki-content a.link-icon::before {
+ /* glyphicon-arrow-right */
+ font-family: 'Glyphicons Halflings';
+ content: "\e092";
+}
+
+div.xowiki-content a.broken-link-icon::before {
+ content: "broken";
+}
+div.xowiki-content a.broken-link-icon::after {
+ /* glyphicon-arrow-right */
+ font-family: 'Glyphicons Halflings';
+ content: "\e092";
+}
+
/*
* Local Variables:
* mode: css
Index: openacs-4/packages/xowiki/www/resources/xowiki-yui-specific.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/Attic/xowiki-yui-specific.css,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/www/resources/xowiki-yui-specific.css 12 May 2019 19:55:44 -0000 1.1.2.1
+++ openacs-4/packages/xowiki/www/resources/xowiki-yui-specific.css 24 Jun 2019 05:51:00 -0000 1.1.2.2
@@ -55,6 +55,34 @@
text-decoration: none;
}
+
+div.xowiki-content a.file-icon {
+ background: transparent url(/resources/file-storage/file.gif);
+ padding-right: 12px;
+ text-decoration: none;
+}
+div.xowiki-content a.folder-open-icon {
+ background: transparent url(/resources/file-storage/folder.gif);
+ padding-right: 12px;
+ text-decoration: none;
+}
+
+div.xowiki-content a.level-up-icon::before {
+ /* glyphicon-level-up */
+ content: "..";
+}
+
+div.xowiki-content a.link-icon {
+ background: transparent url(/resources/file-storage/link.gif);
+ padding-right: 12px;
+ text-decoration: none;
+}
+div.xowiki-content a.broken-link-icon {
+ background: transparent url(/resources/file-storage/link.gif);
+ padding-right: 12px;
+ text-decoration: none;
+}
+
/*
* Local Variables:
* mode: css