diff --git a/conf-sso/sp/dynamo.xml b/conf-sso/sp/dynamo.xml index b037d1e..ce6483e 100644 --- a/conf-sso/sp/dynamo.xml +++ b/conf-sso/sp/dynamo.xml @@ -165,7 +165,7 @@ - + diff --git a/conf/dynamo-venice.xml b/conf/dynamo-venice.xml index c703556..df9cebb 100644 --- a/conf/dynamo-venice.xml +++ b/conf/dynamo-venice.xml @@ -164,7 +164,7 @@ - + diff --git a/conf/venice-db-init-mysql.sql b/conf/venice-db-init-mysql.sql index 4563f03..1029009 100644 --- a/conf/venice-db-init-mysql.sql +++ b/conf/venice-db-init-mysql.sql @@ -323,6 +323,8 @@ INSERT INTO globalprop (nsid, prop_name, prop_value) VALUES (6, 'subdir.buttons', '!buttons/classic' ), (6, 'std.button.width', 'I80' ), (6, 'std.button.height', 'I24' ), + (6, 'bn.0transparent', '!transparent.gif' ), + (6, 'bnc.0transparent', '!' ), (6, 'bn.cancel', '!cancel.jpg' ), (6, 'bnc.cancel', '!Cancel' ), (6, 'bn.configure', '!configure.jpg' ), @@ -335,10 +337,16 @@ INSERT INTO globalprop (nsid, prop_name, prop_value) VALUES (6, 'bnc.i.decline', '!I Decline' ), (6, 'bn.login', '!login.jpg' ), (6, 'bnc.login', '!Log In' ), + (6, 'bn.next', '!arrow_next.jpg' ), + (6, 'bnc.next', '!Next' ), (6, 'bn.ok', '!ok.jpg' ), (6, 'bnc.ok', '!OK' ), + (6, 'bn.previous', '!arrow_previous.jpg' ), + (6, 'bnc.previous', '!Previous' ), (6, 'bn.reminder', '!reminder.jpg' ), (6, 'bnc.reminder', '!Reminder' ), + (6, 'bn.search', '!search.jpg' ), + (6, 'bnc.search', '!Search' ), (6, 'bn.send.again', '!send_again.jpg' ), (6, 'bnc.send.again', '!Send Again' ), (6, 'bn.send.email', '!send_email.jpg' ), @@ -359,6 +367,7 @@ INSERT INTO globalprop (nsid, prop_name, prop_value) VALUES (10, 'timezone', '_TZ:UTC' ), (10, 'locale', '_LOC:en_US' ), (10, 'admin.flags', '_OS:' ), + (10, 'search.result.count', 'I20' ), (11, 'privacy', '_OS:' ), (12, 'confirm.message.title', '!Venice E-Mail Confirmation' ), (12, 'password.change.message.title', '!Venice Password Changed' ), @@ -462,16 +471,17 @@ INSERT INTO users (uid, username, email, is_anon, nospam, created) VALUES # Set up properties for Anonymous_Honyak. INSERT INTO userprop (uid, nsid, prop_name, prop_value) VALUES - (1, 10, 'timezone', '_TZ:UTC' ), - (1, 10, 'locale', '_LOC:en_US'), - (1, 10, 'admin.flags', '_OS:A' ), - (1, 11, 'privacy', '_OS:' ), - (1, 11, 'name.given', '!Anonymous'), - (1, 11, 'name.family', '!Honyak' ), - (1, 11, 'locality', '!Nowhere' ), - (1, 11, 'region', '!XX' ), - (1, 11, 'postal.code', '!00000' ), - (1, 11, 'country', '_CTRY:US' ); + (1, 10, 'timezone', '_TZ:UTC' ), + (1, 10, 'locale', '_LOC:en_US'), + (1, 10, 'admin.flags', '_OS:A' ), + (1, 10, 'search.result.count', 'I20' ), + (1, 11, 'privacy', '_OS:' ), + (1, 11, 'name.given', '!Anonymous'), + (1, 11, 'name.family', '!Honyak' ), + (1, 11, 'locality', '!Nowhere' ), + (1, 11, 'region', '!XX' ), + (1, 11, 'postal.code', '!00000' ), + (1, 11, 'country', '_CTRY:US' ); # Add authentication for Administrator (no password by default) INSERT INTO userauth (uid, nsid, method, source_data, auth_data) VALUES @@ -479,16 +489,17 @@ INSERT INTO userauth (uid, nsid, method, source_data, auth_data) VALUES # Set up properties for Administrator. INSERT INTO userprop (uid, nsid, prop_name, prop_value) VALUES - (2, 10, 'timezone', '_TZ:UTC' ), - (2, 10, 'locale', '_LOC:en_US' ), - (2, 10, 'admin.flags', '_OS:' ), - (2, 11, 'privacy', '_OS:' ), - (2, 11, 'name.given', '!System' ), - (2, 11, 'name.family', '!Administrator'), - (2, 11, 'locality', '!Nowhere' ), - (2, 11, 'region', '!XX' ), - (2, 11, 'postal.code', '!00000' ), - (2, 11, 'country', '_CTRY:US' ); + (2, 10, 'timezone', '_TZ:UTC' ), + (2, 10, 'locale', '_LOC:en_US' ), + (2, 10, 'admin.flags', '_OS:' ), + (2, 10, 'search.result.count', 'I20' ), + (2, 11, 'privacy', '_OS:' ), + (2, 11, 'name.given', '!System' ), + (2, 11, 'name.family', '!Administrator'), + (2, 11, 'locality', '!Nowhere' ), + (2, 11, 'region', '!XX' ), + (2, 11, 'postal.code', '!00000' ), + (2, 11, 'country', '_CTRY:US' ); # Create a group for site administrators. # (GID 1) @@ -985,3 +996,9 @@ INSERT INTO menuitems (menuid, sequence, itemtype, text, linktype, link, perm_ns 'set.property'), (3, 5, 'TEXT', 'Edit Password Reminder E-Mail Message', 'SERVLET', 'sysadmin/pwremind_email.js.vs', 12, 'set.property'); + +# Create the find submenu. (ID #4) +INSERT INTO menus (menuid, menu_nsid, menu_name, title, subtitle) + VALUES (4, 6, 'find.menu', 'Find', NULL); +INSERT INTO menuitems (menuid, sequence, itemtype, text, linktype, link) VALUES + (4, 0, 'TEXT', 'Categories', 'SERVLET', 'find_categories.js.vs'); diff --git a/src/venice-base/com/silverwrist/venice/content/ButtonSupplier.java b/src/venice-base/com/silverwrist/venice/content/ButtonSupplier.java index 1962eac..e307e91 100644 --- a/src/venice-base/com/silverwrist/venice/content/ButtonSupplier.java +++ b/src/venice-base/com/silverwrist/venice/content/ButtonSupplier.java @@ -392,10 +392,17 @@ public class ButtonSupplier // get the full URL of the image String image_url = rewrite.rewriteURL("IMAGE",m_subdir + "/" + token.getImageName()); - // render as tag if (ButtonType.IMAGE.equals(token.getType())) - wr.write("\"[""); + { // render as tag + String xcapt; + if (token.getName().startsWith("0")) + xcapt = token.getCaption(); + else + xcapt = "[" + token.getCaption() + "]"; + wr.write("\"""); + + } // end if // render as tag if (ButtonType.INPUT.equals(token.getType())) diff --git a/src/venice-base/com/silverwrist/venice/content/StandardContentSupplier.java b/src/venice-base/com/silverwrist/venice/content/StandardContentSupplier.java index 3333c51..70cde8b 100644 --- a/src/venice-base/com/silverwrist/venice/content/StandardContentSupplier.java +++ b/src/venice-base/com/silverwrist/venice/content/StandardContentSupplier.java @@ -71,6 +71,12 @@ public class StandardContentSupplier } // end header1 + public Object bullet() throws DatabaseException + { + return getContentBlock("std.bullet"); + + } // end bullet + } // end class ContentOps /*-------------------------------------------------------------------------------- diff --git a/venice-data/dialogs/user_profile.dlg.xml b/venice-data/dialogs/user_profile.dlg.xml index f772aab..31dedee 100644 --- a/venice-data/dialogs/user_profile.dlg.xml +++ b/venice-data/dialogs/user_profile.dlg.xml @@ -21,18 +21,21 @@ profile.js.vs +
To change your password, enter a new password into the fields below.
+
+
@@ -42,6 +45,7 @@ +
@@ -49,17 +53,22 @@ +
+
+
+ +