diff --git a/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql index 6d80c7b99..6fb906965 100644 --- a/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql @@ -1,5 +1,5 @@ -- --- Copyright (C) 2008 Peter Boy All Rights Reserved. +-- Copyright (C) 2011 Peter Boy All Rights Reserved. -- -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public License diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Bold24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Bold24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Bold24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Bold24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Bookmarks24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Bookmarks24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Bookmarks24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Bookmarks24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Copy24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Copy24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Copy24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Copy24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Cut24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Cut24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Cut24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Cut24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Indent24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Indent24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Indent24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Indent24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Italic24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Italic24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Italic24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Italic24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/OrderedList24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/OrderedList24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/OrderedList24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/OrderedList24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Outdent24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Outdent24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Outdent24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Outdent24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Paste24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Paste24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Paste24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Paste24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Underline24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Underline24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/Underline24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Underline24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/UnorderedList24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/UnorderedList24.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/UnorderedList24.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/UnorderedList24.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/blank.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/blank.gif similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/blank.gif rename to ccm-core/doc/image-lib/bebop/dhtmleditor/blank.gif diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/edit.js b/ccm-core/doc/image-lib/bebop/dhtmleditor/edit.js similarity index 100% rename from ccm-core/web/STATIC/bebop/dhtmleditor/edit.js rename to ccm-core/doc/image-lib/bebop/dhtmleditor/edit.js diff --git a/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java b/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java index 5d2fa8fbf..aac021304 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java +++ b/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java @@ -33,11 +33,11 @@ import com.arsdigita.xml.Element; * Displays and manages a WYSIWYG HTML editor that takes advantage of * DHTML scripting features. * This class can use: - * - Xinha * - FCKeditor * - HTMLarea for backwards compatibility, development discontinued * Editor is choosen based on the config parameter waf.bebop.dhtml_editor, - * default is "Xinha", which is the successor of HTNLarea + * default is "Xinha", which is the successor of HTMLarea * * @author Jim Parsons * @author Richard Li @@ -218,6 +218,7 @@ public class DHTMLEditor extends TextArea { /** * Sets the ROWS attribute for the TEXTAREA tag. */ + @Override public void setRows(int rows) { setAttribute("rows", String.valueOf(rows)); } @@ -225,6 +226,7 @@ public class DHTMLEditor extends TextArea { /** * Sets the COLS attribute for the TEXTAREA tag. */ + @Override public void setCols(int cols) { setAttribute("cols", String.valueOf(cols)); } @@ -232,6 +234,7 @@ public class DHTMLEditor extends TextArea { /** * Sets the COLS attribute for the TEXTAREA tag. */ + @Override public void setWrap(int wrap) { String wrapString = null; @@ -258,6 +261,7 @@ public class DHTMLEditor extends TextArea { * @return The tag to be used for the top level DOM element * generated for this type of Widget. */ + @Override protected String getElementTag() { return Bebop.getConfig().getDHTMLEditor(); } @@ -268,6 +272,7 @@ public class DHTMLEditor extends TextArea { *

<bebop:dhtmleditor name=... value=... [onXXX=...]/> * */ + @Override public void generateWidget( PageState state, Element parent ) { String value = getParameterData(state).marshal(); Element editor = parent.newChildElement(getElementTag(), BEBOP_XML_NS); diff --git a/ccm-core/web/packages/categorization/README b/ccm-core/web/packages/categorization/README new file mode 100644 index 000000000..c61c22c8a --- /dev/null +++ b/ccm-core/web/packages/categorization/README @@ -0,0 +1 @@ +Seems not to be used by any package diff --git a/ccm-core/web/themes/heirloom/apps/acs-subsite/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/acs-subsite/xsl/index.xsl new file mode 100644 index 000000000..207c7b3ea --- /dev/null +++ b/ccm-core/web/themes/heirloom/apps/acs-subsite/xsl/index.xsl @@ -0,0 +1,9 @@ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl new file mode 100644 index 000000000..f22d44b69 --- /dev/null +++ b/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl @@ -0,0 +1,9 @@ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/apps/bebop/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/bebop/xsl/index.xsl new file mode 100644 index 000000000..b3b20f96e --- /dev/null +++ b/ccm-core/web/themes/heirloom/apps/bebop/xsl/index.xsl @@ -0,0 +1,9 @@ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/apps/permissions/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/permissions/xsl/index.xsl new file mode 100644 index 000000000..ce89c4b9b --- /dev/null +++ b/ccm-core/web/themes/heirloom/apps/permissions/xsl/index.xsl @@ -0,0 +1,9 @@ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/apps/sitemap/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/sitemap/xsl/index.xsl new file mode 100644 index 000000000..461568ab5 --- /dev/null +++ b/ccm-core/web/themes/heirloom/apps/sitemap/xsl/index.xsl @@ -0,0 +1,9 @@ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl new file mode 100644 index 000000000..2837a13f0 --- /dev/null +++ b/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + +

+ + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + odd + + + even + + + + + + + + + + + + + + +
NameValue 
Toggle details >>>
+ +
+ + +
+ This application has no config records +
+ + + + + diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/README b/ccm-core/web/themes/heirloom/packages/acs-admin/README new file mode 100644 index 000000000..68a55ed5a --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/acs-admin/README @@ -0,0 +1,6 @@ +Used by + +[pb@shuttle ROOT]$ grep -R acs-admin/xsl/ * +__ccm__/apps/sitemap/xsl/index.xsl: +__ccm__/apps/admin/xsl/index.xsl: +packages/content-section/xsl/cms-admin.xsl: diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin.xsl new file mode 100644 index 000000000..50e4e612a --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin.xsl @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + #e1d5b0 + #ffffff + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin_en.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin_en.xsl new file mode 100644 index 000000000..4c4557ab9 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin_en.xsl @@ -0,0 +1,126 @@ + + + + + + + + + + +
    +
  • Name:
    • +
  • Email: + + +
    +
    • +
  • Screen Name:
    • +
  • URL:
    • +
  • User ID:
    • +
  • Member State: +
    • +
+ + + + + + +

Adminstrative Actions

+ + + + + + + + For +
+ + + + +

Note

+

If this user does not currently have an authentication record, + one will be created when you submit this form and the account + will be enabled for login to the system.

+ + + + + + + + + + (primary) + + + + + + + + + + + + + + + + + + +
+

You don't have permission to perform the requested action.

+
+ + + + +

Your search returned no results.

+ + + + +

Results matching your query:

+
    + +
    • +     +
+ + + + + +
    +
  • Group Name:
    • +
  • Primary Email:
    • +
+ + + + +

None

+ + + +   + ( + + ) + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/sitemap_en.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/sitemap_en.xsl new file mode 100644 index 000000000..c72b2b5d6 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/sitemap_en.xsl @@ -0,0 +1,10 @@ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/split-panel.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/split-panel.xsl new file mode 100644 index 000000000..db59d6010 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/split-panel.xsl @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + The Heading Goes Here + This is the Navbar + This is the Main Display Panel + Title + + + + + + +
+ + + + + + + + + + + + +
+ + + + +
+ +
+
+ + + +
+
+
+ + +
+ 		+ + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + +
+
+
+ + + +
+
+
+ +
+
+ + + + + + + + + + + +   + + /assets/images/arrow-right.gif + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/README b/ccm-core/web/themes/heirloom/packages/bebop/README new file mode 100644 index 000000000..ef4cfff8d --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/README @@ -0,0 +1 @@ +Used by various packages! diff --git a/ccm-core/web/packages/bebop-demo/xsl/bebop-demo-2.xsl b/ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo-2.xsl old mode 100755 new mode 100644 similarity index 100% rename from ccm-core/web/packages/bebop-demo/xsl/bebop-demo-2.xsl rename to ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo-2.xsl diff --git a/ccm-core/web/packages/bebop-demo/xsl/bebop-demo.xsl b/ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo.xsl old mode 100755 new mode 100644 similarity index 100% rename from ccm-core/web/packages/bebop-demo/xsl/bebop-demo.xsl rename to ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo.xsl diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/BoxPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/BoxPanel.xsl new file mode 100644 index 000000000..4057e853e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/BoxPanel.xsl @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/CheckBoxGroup.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/CheckBoxGroup.xsl new file mode 100644 index 000000000..1c1625271 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/CheckBoxGroup.xsl @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + readonly + + + + disabled + + + + + + + + + + + +
+ + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/ColumnPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ColumnPanel.xsl new file mode 100644 index 000000000..3a056b6d4 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ColumnPanel.xsl @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DHTMLEditor.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DHTMLEditor.xsl new file mode 100644 index 000000000..49909d1cf --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DHTMLEditor.xsl @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + +
+ +
+ + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DataTable.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DataTable.xsl new file mode 100644 index 000000000..cf40d3ce1 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DataTable.xsl @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + +
+ + + + 0 + asc + + + +   + + + +   + + /assets/gray-triangle-up.gif/assets/gray-triangle-down.gif + + + +   +   + + +   + + + + + + + + + + + + + + + + + + table_odd + table_even + + + + + #eaded0 + #ffffff + + + + + + + + + + +   + +   + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DateTime.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DateTime.xsl new file mode 100644 index 000000000..f661da5a8 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DateTime.xsl @@ -0,0 +1,24 @@ + + + + + + + +
+ : + : + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DimensionalNavbar.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DimensionalNavbar.xsl new file mode 100644 index 000000000..95b85fa43 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DimensionalNavbar.xsl @@ -0,0 +1,69 @@ + + + + + + + bebop:dimensionalNavbar + + + + + + +  >  + + + + + + + /bebop:dimensionalNavbar + + + + bebop:dimensionalNavbar @id='global-navbar' + + +  -  + + /bebop:dimensionalNavbar @id='global-navbar' + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/FCKEditor.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FCKEditor.xsl new file mode 100644 index 000000000..2a175cb26 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FCKEditor.xsl @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Form.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Form.xsl new file mode 100644 index 000000000..79f35a796 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Form.xsl @@ -0,0 +1,33 @@ + + + + + + + + +
+ + + + + + + post + + + + + + +
+ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl new file mode 100644 index 000000000..2b4ae838a --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + dcp_hide(this); + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/GridPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/GridPanel.xsl new file mode 100644 index 000000000..7c647c9b8 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/GridPanel.xsl @@ -0,0 +1,18 @@ + + + + + + + + + + + + + +
+ + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Image.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Image.xsl new file mode 100644 index 000000000..11683b8d6 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Image.xsl @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Label.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Label.xsl new file mode 100644 index 000000000..c5d82e3c9 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Label.xsl @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + ' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Link.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Link.xsl new file mode 100644 index 000000000..e773befd7 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Link.xsl @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + dcp_disable_link(this); + + + + + + + + + + + + + + + + + + + + + + + +   + + + + dcp_disable_link(this); + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/List.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/List.xsl new file mode 100644 index 000000000..4c7615090 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/List.xsl @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/ListPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ListPanel.xsl new file mode 100644 index 000000000..8c86baa9a --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ListPanel.xsl @@ -0,0 +1,25 @@ + + + + + + +
    + +
    • +     +
+ + + +
    + +
    2. +     +
+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/MultipleSelect.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/MultipleSelect.xsl new file mode 100644 index 000000000..f03ae35ef --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/MultipleSelect.xsl @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Page.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Page.xsl new file mode 100644 index 000000000..f962d8811 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Page.xsl @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <xsl:call-template name="bebop:pageTitle"/> + + + + +

+ + + + + + + +

Bebop Page Structure

+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageErrorDisplay.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageErrorDisplay.xsl new file mode 100644 index 000000000..1cb83885e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageErrorDisplay.xsl @@ -0,0 +1,26 @@ + + + + + + + + + + +
+ Please correct the following errors: +
+
    + +
    • +     +
+
+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageState.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageState.xsl new file mode 100644 index 000000000..e3a17746a --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageState.xsl @@ -0,0 +1,20 @@ + + + + + + + + + hidden + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/RadioGroup.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/RadioGroup.xsl new file mode 100644 index 000000000..b773b4a60 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/RadioGroup.xsl @@ -0,0 +1,44 @@ + + + + + + + + + + + + + +
+ + + + + + + + readonly + + + disabled + + + + + radio + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/SegmentedPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SegmentedPanel.xsl new file mode 100644 index 000000000..56bae29fe --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SegmentedPanel.xsl @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + +
+
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Select.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Select.xsl new file mode 100644 index 000000000..1faef4d9e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Select.xsl @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/SplitPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SplitPanel.xsl new file mode 100644 index 000000000..d11a19d47 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SplitPanel.xsl @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + +
+ +
+ + + +
+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/TabbedPane.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TabbedPane.xsl new file mode 100644 index 000000000..383791f9d --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TabbedPane.xsl @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + +
+ + + +
+ 		+ + + + +
+ + + + + +
+
+ 		+ + + + +
+ + Item Preview + + + + + + +
+
+
+ + + +
+
+
+ + + +
+
+
+ + + + + + + + +
+ +
+ + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Table.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Table.xsl new file mode 100644 index 000000000..e4102febf --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Table.xsl @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + rowOdd + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl new file mode 100644 index 000000000..468ccd622 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Tree.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Tree.xsl new file mode 100644 index 000000000..b4f279d35 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Tree.xsl @@ -0,0 +1,59 @@ + + + + + + + + + &nbsp;&nbsp;&nbsp;&nbsp; + + + + + + + + + + + - + + +   + + +   + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl new file mode 100644 index 000000000..8abc53441 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl @@ -0,0 +1,44 @@ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + dcp_hide(this); + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl new file mode 100644 index 000000000..2609c5bf9 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/bebop.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/bebop.xsl new file mode 100644 index 000000000..4ca14559f --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/bebop.xsl @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/dcp.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/dcp.xsl new file mode 100644 index 000000000..ebbbacf7e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/dcp.xsl @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/plain.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/plain.xsl new file mode 100644 index 000000000..2b24b2b5d --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/plain.xsl @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/README b/ccm-core/web/themes/heirloom/packages/formbuilder/README new file mode 100644 index 000000000..c9813a9e4 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/formbuilder/README @@ -0,0 +1,5 @@ +Used by: + +[pb@shuttle ROOT]$ grep -R packages/formbuilder/xsl/ * +static/content-types/com/arsdigita/cms/contenttypes/FormItem.xsl: + diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/OptionWidgets.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/OptionWidgets.xsl new file mode 100644 index 000000000..3c0c1bd00 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/OptionWidgets.xsl @@ -0,0 +1,122 @@ + + + + + + + + + + checkbox + + + + + + + + radio + + + + + + + + + + + + + + + +
+ + + + + + + + checkbox + + + + : + + + + checked + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentDate.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentDate.xsl new file mode 100644 index 000000000..328d82376 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentDate.xsl @@ -0,0 +1,81 @@ + + + + + + + + + + .year + + + + + + + .month + + + + + + + + + + + + .day + + + + .day + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentSubmit.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentSubmit.xsl new file mode 100644 index 000000000..1127bad16 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentSubmit.xsl @@ -0,0 +1,28 @@ + + + + + + + + + + if(this.value == 'null') { this.value = 'Please Wait'; this.form.submit(); } + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/TextWidgets.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/TextWidgets.xsl new file mode 100644 index 000000000..9afe39f2e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/TextWidgets.xsl @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 30 + + + + + 30 + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/formbuilder.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/formbuilder.xsl new file mode 100644 index 000000000..677d96e8c --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/formbuilder.xsl @@ -0,0 +1,148 @@ + + + + + + + + + + + + +
+ + post + + + + + + + + form. + + + + + + + + + + + +
+ + + +
 + + + +
+ + post + + + + + + + + + +
 + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + +

+ + + + + diff --git a/ccm-core/web/themes/heirloom/packages/login/xsl/login_en.xsl b/ccm-core/web/themes/heirloom/packages/login/xsl/login_en.xsl new file mode 100644 index 000000000..4131c7332 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/login/xsl/login_en.xsl @@ -0,0 +1,173 @@ + + + + +]> + + + + + + + + + + + + + + Log in + + + + + + + + +

  + + + + + + + + + + + +
+
+
+ + + + + + + + +
+

+   + + + + + + + + + + +

+ +

What we tell other users about you

+ + In general we identify content that you've posted by your full name. In + an attempt to protect you from unsolicited bulk email (spam), we keep your + email address hidden except from other registered users. + +

Basic Information

+ +
    +
  • Name:
    • +
  • User ID:
    • +
  • Email Address:
    • +
  • Personal URL:
    • +
  • Screen Name:
    • +
+ + + + + + + Our server can tell your browser to remember certain things, such as your + email address and password. This is convenient for you because, if you're + the only person who uses your computer, you won't have to keep telling us + your email address and password. +

+ It would be a very bad idea to choose this option if you're using a + shared computer in a library or school. Any subsequent user of this machine + would be able to masquerade as you on our service. +

+ Note that you can erase your saved email address and password by choosing + the "log out" option from your workspace. +

+ + + + Current users: Please enter your email and password below. +

+ New users: Please begin the registration process + by entering a valid email address and leaving the password field blank. + You will be directed to another form to complete your registration. +

  + + + + Current users: Please enter your screen name and password below. +

+ New users: Please begin the registration process + by entering your desired screen name and leaving the password field blank. + You will be directed to another form to complete your registration. +

  + + + +
+ Note: Our personalized web services require that your browser be enabled for JavaScript and cookies. + + + + You have been sent an email that will allow you to change your password. + + + + Unable to send password recovery information via email. +

+ Please contact the system administrator for further help in recovering your password. + + + +

+ + + + + +
Note: For security reasons, the login page + expires after a certain interval to prevent malicious attackers from logging + in as you using cached browser passwords.
+ + + + + +

My Control Centers

+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/lucene/xsl/search.xsl b/ccm-core/web/themes/heirloom/packages/lucene/xsl/search.xsl new file mode 100644 index 000000000..9493ec3b3 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/lucene/xsl/search.xsl @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TitleSummaryCreated OnModified OnScore
+ + + + + + + + + + + + + + +
+ + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/permissions/xsl/permissions.xsl b/ccm-core/web/themes/heirloom/packages/permissions/xsl/permissions.xsl new file mode 100644 index 000000000..ba849fcaa --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/permissions/xsl/permissions.xsl @@ -0,0 +1,103 @@ + + + + + + + + + + bebop:dimensionalNavbar + + +  >  + +

+ /bebop:dimensionalNavbar + + + +

    + +
    • +     +
+ + + +
    +
    • +     +
+ + + +

+ + + + + + + + + + +   + + + + + + + + + + + + + +   + + + + + + + + + + + +   + + + + + + + + +   + + + + + + +
+

You don't have permission to perform the requested action.

+
+ + + + +

Your search returned no results.

+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/placeholder.info b/ccm-core/web/themes/heirloom/packages/placeholder.info new file mode 100644 index 000000000..e677ccd1e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/placeholder.info @@ -0,0 +1,5 @@ +Place holder file to make sure the directory is created and copied with the +appropriate permissions. + +Dir packages, a container for files which are shared among several CCM packages, +especially provided by core (e.g. bebop). \ No newline at end of file diff --git a/ccm-core/web/themes/heirloom/packages/search/xsl/search.xsl b/ccm-core/web/themes/heirloom/packages/search/xsl/search.xsl new file mode 100644 index 000000000..33336c006 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/search/xsl/search.xsl @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + +
+ Displaying page + + of + + (maximum of + + results per page) +
+ + + + +
+ + + There were no results for your search + + + Displaying results + + through + + + (total: + + ) + + + +
+ + + + +
+ + <<<Previous + + Page + + of + + + Next >>> + +
+ + + + + + + + + + + + + + + + + + odd + even + + + + + +
ScoreTitleSummary
+ + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + Query: + + + + + + + + + Types: + + + + + + + + + Categories: + + + +
+ + + + + + checked + + + Include subcategories + + + + diff --git a/ccm-core/web/themes/heirloom/packages/toolbox/xsl/AbstractCollectionTable.xsl b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/AbstractCollectionTable.xsl new file mode 100644 index 000000000..e279e080d --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/AbstractCollectionTable.xsl @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + +
+ + + + 0 + asc + + + +   + + + +   + + /assets/gray-triangle-up.gif/assets/gray-triangle-down.gif + + + +   +   + + +   + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/toolbox/xsl/ControlBar.xsl b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/ControlBar.xsl new file mode 100644 index 000000000..5fef0a72e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/ControlBar.xsl @@ -0,0 +1,36 @@ + + + + + + + + + +
+ + + + + + + +
+ + + + + | + +
+
+ + + diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/debug-panel.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/debug-panel.xsl new file mode 100644 index 000000000..b69689194 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/debug-panel.xsl @@ -0,0 +1,326 @@ + +]> + + + + + +
+

Debug Options

+ + +
+ + + + + + + Debug + +   + + + + + + + + + + + +

Page structure

+

Legend:

+
    +
  • Branch visible, self visible
    • +
  • Branch visible, self invisible
    • +
  • Branch invisible, self visible
    • +
  • Branch invisible, self-invisible
    • +
  • bold if selected
    • +
+ 
+      
+        
+          
+        
+      
+
+

XML before transformation

+ 
+      
+        
+      
+
+

Stack traces

+
+ + + +
+ + + +

State

+ +

Selected:

+ + +

Event: + Value: +

+ + + + +

Params

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + font-weight: bold; + + + + selectedComponent + + + + + + + + + + + + + + + + + + + + + + color: LightPink; + color: FireBrick; + color: HotPink; + color: LightSteelBlue; + CANNOT GET HERE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &lf; + + + + + + + + + + + + + &lf; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &lf; + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 
+          
+
+
+ + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/simple-page.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/simple-page.xsl new file mode 100644 index 000000000..136744b4e --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/simple-page.xsl @@ -0,0 +1,160 @@ + + + + + + + + + + + + <xsl:call-template name="bebop:pageTitle"/> + + + + + + + + +
+ +
+ + + + + +
+ + + + +
+
+ + + + + +
+ + + + +
+
+ + + + + +
+
+ +
+
+ + + + + +
+ + + + +
+
+ + + + + + + +
+ + + + + +
+ + + + + +
+ + + + +
+
+ + + + + +
+ + + + +
+
+ + + + + +
+ +
+ + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + +
+ + + +
+ +
+
+ +
+ + + + diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/site-banner.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/site-banner.xsl new file mode 100644 index 000000000..def6807ca --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/site-banner.xsl @@ -0,0 +1,23 @@ + + + + + + + +
+ If you encounter any problems using + + http:/// + + please contact the + mailto: + site administrator. +
+ + + + + diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/ui.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/ui.xsl new file mode 100644 index 000000000..61aa5c401 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/ui.xsl @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/url-encoding.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/url-encoding.xsl new file mode 100644 index 000000000..3fec605a4 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/url-encoding.xsl @@ -0,0 +1,66 @@ + + + + + + + + + + !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ +  ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ + + + !'()*-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~ + + 0123456789ABCDEF + + + + + + + + + + + + + + + + + + + + Warning: string contains a character that is out of range! Substituting "?". + 63 + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/user-banner.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/user-banner.xsl new file mode 100644 index 000000000..2c71985f5 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/user-banner.xsl @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + +
       + + + + +
+ +   + +   + + +
+ 		+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
       + + + + +
+ You are not currently logged in +
+ 		+ + + + + Login + +
+ + + + + diff --git a/ccm-core/web/themes/heirloom/packages/versioning/footer.jspf b/ccm-core/web/themes/heirloom/packages/versioning/footer.jspf new file mode 100644 index 000000000..387f7b9ff --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/versioning/footer.jspf @@ -0,0 +1,4 @@ +
+

<%= new java.util.Date() %> + + diff --git a/ccm-core/web/themes/heirloom/packages/versioning/graph.jsp b/ccm-core/web/themes/heirloom/packages/versioning/graph.jsp new file mode 100644 index 000000000..aeb9e19c6 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/versioning/graph.jsp @@ -0,0 +1,25 @@ +<%@ page + import="com.arsdigita.versioning.VersioningServlet.GraphPrinter" +%> + +<%@ include file="header.jspf" %> + +

Versioning Dependence Graph

+ +
+<%
+  GraphPrinter printer = (GraphPrinter) request.getAttribute("graphPrinter");
+
+  if ( printer == null ) {
+      throw new ServletException("couldn't find the printer attribute");
+  }
+  printer.setWriter(out);
+  printer.printGraph();
+%>
+
+ +
+ Main +
+ +<%@ include file="footer.jspf" %> diff --git a/ccm-core/web/themes/heirloom/packages/versioning/header.jspf b/ccm-core/web/themes/heirloom/packages/versioning/header.jspf new file mode 100644 index 000000000..6ffb01ef2 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/versioning/header.jspf @@ -0,0 +1,6 @@ + + + <%= (String) request.getAttribute("title") %> + + + diff --git a/ccm-core/web/themes/heirloom/packages/versioning/main.jsp b/ccm-core/web/themes/heirloom/packages/versioning/main.jsp new file mode 100644 index 000000000..802cbbd2c --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/versioning/main.jsp @@ -0,0 +1,56 @@ +<%@ page + import="com.arsdigita.versioning.VersioningServlet.VersionedObjects, + com.arsdigita.persistence.OID, + java.net.URLEncoder" +%> + +<%@ include file="header.jspf" %> + +
+Object type: + + + + +<% + VersionedObjects oids = (VersionedObjects) request.getAttribute("versionedObjects"); + if ( oids!= null && oids.size() > 0 ) { +%> + +

OIDs

+ +<% + } +%> + + + + + + +<% + + if ( oids != null ) { + while ( oids.hasNext() ) { + String serOID = (String) oids.next(); + String strOID = oids.getOID().toString(); + String encoded = URLEncoder.encode(serOID); + String href = "txns?cmd=showTxns&oid=" + encoded; + String taggedHref = href + "&tagged=yes"; +%> + + + + + +<% + } + } +%> +
Data ObjectShow Txns
<%= strOID %>affectingtagged
+ + + +<%@ include file="footer.jspf" %> diff --git a/ccm-core/web/themes/heirloom/packages/versioning/rollback.jsp b/ccm-core/web/themes/heirloom/packages/versioning/rollback.jsp new file mode 100644 index 000000000..5d400f254 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/versioning/rollback.jsp @@ -0,0 +1,31 @@ +<%@ page + autoFlush="true" + contentType="text/plain" + import="com.arsdigita.versioning.VersioningServlet.RollbackLogger, + com.arsdigita.persistence.OID, + com.arsdigita.util.AssertionError, + java.io.IOException, + java.io.PrintWriter, + java.math.BigInteger" +%> + +<% + RollbackLogger rbl = (RollbackLogger) request.getAttribute("logger"); + + if ( rbl == null ) { + throw new ServletException("couldn't find the logger attribute"); + } +%> + +Rolling back <%= rbl.getOID() %> to txnID=<%= rbl.getTxnID() %> + +<% + rbl.setWriter(out); + try { + rbl.rollback(); + } catch (RuntimeException ex) { + rbl.printException(ex); + } catch (AssertionError er) { + rbl.printException(er); + } +%> diff --git a/ccm-core/web/themes/heirloom/packages/versioning/txns.jsp b/ccm-core/web/themes/heirloom/packages/versioning/txns.jsp new file mode 100644 index 000000000..fd7c9a524 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/versioning/txns.jsp @@ -0,0 +1,50 @@ +<%@ page + import="com.arsdigita.versioning.Tag, + com.arsdigita.versioning.Transaction, + com.arsdigita.versioning.TransactionCollection, + com.arsdigita.persistence.OID, + com.arsdigita.developersupport.Debug, + java.math.BigInteger, + java.util.Date" +%> + +<%@ include file="header.jspf" %> + +<% + TransactionCollection txnColl = + (TransactionCollection) request.getAttribute("txns"); + if ( txnColl == null ) { + throw new ServletException("couldn't find the txns attribute"); + } + OID oid = (OID) request.getAttribute("oid"); + if ( oid == null ) { + throw new ServletException("couldn't find the oid attribute"); + } + String encodedOID = (String) request.getAttribute("encodedOID"); + %> + +

Txns for <%= oid.toString() %>

+ + + +<% + while ( txnColl.next() ) { + Transaction txn = txnColl.getTransaction(); + BigInteger id = txn.getID(); + String strID = id.toString(); + Date date = txn.getTimestamp(); + String strDate = String.valueOf(date); + String href = "rollback?cmd=rollback&txnID=" + id + "&oid=" + encodedOID; +%> + + + + + +<% + } +%> + +
<%= id %><%= date %>
+ +<%@ include file="footer.jspf" %> diff --git a/ccm-core/web/themes/heirloom/packages/versioning/vlog.css b/ccm-core/web/themes/heirloom/packages/versioning/vlog.css new file mode 100644 index 000000000..a93416159 --- /dev/null +++ b/ccm-core/web/themes/heirloom/packages/versioning/vlog.css @@ -0,0 +1,60 @@ +body { + background: white; + color: black; + margin-left: 3%; + margin-right: 3%; +} + +td { + padding-left: 8px; + margin-top: 0px; + margin-bottom: 0px; + font-family: arial, helvetica; + font-size: x-small; +} + +p { + font-family: georgia, arial, helvetica; + font-size: x-small; +} + +th { + font-family: arial, helvetica; + text-align: left; + padding-left: 8px; + font-size: x-small; + background-color: #878175; + color: white; +} + +h1 { + font-family: arial, helvetica; + font-weight: bold; + margin-bottom: 4px; +} + +h2 { + font-family: arial, helvetica; + font-size: small; + font-weight: bold; + margin-bottom: 4px; + margin-top: 4px; +} + +pre { + display: block; + font-family: monospace; + white-space: pre; + margin: 0%; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + padding-left: 1ex; + padding-right: 1ex; + width: 100%; +} + +pre.programlisting { + background: WhiteSmoke; + color: black; + border: 1px solid black; +} diff --git a/ccm-core/web/themes/heirloom/placeholder.info b/ccm-core/web/themes/heirloom/placeholder.info new file mode 100644 index 000000000..2f0a5833b --- /dev/null +++ b/ccm-core/web/themes/heirloom/placeholder.info @@ -0,0 +1,5 @@ +Place holder file to make sure the directory is created and copied with the +appropriate permissions. + +Heirloom, a container for the built-in theme of the previous Red Hat CCM. +Serves still as a fallback for various newer themes if nothing else is working. \ No newline at end of file diff --git a/ccm-core/web/themes/placeholder.info b/ccm-core/web/themes/placeholder.info new file mode 100644 index 000000000..73aeb47bd --- /dev/null +++ b/ccm-core/web/themes/placeholder.info @@ -0,0 +1,5 @@ +Place holder file to make sure the directory is created and copied with the +appropriate permissions. + +Container for all the various themes, each in its own directory or directory +tree, which make up the design and look & feel of a site. \ No newline at end of file diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg index 08d741617..9e28de10b 100755 --- a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg @@ -14,7 +14,6 @@ ccm-cms-assets-relatedlink # -- ccm-cms-types-address ccm-cms-types-article ccm-cms-types-bookmark -ccm-cms-types-contact ccm-cms-types-event ccm-cms-types-faqitem ccm-cms-types-filestorageitem @@ -23,11 +22,13 @@ ccm-cms-types-formsectionitem ccm-cms-types-glossaryitem ccm-cms-types-mparticle ccm-cms-types-newsitem +ccm-cms-types-simpleaddress # Applications # -- ccm-docmgr ccm-forum ccm-forum-categorised +ccm-themedirector ccm-user-preferences # LDN extensions @@ -38,7 +39,6 @@ ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite ccm-ldn-terms -ccm-ldn-theme ccm-ldn-util # integration layer app diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties index a1cef9f61..0fb81f5ba 100755 --- a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties @@ -96,10 +96,10 @@ com.arsdigita.london.search.show_sponsored_links=true com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -com.arsdigita.london.theme.default_theme_context= -com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf -com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic -com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xml xsl +themedirector.default_theme_context= +themedirector.default_theme_manifest=ccm-gen-aplaws.web.mf +themedirector.default_theme_path=__ccm__/themes/aplaws-generic +themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # com.arsdigita.london.cms.dublin.audience_domain=LGAL diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg index d605bc4cf..588a1ec36 100755 --- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg @@ -41,6 +41,9 @@ ccm-ldn-terms ccm-ldn-theme ccm-ldn-util +# sci extensions +# -------------- +ccm-sci-publications # integration layer app ccm-gen-aplaws diff --git a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt index 73c1cb5bf..bf5a09a50 100755 --- a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt +++ b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt @@ -35,3 +35,7 @@ http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::ur # Global default, from application's own web app http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl + +# Global default, from application's own web app - relocated version >= 6.6.1 +http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl +http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql deleted file mode 100755 index 1e238fe7c..000000000 --- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql +++ /dev/null @@ -1 +0,0 @@ -@@ default/default-theme.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql deleted file mode 100755 index 12df8a632..000000000 --- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql +++ /dev/null @@ -1 +0,0 @@ -@@ ../oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql deleted file mode 100755 index c82cbc756..000000000 --- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql +++ /dev/null @@ -1,3 +0,0 @@ -begin; -\i default/default-theme.sql -commit; diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql deleted file mode 100755 index c921550c8..000000000 --- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql +++ /dev/null @@ -1 +0,0 @@ -\i ../postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql deleted file mode 100755 index 91e97eb6c..000000000 --- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql +++ /dev/null @@ -1,5 +0,0 @@ -begin; - -\i ../postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql - -commit; diff --git a/ccm-ldn-theme/src/ccm-ldn-theme.config b/ccm-ldn-theme/src/ccm-ldn-theme.config deleted file mode 100755 index a400df463..000000000 --- a/ccm-ldn-theme/src/ccm-ldn-theme.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig_parameter.properties b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig_parameter.properties deleted file mode 100755 index 5e94b6d4b..000000000 --- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig_parameter.properties +++ /dev/null @@ -1,44 +0,0 @@ -com.arsdigita.london.theme.file_extensions.title=Graphics File Extensions (Themes) -com.arsdigita.london.theme.file_extensions.purpose=A list of file extensions that should be included when the designer requests 'all graphics files' -com.arsdigita.london.theme.file_extensions.example=jpeg jpg gif xsl css js png -com.arsdigita.london.theme.file_extensions.format=[string] - -com.arsdigita.london.theme.default_theme_dir.title=The path to the default themes directory (Themes Application) -com.arsdigita.london.theme.default_theme_dir.purpose=This is the path to the defalut themes directory. When a new "theme" is created, this directory is copied and the new directory is the base for the new themes. It is provided relative to the "webapps" directory. -com.arsdigita.london.theme.default_theme_dir.example=/ROOT/__ccm__/themes/aplaws/ -com.arsdigita.london.theme.default_theme_dir.format=[string] - -com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.title=The number of seconds before checking for update of published theme files [0 means never start] (Themes Application) -com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.purpose=This is the number of seconds before checking for recently published files. It should only be used on multi-jvm installations since the files are already synced on single jvm settings. -com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.example=[300] -com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.format=[integer] - -com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.title=The number of seconds between checks for recently published theme files (Themes Application) -com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.purpose=This is the number of seconds between checks for recently published files. It should only be used on multi-jvm installations since the files are already synced on single jvm settings. -com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.example=[300] -com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.format=[integer] - -com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.title=The number of seconds before checking for updated development theme files [0 means never start] (Themes Application) -com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.purpose=This is the number of seconds before checking for updated development files. It should only be used on multi-jvm installations since the files are already synced on single jvm settings. -com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.example=[300] -com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.format=[integer] - -com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.title=The number of seconds between checks for update development theme files (Themes Application) -com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.purpose=This is the number of seconds between checks for updated development files. It should only be used on multi-jvm installations since the files are already synced on single jvm settings. -com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.example=[300] -com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.format=[integer] - -com.arsdigita.london.theme.default_theme_manifest.title=The manifest file containing the default themes directory (Themes Application) -com.arsdigita.london.theme.default_theme_manifest.purpose=This is the manifest file containing the default themes directory. This is used in conjuntion with com.arsdigita.london.theme.default_directory_filter to dictate the final default directoroy. -com.arsdigita.london.theme.default_theme_manifest.example=[ccm-ldn-theme.web.mf] -com.arsdigita.london.theme.default_theme_manifest.format=[string] - -com.arsdigita.london.theme.default_theme_path.title=The path to the directory for the default theme (Themes Application) -com.arsdigita.london.theme.default_theme_path.purpose=This is the directory that all of the default themes are copied from. It is specified and used to filter out files listed in the manifest file chosen specified by the com.arsdigita.london.theme.default_theme_manifest.title attribute. If this is null then no filter is applied. -com.arsdigita.london.theme.default_theme_path.example=[__ccm__/themes/default/] -com.arsdigita.london.theme.default_theme_path.format=[string] - -com.arsdigita.london.theme.default_theme_context.title=The servlet context containing the theme -com.arsdigita.london.theme.default_theme_context.purpose=This is the servlet context path containing the theme. It should start and end with a / -com.arsdigita.london.theme.default_theme_context.example=[/ccm-ldn-theme/] -com.arsdigita.london.theme.default_theme_context.format=[string] diff --git a/ccm-ldn-theme/.classpath b/ccm-themedirector/.classpath similarity index 100% rename from ccm-ldn-theme/.classpath rename to ccm-themedirector/.classpath diff --git a/ccm-ldn-theme/.project b/ccm-themedirector/.project similarity index 100% rename from ccm-ldn-theme/.project rename to ccm-themedirector/.project diff --git a/ccm-ldn-theme/.settings/org.eclipse.jdt.core.prefs b/ccm-themedirector/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from ccm-ldn-theme/.settings/org.eclipse.jdt.core.prefs rename to ccm-themedirector/.settings/org.eclipse.jdt.core.prefs diff --git a/ccm-ldn-theme/.settings/org.eclipse.jdt.ui.prefs b/ccm-themedirector/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from ccm-ldn-theme/.settings/org.eclipse.jdt.ui.prefs rename to ccm-themedirector/.settings/org.eclipse.jdt.ui.prefs diff --git a/ccm-ldn-theme/.svnignore b/ccm-themedirector/.svnignore similarity index 100% rename from ccm-ldn-theme/.svnignore rename to ccm-themedirector/.svnignore diff --git a/ccm-ldn-theme/TODO b/ccm-themedirector/TODO similarity index 100% rename from ccm-ldn-theme/TODO rename to ccm-themedirector/TODO diff --git a/ccm-ldn-theme/application.xml b/ccm-themedirector/application.xml similarity index 81% rename from ccm-ldn-theme/application.xml rename to ccm-themedirector/application.xml index c1a535b94..f503dc0db 100755 --- a/ccm-ldn-theme/application.xml +++ b/ccm-themedirector/application.xml @@ -1,8 +1,8 @@ @@ -16,7 +16,7 @@ - The theme package allows graphic designers a way to upload files + The themedirector package allows graphic designers a way to upload files that can then be used alter the styling within a subsite. diff --git a/ccm-ldn-theme/doc/theme-standalone/README b/ccm-themedirector/doc/theme-standalone/README similarity index 84% rename from ccm-ldn-theme/doc/theme-standalone/README rename to ccm-themedirector/doc/theme-standalone/README index 6aacc8c7b..78c1fa7a0 100644 --- a/ccm-ldn-theme/doc/theme-standalone/README +++ b/ccm-themedirector/doc/theme-standalone/README @@ -1,3 +1,7 @@ +As of CCM version 6.6.1 package ccm-ldn-themes became a generic package and +has been renamed to ccm-themedirector. +All names below and anywhere in the files should be adopted accordingly. + Up to APLAWS version 1.0.4 theme had been installed into its own application context: [webapps]/ccm-ldn-theme. diff --git a/ccm-ldn-theme/doc/theme-standalone/bebop-define.tld b/ccm-themedirector/doc/theme-standalone/bebop-define.tld similarity index 100% rename from ccm-ldn-theme/doc/theme-standalone/bebop-define.tld rename to ccm-themedirector/doc/theme-standalone/bebop-define.tld diff --git a/ccm-ldn-theme/doc/theme-standalone/bebop-show.tld b/ccm-themedirector/doc/theme-standalone/bebop-show.tld similarity index 100% rename from ccm-ldn-theme/doc/theme-standalone/bebop-show.tld rename to ccm-themedirector/doc/theme-standalone/bebop-show.tld diff --git a/ccm-ldn-theme/doc/theme-standalone/web.xml b/ccm-themedirector/doc/theme-standalone/web.xml similarity index 100% rename from ccm-ldn-theme/doc/theme-standalone/web.xml rename to ccm-themedirector/doc/theme-standalone/web.xml diff --git a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl b/ccm-themedirector/pdl/com/arsdigita/themedirector/Theme.pdl similarity index 87% rename from ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl rename to ccm-themedirector/pdl/com/arsdigita/themedirector/Theme.pdl index e1d39b767..49e0b02ce 100755 --- a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl +++ b/ccm-themedirector/pdl/com/arsdigita/themedirector/Theme.pdl @@ -15,17 +15,17 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.theme; +model com.arsdigita.themedirector; import com.arsdigita.web.Application; import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.Party; -object type ThemeApplication extends Application { - Theme[0..1] defaultTheme = join theme_app.default_theme_id to - theme_themes.theme_id; +object type ThemeDirector extends Application { + Theme[0..1] defaultTheme = join theme_director.default_theme_id + to theme_themes.theme_id; - reference key (theme_app.application_id); + reference key (theme_director.application_id); } // This represents a collection of files that can be used to diff --git a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl b/ccm-themedirector/pdl/com/arsdigita/themedirector/ThemeFile.pdl similarity index 98% rename from ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl rename to ccm-themedirector/pdl/com/arsdigita/themedirector/ThemeFile.pdl index 7b07349fe..2a0fafa2b 100755 --- a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl +++ b/ccm-themedirector/pdl/com/arsdigita/themedirector/ThemeFile.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.theme; +model com.arsdigita.themedirector; object type ThemeFile { diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/default/theme-files-unique-constraint.sql b/ccm-themedirector/sql/ccm-themedirector/default/theme-files-unique-constraint.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/default/theme-files-unique-constraint.sql rename to ccm-themedirector/sql/ccm-themedirector/default/theme-files-unique-constraint.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se-create.sql b/ccm-themedirector/sql/ccm-themedirector/oracle-se-create.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se-create.sql rename to ccm-themedirector/sql/ccm-themedirector/oracle-se-create.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/postgres-create.sql b/ccm-themedirector/sql/ccm-themedirector/postgres-create.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/postgres-create.sql rename to ccm-themedirector/sql/ccm-themedirector/postgres-create.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/default/default-theme.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/1.0.0-1.0.1/default-theme.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/default/default-theme.sql rename to ccm-themedirector/sql/ccm-themedirector/upgrade/default/1.0.0-1.0.1/default-theme.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql new file mode 100755 index 000000000..64e2673bb --- /dev/null +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql @@ -0,0 +1 @@ +@@ default/1.0.0-1.0.1/default-theme.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.1-1.0.2.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql rename to ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.1-1.0.2.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql new file mode 100755 index 000000000..c3f47589f --- /dev/null +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql @@ -0,0 +1 @@ +@@ oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql new file mode 100644 index 000000000..9f6fdb94b --- /dev/null +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -0,0 +1,22 @@ +-- +-- Copyright (C) 2011 Peter Boy All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $DateTime: 2011/03/27 23:15:09 $ +-- $Id: oracle-se-6.6.0-6.6.1 pboy $ + +@@ default/6.3.0-6.3.1/upd_theme_app_table.sql +@@ default/6.3.0-6.3.1/upd_system_tables.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql rename to ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql new file mode 100755 index 000000000..c9b402648 --- /dev/null +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql @@ -0,0 +1,3 @@ +begin; +\i default/1.0.0-1.0.1/default-theme.sql +commit; diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql new file mode 100755 index 000000000..31afca8dc --- /dev/null +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql @@ -0,0 +1 @@ +\i postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql new file mode 100755 index 000000000..62af03a38 --- /dev/null +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql @@ -0,0 +1,5 @@ +begin; + +\i postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql + +commit; diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql new file mode 100644 index 000000000..6d66821db --- /dev/null +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql @@ -0,0 +1,27 @@ +-- +-- Copyright (C) 2011 Peter Boy All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $DateTime: 2010/11/10 23:15:09 $ + +\echo Red Hat Enterprise ccm-themedirector 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) + +begin; + +\i default/6.3.0-6.3.1/upd_theme_app_table.sql +\i default/6.3.0-6.3.1/upd_system_tables.sql + +commit; diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql rename to ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql similarity index 100% rename from ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql rename to ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql diff --git a/ccm-themedirector/src/ccm-themedirector.config b/ccm-themedirector/src/ccm-themedirector.config new file mode 100755 index 000000000..abe1dd067 --- /dev/null +++ b/ccm-themedirector/src/ccm-themedirector.config @@ -0,0 +1,5 @@ + + + + diff --git a/ccm-ldn-theme/src/ccm-ldn-theme.load b/ccm-themedirector/src/ccm-themedirector.load similarity index 65% rename from ccm-ldn-theme/src/ccm-ldn-theme.load rename to ccm-themedirector/src/ccm-themedirector.load index a217ccd2a..ad4502297 100755 --- a/ccm-ldn-theme/src/ccm-ldn-theme.load +++ b/ccm-themedirector/src/ccm-themedirector.load @@ -9,10 +9,10 @@ - + - - + + diff --git a/ccm-ldn-theme/src/ccm-ldn-theme.upgrade b/ccm-themedirector/src/ccm-themedirector.upgrade similarity index 75% rename from ccm-ldn-theme/src/ccm-ldn-theme.upgrade rename to ccm-themedirector/src/ccm-themedirector.upgrade index 1197c14f8..e146253a5 100755 --- a/ccm-ldn-theme/src/ccm-ldn-theme.upgrade +++ b/ccm-themedirector/src/ccm-themedirector.upgrade @@ -8,4 +8,7 @@