Commit Graph

34 Commits

Author SHA1 Message Date
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
df32d0ddf1 adding support for wcm tinymce extensions to create html from web content wizard
- extracted file picker backing code into its own bean
- refactoring for to extract file picker bean
- refactoring to manage uploads from file picker outside of xforms context
- added some language utility methods to common.js
- refactored extension dialogs to deal with quirkyness of tinymce dialog codebase on IE - mostly works now and addressed bug WCM-471
- resourcifying a couple strings i missed in filepickerbean

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-14 22:03:10 +00:00
Ariel Backenroth
6e0afbf34c various minor bug fixes to create/edit form, parseXMLDocuments
- WCM-351 fixes to select workflow screen on IE (weird onchange behavior)
- WCM-468 fixes to remove rendering engine
- doing the jsp 2.0 thing
- WCM-427 fix to encoding issue with parseXMLDocuements
- fix for remove rendering engine templates in create form (wasn't clearing the list in init)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-04 21:02:05 +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
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
Paul Holmes-Higgin
7fd19e7e88 Updated copyright
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 17:17:36 +00:00
Derek Hulley
aa5f666c21 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
      - FLOSS
      - Some files will need a follow-up
         -root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
         -root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
         -onContentUpdateRecord (not on HEAD)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 06:44:46 +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
Paul Holmes-Higgin
acb00e83dd Changed licence headers
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 18:59:58 +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
208716aadc making summary screens mostly consistent. this is a stop gap until after beta when we will make them prettier.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-13 01:17:12 +00:00
Ariel Backenroth
2063aa7426 adding the ability to save a draft from the xforms ui. currently this is only surfaced when clicking back in the create web content wizard (it saves a draft so that entered values don't get blown away).
also fixing a couple bugs related to namespaces within instance data.  being more rigorous about placing the namespace prefix in the right place basically.

removing the wrapperelementbuilders from the schemaformbuilder.  they were confusing and not used anywhere.  (reduces cruft from the schemaformbuilder).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-12 22:03:30 +00:00
Kevin Roast
cc14e27cd6 . Output path pattern help added to Create Website wizard (Configure Form Templates and Web Form Details pages)
- help cursor mouse over added to help icon
 - incorrect alt text removed
 - renamed output path pattern help jsp page to standard naming convention
. Found that all "Required Field" images in our JSPs with ALT text were not I18N - find-and-replaced all occurances with an I18Ned message
. Some more WCM UI improvements/fixes
. Fix up of 3rd Party Eclipse project after xalan library changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-10 11:25:32 +00:00
Ariel Backenroth
a25d85ee83 - moving generic xml parsing utilities out of FormsService and into their own class
- refactoring to generate and regenerate methods to make it easier to use project level overridden properties, and to at some point (soon) make it possible to make error handling for rendering engines more robust
- added a web project object to encapsulate web project properties and provide a central location for getting forms and rendering engines with web project level overridden properties
- made select default workflow screen match wireframes
- using the same workflowdefault type in the wcm model for web projects and forms.
- using outputpathpattern aspect consistently
- using commons.io to parse paths
- using form name rather than noderef as parameter for selected form from content forms dashlet
- fixed bug where rendition properties noderef wasn't being properly associated with renditions causing problems with regenerate
- using multivalued properties to track renditions
- remove weird registerRendition/registerFormInstanceData calls.  no longer necessary since generateRendition and regenerate are done within forminstancedata and rendition
- adding default workflow parameters as property of Form
- adding a unique name property to rendering engine templates to allow for looking one up by name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-31 08:45:42 +00:00
Ariel Backenroth
2190c4f29d - adding aspect to webapp nodes to differentiate them from ordinary folders in the avm_webapps directory
- refactoring of generate and regenerate calls to take a FormInstanceData object
- adding in support for overriding step title and description properties in wizards so as to be able to format them with parameters
- making the step descriptions in create form wizard reiterate the form name so as to give the user better context
- displaying avm task resources in the manage task screen.  still need to get actions working and clean this up a bit.
- making output path patterns sandbox relative
- refactored utility method for combining avm paths sensitive to webapp vs sandbox relative paths.
- adding a default description for generated renditions

todo:
- cleanup some usage of AVMNode from ManageTaskBean
- get actions to appear in manage task screen
- add a multi value property to the web project for all its webapps
- properly use overridden values for forms from the web project settings

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-21 20:34:00 +00:00
Ariel Backenroth
08f2795110 - showing uploaded files in the summary screen for create web content
- more careful management of the formprocessing session.  need to actually have a session management object so as to clear the upload file list.
- fix for form selection dropdown in create web content
- properly updating uploaded files from edit xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-13 03:53:40 +00:00
Ariel Backenroth
ca7e5bdc80 - fixing multiple preview image problem with create web content summary screen.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-08 18:39:02 +00:00
Ariel Backenroth
406f9b4f4e - adding in a getRenditions call to forminstancedata
- some further cleanup and fixes for summary screens
- adding new repeat icons from linton
- fix for filename expanding endlessly when pressing the back button at the summary page for create web content.
- making the primaryfominstancedata property of rendition a sandbox relative path so as to make it easier to retrieve the corresponding xml in the same sandbox

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-07 21:03:58 +00:00
Ariel Backenroth
d8e78b8e22 - fix for tinymce usage where rather than collect all changes before unload, capture the onblur event and set the value then.
- use fle type image rather than rendering template icon in create web content summary screen
- save content before executing finish or next in create web content wizard - makes error handling more proper
- add output path pattern to summary screen for create form wizard
- handle chiba-state-changed event properly 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4514 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-05 02:24:08 +00:00
Ariel Backenroth
a55abcc3e0 ui cleanup to summary screens and configure rendering engine templates screen.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-30 00:36:28 +00:00
Ariel Backenroth
868cfc0f62 generate form instance data and renditions into a layer. when finish is pressed update the main sandbox with the changes. everything seems to work rather well other than actually previewing the content in the virtualization server. need to sort that out with jon.
still need to start the workflow but i've got all the hooks in place.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-21 02:06:06 +00:00
Kevin Roast
97cb403335 . Fix to issue with Create Web Content form initialised with the correct form template in the drop-down
. UI action and dialog framework for Snapshot Sandbox action

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4395 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-20 15:00:35 +00:00
Ariel Backenroth
19facbdd97 - first pass at summary screen for create form.
- making workflowdefinition immutable and adding getters so i can access bean properties from jsps.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-17 20:51:01 +00:00
Ariel Backenroth
612dd27044 first pass at summary screen for create web content.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4368 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-16 07:28:33 +00:00
Ariel Backenroth
fcb625735f - make edit of renditions bring up form editor rather than the editor for the file type.
- disable finish button on first screen of create web content wizard.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-26 22:25:24 +00:00
Ariel Backenroth
d1d378eac0 - getting terminology consistent
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-20 21:26:31 +00:00
Ariel Backenroth
fb7ab59141 - renaming everything in order to get consistent good terminology for forms.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-20 19:52:49 +00:00
Ariel Backenroth
226e840521 cleanup to jsps which render the xform. using a tag to render, removing all the java code. much prettier.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-19 19:14:55 +00:00
Ariel Backenroth
1507f7387a - terminology changes to wcmModel (needs to be propogated to java classes as well). template is now form. template output method is now form transformer.
- added an aspect to differentiate form derived from form transformer derived (allowed removing some workarounds from XSLTOutputMethod)

- namespacing variables passed to the xsl processor with alfresco:



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4154 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-18 19:01:45 +00:00
Ariel Backenroth
de8a5f73b2 preliminary ie support for the xforms ui.
- response.setContentType must be text/xml or responseXML will not get parsed by IE.
- getElementsByTagNameNS only works on mozilla...
- IE is much more picky about all elements explicitly setting position, top, and left, when using relative positioning
- IE's xpath implementation is non obvious and incomplete.  found a good explanation of how to use it here http://sarissa.sourceforge.net/doc/overview-summary.html#xpath.  requires a lot more manual labor to get things working, but in the end, does seem to work.  need to add in an abstraction layer...
- it fails dramatically when you terminate a list of properties with comma, meaing var bad = {foo:bar, foo2:bar2, }
var good = {foo:bar, foo2:bar2}
- ie event model is different, using the dojo abstraction layer seems to fix that, particularly for the submit buttons.  changed the way submit buttons are added to make the xforms stuff pull them rather than have the jsps add them to the xform.  thought this was necessary because of weird loading behavior in IE, but it probably wasn't.  either way - it's less code and more centralized now.




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-07 22:14:16 +00:00
Kevin Roast
d5604fda3d . UI bug fixes to the Create XML Form wizard:
- fixed issue where the Add To List button was enabled when nothing was selected - caused null-ptr exception when pressed in this state
 - fixed Next button enabled state when nothing is selected on the Configure Template Output Methods screen
. Removed "additional properties" checkbox and text in Create Web Content Wizard details page - not applicable for this wizard

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-06 15:58:59 +00:00
Ariel Backenroth
0f2bf9a3e0 - preliminary support for callouts using xsd:include. rewriting links in the schema now to point at the virtualization server. not the best solution. but i couldn't get LSResourceResolver to work (would have been the elegant solution) since i don't have access to the DOMConfiguration object within chiba - works great in the schemaformbuilder.
- sample implementation of a callout in the alfresco sample website; using a jsp to produce an included xsd that lists all available company_footer.xmls
- moving stuff around.  XFormsbean is now in the xforms package rather than ajax package - more relevant to that codebase.
- consolidating SchemaFormBuilder into one class since the inheritance hierarchy made very little sense. 
- refactored some of the sample website to reduce java code in the jsps and begining to think about a generic utility library for callouts and jsps that want to access templating generated data.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-28 04:06:01 +00:00
Kevin Roast
0ee6dbcfc8 . WCM UI
- Added Edit and Delete actions for AVM files and Delete action for AVM folders
   - Available on the Modified Items list for a user and also in the website sandbox browse screens
   - Edit is working using the inline editors for plain text and HTML files - XML form content editing to be integrated shortly!
   - Edit for non-inline editable files is working (i.e. download file), but no "Update" action available at present for saving updates
   - Delete will delete files/folders structures from the current sandbox, deleted files in a layer are shown in My Modified Files (see below)
 - User sandbox My Modified Files now shows deleted files as differences (as ghosted out rows)
 - Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
   - responsible for creating content in the AVM store rather than usual SpacesStore
   - removed XML specific handling from Create Content Wizard (now only present in Create Web Content Wizard)
 - Create Content action added to sandbox view - NOTE: does not yet create content in the AVM world!
 - Added "jsp" filetype as plain text format mimetype (to allow inline-edit for JSP files as website content)
 - Open/closed state of My Modified Files panel is remembered between screen refreshes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-20 14:32:29 +00:00