Commit Graph

27 Commits

Author SHA1 Message Date
Ariel Backenroth
4f5f15419f first pass at locking related ui work.
- adding lock icons to the ui
- using lock aware service for create and edit web content.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-20 07:08:59 +00:00
Ariel Backenroth
e2dd65b1b4 fix and unit test for Schema2XForms
- adding a unit test.  currently just tests repeat properties and instance data.
- fix for problem with obtaining particle for element references.  addresses bug WCM-508
- new regenerate renditions icons from linton


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-18 19:06:51 +00:00
Ariel Backenroth
710ac5b727 externalizing widget config for xforms to xml
- adding a utility method to ConfigElement to get a list of child config elements by name
- using JSONObject to generate js rendition of config
- adding a build script to build json.jar since json.org only distributes source
- adding a preview link for form instance data to create web content summary screen
- doing the full jsp2.0 thing with summary screen for create website, i have a hunch it will fix a websphere issue

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-13 21:11:24 +00:00
Ariel Backenroth
85ef9488da git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 2007-05-03 21:33:03 +00:00
Ariel Backenroth
9c3197d467 most of the way through making the wcm tinymce extensions available from create html. still need to address:
- IE issues
- how to handle uploaded files from the create html context
- break out the filepicker backing code into its own bean (it's mingled into the XFormsBean at the moment)

also reorganizing and pruning the xforms unit test tree.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-03 21:26:41 +00:00
Ariel Backenroth
52950cfcfb xforms ui updates and fixes
- WCM-261:  only one active tinymce instance per page.  also extracted tinymce to what will soon be externally configurable parameters which enables different button configurations based on appearance.  having on instance per page does seem to provide a marginal performance boost
- WCM-453: better error message when creating content with a filename that already exists.
- WCM-431: providing tooltips on label based on a hint annotation
- test case for recursive schemas (haven't addressed the bug)
- fix for create web content for non form based content

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-02 21:56:36 +00:00
Ariel Backenroth
172b86dab4 updates to date time pickers
- make them behave better as inline elements for hgroup support
- respect minInclusive, maxInclusive, minExclusive and maxExclusive restrictions for date types.  no support in dojo to support the same with the TimePicker.  addresses feature request WCM-379.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-28 21:34:15 +00:00
Ariel Backenroth
1b898fb23e checkpoint of xforms improvements
- mostly functional hgroup implementation
- refactoring to support hgroups, make widgets behave better as inline elements
- figured out a way to get rid of dojo's inflight error watcher
- partial support for totalDigits (blocked by a dojo bug)
- improved support for length schema constraint
- refactoring of create widget code on the way to supporting config based on schema type, xform type, and appearance
- fix for silly bug in select workflow portion of create form wizard

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-27 22:33:37 +00:00
Derek Hulley
69694b7ac0 Merged V2.0 to HEAD
5456: (From WCM_DEPLOY)

There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
   root\projects\repository\config\alfresco\public-services-context.xml

Reverted:
   root\projects\web-client\source\web\images\icons\ajax_anim.gif

Reverted or Resolved (License text conflicts):
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
   svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
   svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
      - why the change in method naming convention?
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java

Modified:
   root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 01:41:14 +00:00
Derek Hulley
52a3fa1ed1 Merged V2.0 to HEAD
5146: AR-1122
   5148: AR-1116
   5149: RM-5
   5152: AR-1167
   5153: WCM-324
   5154: WCM-325, WCM-301, WCM-258, WCM-25, WCM-320
   5156: WCM-338
   5158: AR-1164
   5169: AR-1216
   5177: WCM-328


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 12:01:58 +00:00
Derek Hulley
0671335628 Merged V2.0 to HEAD
5144:  Original HEAD revision 5141 that was reverted
      WCM-317
      WCM-302
      WCM-333
      WCM-270
      WCM-312
      WCM-305
      WCM-298


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 11:46:17 +00:00
Derek Hulley
6aec329c9b Reverted HEAD revision 5141
svn merge svn://svn.alfresco.com:3691/alfresco/HEAD@5141 svn://svn.alfresco.com:3691/alfresco/HEAD@5140 .
   - 5141 was carried to V2.0 prior to this
   - No other actions are required


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-15 11:10:59 +00:00
Ariel Backenroth
b534839220 - fix for constraints for repeats. looks like a side effect of chiba upgrade. rather than constrain based on count(.) need to use count(../<nodeset>) since it seems like they are evaluating the constraints on individual items rather than the bind nodeset.
- fix for handling of fractionDigits for range controls
- automatically add namespace declarations for freemarker output path pattern expressions
- better error handling/reporting for output path patterns
- pass around formInstanceDataName for use in the label of the viewroot
- regenerate renditions on update
- updated unit tests
- use xf:minOccurs and xf:maxOccurs for repeat bindings rather than alfresco:minimum and alfresco:maximum (hadn't seen that it was part of the spec - not supported by chiba - but doesn't interfere)
- fix for attributes with fixed values

bugs fixed:
http://issues.alfresco.com/browse/WCM-317
http://issues.alfresco.com/browse/WCM-302
http://issues.alfresco.com/browse/WCM-333
http://issues.alfresco.com/browse/WCM-270
http://issues.alfresco.com/browse/WCM-312
http://issues.alfresco.com/browse/WCM-305
http://issues.alfresco.com/browse/WCM-298

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5141 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-14 19:14:36 +00:00
Ariel Backenroth
f6bf4acd5d localizing xforms codebase. adding javascript hash for string used from js.
multibyte fixes

appearance hints for textareas (full = rich text editor, minimal = plain text)

using xs:string for xforms:textarea
using xs:normalizedString for xforms:input

IMPORTANT:  you will need to recreate all forms in the web project after i check this in.  and for any of your own forms, you need to use xs:normalizedString as the type for textfields.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5028 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-03 00:01:08 +00:00
Ariel Backenroth
b3479d255a fix for include and import rewriting. don't rewrite absolute urls.
include fractionDigits in xf:range components to distinguish integer and real number sliders

fix for schema complex types with simple content (treat them as simpletypes).

fix for how namespaces are handled by the form generator.  it was surprisingly broken...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-25 23:21:50 +00:00
Ariel Backenroth
1c966e9a71 support for specifying appearance for select and select1 from the schema.
handling the case where create web content is called with no forms configured for the web project

some more progress on xf:switch

updated tests - including one from ken at berkeley who is trying to use forms to write grant applications.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-25 00:39:30 +00:00
Ariel Backenroth
53bddde72f - upgrading to dojo-0.4.1 to take advantage of some bug fixes, and some nicer apis.
- adding some preliminary support for xf:ranges for numerical types (chiba does not yet support ranges for date types).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-22 21:02:51 +00:00
Ariel Backenroth
4cd6ce00f8 adding support for schema date types xs:time, xs:gDay, xs:gMonth, xs:gYear, xs:MonthDay, xs:gYearMonth.
introducing concept of composite widgets for handling YearMonthPicker and MonthDayPicker.

streamlining call point for commiting value changes.

more work on implementing xf:switch.

removing deprecation warning from DatePickerGenerator.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-21 23:37:56 +00:00
Ariel Backenroth
7e22f28905 beginning to implement linton's updates to xforms screen.
- added ViewRoot which presents a title, rather than a bounding root group.  made the xform generator place all components within a single root group to support this.

- adding highlighting for the currently selected repeat item.  found a bunch of bugs in how the current repeat item is being set.  only dispatching the origin repeat select index for nested repeats.  correctly setting the repeat index after move operation

- updated css to match latest css changes to the product.

began implementing support for inherited complex schema types.
- adding support for xf:switch and xf:toggle in xforms.js.

- refactored and cleaned up a particularly hard to understand part of the xform generator which handles inherited complex types.

- not pretty printing the resulting xml from create web content or edit as it introduces unwanted text nodes which can confuse chiba when xsi:nil is used (i'm using xsi:nil to disable validation when i use xsi:type since otherwise there's a NullPointerException in chiba because it doesn't understand complex type definitions).

- need to think about the design a bit more before continuing with this.  chiba has limitations with how it handles xsi:type which makes it difficult to figure out the correct case to select at schema generation time, especially if the item is repeated.  also, currently the generator emits a select1 to select the type which controls the switch.  i'm not sure whether i actually want a separate select control to manage the switch...

added a test for date types and removed the old one.

added a test for inherited types.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-20 00:42:49 +00:00
Ariel Backenroth
98fe7f854f - adding some tests for types with restrictions.
- using xsi:nil to deal with invalid values (based on restrictions) for optional elements.  no equivalent solution for attributes which is unfortunate.  for attributes, the types will need to be able to accept empty string as a value for all types where no default is specified.  this fixes part of the bug with dealing with comboboxes with no default.

- more predictable inclusion of group headers using xf:appearance="repeated" attribute.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-13 21:16:45 +00:00
Ariel Backenroth
504c7f3528 fixing up components test to use new alfresco namespace.
adding a unit test for select1s to debug combobox issues.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-13 01:52:51 +00:00
Ariel Backenroth
1aa1bcb026 first pass at loading strings from resource bundles when converting the schema into an xform.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-15 02:59:47 +00:00
Ariel Backenroth
cb80c75014 first pass at add content from xforms ui
- added an add content panel to the file picker which enables browsing the local disk to select content to upload.  the file is uploaded without requiring a browser refresh by targeting a hidden iframe.  the server response includes a js call which notifies the form that the upload is complete.
- added annotations to ajax methods to enable specifying the response mime type of the method.  needed for uploadFile which returns html rather than xml
- minor cleanup in schemaformbuilder
- added mapping between xsl-fo mimetypes and those in mimetype map


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-12 03:13:23 +00:00
Ariel Backenroth
b492c906ff - updating the all component test and moving it into the simple-test directory (trying to consildate the directory structure a bit).
- adding group headers for compound elements
- minor refactoring to groups and repeats.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-07 10:28:25 +00:00
Ariel Backenroth
bb86b0138d - fixing a bug in jsf usage in create form details screen
- adding a sample of pdf renditioning
- adding all necessary jars for fop
- specifying xerces version in jar file name
- fixing error in simple-test.ftl

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-26 18:04:05 +00:00
Ariel Backenroth
b068224185 - first pass at freemarker integration
- hello world freemarker template for simple test (works!)
- fixing edit-xml - it was referring to CreateXmlContentTypeWizard which was renamed yesterday
- separating out customer code from prototype util code in press release example.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-16 19:45:00 +00:00
Ariel Backenroth
cea94661de putting a sanity check xsd and xsl that require absolutely no interaction.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-03 17:22:11 +00:00