Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-plain.adp,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/xowiki/www/view-plain.adp 23 Nov 2008 18:43:43 -0000 1.36
+++ openacs-4/packages/xowiki/www/view-plain.adp 16 Dec 2008 17:07:04 -0000 1.37
@@ -1,4 +1,4 @@
-
+
Index: openacs-4/packages/xowiki/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/admin/index.adp 6 Nov 2008 15:58:44 -0000 1.7
+++ openacs-4/packages/xowiki/www/admin/index.adp 16 Dec 2008 17:07:04 -0000 1.8
@@ -3,6 +3,7 @@
@title;noquote@
@context;noquote@
+
+
+
+
+
+
@t1;noquote@
+
Index: openacs-4/packages/xowiki/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/xowiki/www/admin/index.tcl 6 Nov 2008 15:58:44 -0000 1.22
+++ openacs-4/packages/xowiki/www/admin/index.tcl 16 Dec 2008 17:07:04 -0000 1.23
@@ -13,8 +13,8 @@
set context [list]
set title "Administer all kind of [$object_type set pretty_plural]"
-set object_types [$object_type object_types]
-set return_url [ns_conn url]
+set object_types [$object_type object_types]
+set return_url [ns_conn url]
set category_url [export_vars \
-base [site_node::get_package_url -package_key categories]cadmin/object-map \
{ { object_id $package_id } {ctx_id $package_id} }]
@@ -34,8 +34,8 @@
-columns {
Field object_type -label [_ xowiki.page_type]
AnchorField instances -label Instances -html {align center}
- ImageField_AddIcon edit -label "Add" -html {align center}
- ImageField_DeleteIcon delete -label "Delete All" \
+ AnchorField edit -CSSclass add-item-button -label "Add" -html {align center}
+ AnchorField delete -CSSclass delete-item-button -label "Delete All" \
-html {align center onClick "return(confirm('Delete really all?'));"}
}
@@ -58,9 +58,11 @@
-object_type $object_type \
-instances $n \
-instances.href [export_vars -base ./list {object_type}] \
+ -edit "" \
-edit.href $add_href \
- -delete.href [export_vars -base delete-type {object_type}] \
-edit.title $add_title \
+ -delete "" \
+ -delete.href [export_vars -base delete-type {object_type}] \
-delete.title $delete_title
}
Index: openacs-4/packages/xowiki/www/admin/list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/admin/list.adp 6 Nov 2008 18:14:38 -0000 1.3
+++ openacs-4/packages/xowiki/www/admin/list.adp 16 Dec 2008 17:07:04 -0000 1.4
@@ -3,6 +3,7 @@
@title;noquote@
@context;noquote@
+
-
+
+
+
+
+
@t1;noquote@
+
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/xowiki/www/admin/list.tcl 6 Nov 2008 18:14:38 -0000 1.27
+++ openacs-4/packages/xowiki/www/admin/list.tcl 16 Dec 2008 17:07:04 -0000 1.28
@@ -64,7 +64,7 @@
Action new -label export -tooltip export -url export
Action new -label delete -tooltip delete -url bulk-delete
}
- ImageField_EditIcon edit -label "" -html {style "padding: 2px;"}
+ AnchorField edit -CSSclass edit-item-button -label "" -html {style "padding: 0px;"}
if {$::individual_permissions} {
ImageAnchorField permissions -src /resources/xowiki/permissions.png -width 16 \
-height 16 -border 0 -title "Manage Individual Permssions for this Item" \
@@ -83,7 +83,7 @@
Field size -label "Size" -orderby size -html {align right style "padding: 2px;"}
Field last_modified -label [_ xowiki.Page-last_modified] -orderby last_modified
Field mod_user -label "By User" -orderby mod_user
- ImageField_DeleteIcon delete -label "" ;#-html {onClick "return(confirm('Confirm delete?'));"}
+ AnchorField delete -CSSclass delete-item-button -label "" ;#-html {onClick "return(confirm('Confirm delete?'));"}
}
foreach {att order} [split $orderby ,] break
@@ -123,9 +123,13 @@
-last_modified $last_modified \
-syndicated [info exists syndicated($revision_id)] \
-size [expr {$content_length ne "" ? $content_length : 0}] \
+ -edit "" \
-edit.href [export_vars -base $page_link {{m edit} return_url}] \
+ -edit.title #xowiki.edit# \
-mod_user [::xo::get_user_name $creation_user] \
- -delete.href [export_vars -base [$package_id package_url] {{delete 1} item_id name return_url}]
+ -delete "" \
+ -delete.href [export_vars -base [$package_id package_url] {{delete 1} item_id name return_url}] \
+ -delete.title #xowiki.delete#
if {$::individual_permissions} {
[t1 last_child] set permissions.href \
[export_vars -base permissions {item_id return_url}]
Index: openacs-4/packages/xowiki/www/resources/file.jpg
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/file.jpg,v
diff -u -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/xowiki/www/resources/sprite16.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/sprite16.png,v
diff -u
Binary files differ
Index: openacs-4/packages/xowiki/www/resources/xowiki.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/xowiki/www/resources/xowiki.css 16 Dec 2008 09:26:44 -0000 1.39
+++ openacs-4/packages/xowiki/www/resources/xowiki.css 16 Dec 2008 17:07:04 -0000 1.40
@@ -34,21 +34,21 @@
}
/* appearance of link types */
-div.xowiki-content a.external {
- color: #002bb8;
- background: url(/resources/xowiki/external.png) right center no-repeat;
- padding-right: 12px;
+div.xowiki-content span.external {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -216px no-repeat;
+ padding-right: 16px;
}
-div.xowiki-content a.file {
- background: url(/resources/xowiki/file.jpg) right center no-repeat;
- padding-right: 9px;
+div.xowiki-content span.file {
+ background: transparent url(/resources/xowiki/sprite16.png) -4px -234px no-repeat;
+ padding-right: 10px;
}
div.xowiki-content a.glossary {
background: url(/resources/xowiki/glossary.gif) right center no-repeat;
padding-right: 14px;
}
/* appearance of item-buttons */
+/*
div.xowiki-content a.edit-item-button {
background: url(/resources/acs-subsite/Edit16.gif) right center no-repeat;
padding-right: 16px;
@@ -73,6 +73,51 @@
background: url(/resources/acs-subsite/Copy16.gif) right center no-repeat;
padding-right: 16px;
}
+*/
+/* positions
+ Add16 -1,-0
+ Copy16 -1,-18
+ Delete16 -1,-36
+ Edit16 -1,-54
+ New16 -1,-72
+ Open16 -1,-90
+ Preferences16 -1,-108
+ Properties16 -1,-126
+ Zoom16 -1,-144
+ ZoomIn16 -1,-162
+ ZoomOut16 -1,-180
+ email.png -1,-198
+ external.png -1,-216
+ file.png -1,-234px
+*/
+div.xowiki-content a.edit-item-button {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -54px no-repeat;
+ padding-right: 16px;
+}
+div.xowiki-content a.delete-item-button {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -36px no-repeat;
+ padding-right: 16px;
+}
+div.xowiki-content a.view-item-button {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -144px no-repeat;
+ padding-right: 16px;
+}
+div.xowiki-content a.create-item-button {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -0px no-repeat;
+ padding-right: 16px;
+}
+div.xowiki-content a.copy-item-button {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -18px no-repeat;
+ padding-right: 16px;
+}
+div.xowiki-content a.add-item-button {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -0px no-repeat;
+ padding-right: 16px;
+}
+div.xowiki-content a.notification-image-button {
+ background: transparent url(/resources/xowiki/sprite16.png) -1px -202px no-repeat;
+ padding-right: 16px;
+}
/* headings */
div.xowiki-content h1 {