Commit Graph

2351 Commits (4943b6a3ebbd7e06ef8ccff055c00c22e9c62d1c)
 

Author SHA1 Message Date
pb 8c3b2a4ab4 Removed separate labels in ThemeForm and BasicItemForm. Labels are now part of the widget.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2698 8810af33-2d31-482b-a856-94f89814c4df
2014-06-13 07:35:37 +00:00
pb 88b61faeb6 Fixed: missing globalization in content-center (#1763), fixed layout of error message (part of #2090).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2697 8810af33-2d31-482b-a856-94f89814c4df
2014-06-13 06:32:36 +00:00
jensp ba8419d8b2 The images attached to a ContentItem are now shown in a table.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2696 8810af33-2d31-482b-a856-94f89814c4df
2014-06-12 15:16:23 +00:00
sidoineghomsi 03f920d8c6 Der Hint ist jetzt richtig positioniert. Die Positionierung erfolgt jetzt neben dem Fragenzeichen(Ticket 2079).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2695 8810af33-2d31-482b-a856-94f89814c4df
2014-06-12 14:11:07 +00:00
sidoineghomsi 90f9da0912 Der Bearbeitungsschritt (Kategorien zuweisen) ist fertig gestaltet (Ticket 2081).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2694 8810af33-2d31-482b-a856-94f89814c4df
2014-06-12 12:48:47 +00:00
sidoineghomsi 45de659efb Änderung im CSS (ticket 2097 und 2081)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2692 8810af33-2d31-482b-a856-94f89814c4df
2014-06-11 09:28:07 +00:00
jensp 612e2e137f Moved the buttons in the FancyBox to the bottom of the image.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2689 8810af33-2d31-482b-a856-94f89814c4df
2014-06-11 08:25:41 +00:00
jensp 17c183a25a Included support for new label attribute at Bebop Widgets into Mandalay and the Heirloom theme.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2688 8810af33-2d31-482b-a856-94f89814c4df
2014-06-11 08:05:22 +00:00
jensp 6cf2fb1d57 Added a PrintListener to the SingleSelect for the default category system of the new ContentSection in the ContentSectionCreateForm. Before this change new Term Domains were not shown until CCM was restarted.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2685 8810af33-2d31-482b-a856-94f89814c4df
2014-06-10 15:43:20 +00:00
sidoineghomsi 440bbe4d90 Änderungen im CSS
git-svn-id: https://svn.libreccm.org/ccm/trunk@2684 8810af33-2d31-482b-a856-94f89814c4df
2014-06-10 11:14:35 +00:00
pb a7119bb541 Last part of ThemeDirector code fix. Errors in validation of input fields is now displayed along the respective input field. Fixed uncought exception, unclosed result set, various missing globalization.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2682 8810af33-2d31-482b-a856-94f89814c4df
2014-06-09 22:25:17 +00:00
pb 6c272debdd Fixed problem with copying default theme to new theme's directory. Added Label as Widget attribute (but not evaluated by Mandalay theme engine). Still a NPE if theme evaluation detects an error, e.g. duplicate theme url.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2681 8810af33-2d31-482b-a856-94f89814c4df
2014-06-07 14:44:09 +00:00
jensp e4823ae780 Added a text for the empty new of the table in the ContentSoonExpiredPane
git-svn-id: https://svn.libreccm.org/ccm/trunk@2677 8810af33-2d31-482b-a856-94f89814c4df
2014-06-06 17:06:48 +00:00
jensp 03a58e56e3 Added missing metadata for the MPA to the XML (#1930).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2675 8810af33-2d31-482b-a856-94f89814c4df
2014-06-06 13:37:55 +00:00
jensp f6ae155a06 Load systeminformation from easy to change source.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2673 8810af33-2d31-482b-a856-94f89814c4df
2014-06-06 11:59:22 +00:00
jensp b37c376eb6 Removed the links for "All my tasks..." from the AssignedTaskSection
git-svn-id: https://svn.libreccm.org/ccm/trunk@2672 8810af33-2d31-482b-a856-94f89814c4df
2014-06-06 10:06:25 +00:00
pb 59252132a4 First part of Enhancing globalization of content-center (#1763). Text output is localized, but badly placed on the page. Needs further reworking of several classes.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2670 8810af33-2d31-482b-a856-94f89814c4df
2014-06-05 10:00:07 +00:00
jensp 0dd6e8ff55 A bugfix for ccm-sci-assets-publicationsperson
git-svn-id: https://svn.libreccm.org/ccm/trunk@2668 8810af33-2d31-482b-a856-94f89814c4df
2014-06-04 19:29:19 +00:00
jensp ebede11827 Integrated ButtonHelper for FancyBox2
git-svn-id: https://svn.libreccm.org/ccm/trunk@2665 8810af33-2d31-482b-a856-94f89814c4df
2014-06-04 10:49:14 +00:00
jensp 1c04f489fe Übernahme der Änderungen von Sidoine:
- jQuery aktualisiert
- Fancybox 2 integriert
- Xinha auf aktuelle Version aktualisert


git-svn-id: https://svn.libreccm.org/ccm/trunk@2664 8810af33-2d31-482b-a856-94f89814c4df
2014-06-02 12:11:06 +00:00
jensp 06e25503c7 - Mandalay support for the content types from the ccm-sci-publications-dramaticarts module
- Some bugfixes for the ccm-sci-publications-dramaticarts module


git-svn-id: https://svn.libreccm.org/ccm/trunk@2663 8810af33-2d31-482b-a856-94f89814c4df
2014-06-02 11:04:26 +00:00
pb d287dcd760 Added task 'pluto-assemble' to the load ant project. It scans the portlet.xml file and injects for each portlet the Pluto specific registration code into web.xml. Should be executed after load-bundle step and is only needed when developing CCM JSR portlets in a Pluto test environment. Modified core web.xml accordingly.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2662 8810af33-2d31-482b-a856-94f89814c4df
2014-05-31 22:44:15 +00:00
jensp acd0b15c62 Finished testing of the new publication types for dramatic artsFinished testing of the new publication types for dramatic arts.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2661 8810af33-2d31-482b-a856-94f89814c4df
2014-05-31 14:55:58 +00:00
jensp ac7d3b34ab Next part of the ccm-scipublications-dramaticarts module. Code should be complete now, but is not fully tested yet.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2660 8810af33-2d31-482b-a856-94f89814c4df
2014-05-30 15:28:31 +00:00
pb c703c92f82 Just another addendum.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2659 8810af33-2d31-482b-a856-94f89814c4df
2014-05-30 08:37:25 +00:00
pb b6f2cc147c Addendum to previous commit (r2657).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2658 8810af33-2d31-482b-a856-94f89814c4df
2014-05-30 06:32:31 +00:00
pb 1fcdb94194 Unfortunately quite a large update: Reorganized web.xml fragments into a separate directory, Modified build script to use the same web.xml merger as ccm installation script. NOTE: Logic bug fixed: If bundle specifies a web.xml, it is used as is without any postprocessing. If no web.xml is specified or the file does not exist, core's web.xml is used and the web.xml fragment of any module merged in.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2657 8810af33-2d31-482b-a856-94f89814c4df
2014-05-30 05:40:29 +00:00
jensp 860147b7a7 First part of UI classes for the dramatic arts publication types. Please note: Some classes needed are still not there, so the module does not yet compile or work.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2656 8810af33-2d31-482b-a856-94f89814c4df
2014-05-28 10:10:20 +00:00
jensp 01b4b5b7bf First part of the ccm-sci-publications-dramaticarts module which provides two new publication types for managing movies and plays using the ccm-sci-publications module and its features (developed for the Fiction Meets Science project).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2655 8810af33-2d31-482b-a856-94f89814c4df
2014-05-26 18:08:53 +00:00
pb fca3bbaf8a Removed deprecated classes CategoryPurpose, part 1.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2654 8810af33-2d31-482b-a856-94f89814c4df
2014-05-26 15:51:14 +00:00
pb aa06c3e866 Enhanced build system to handle WEB-INF/portlet.xml files. File is copied from bundel's cfg directory or merged from stub files (not implemented yet). Various housekeeping done.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2653 8810af33-2d31-482b-a856-94f89814c4df
2014-05-26 09:24:06 +00:00
pb d5499cd6eb Added first very minimalistic support for JSR286 compliant portlet support installable in Apache Pluto portlet server. i
Modify local.runtime.properties to use Pluto (uncomment the Pluto lines) and use 'ant install-runtime' to install Pluto as test environment. 
Modify project.xml to install ccm into an other context as ROOT! libreccm may be a nice choice. 
Deploy and load-bundle as usual. 
Invoke http://localhost:8080/libreccm to operate CCM as usual. 
Invoke http://localhost:8080/pluto to operate Pluto, login as admin and use Pluto admin tool to add ContentItemJSRPortlet to the Pluto Portal page (displays currently a simple HelloWorld Text).





git-svn-id: https://svn.libreccm.org/ccm/trunk@2652 8810af33-2d31-482b-a856-94f89814c4df
2014-05-25 20:24:49 +00:00
pb 5097bfa76a Updated postgresJDBC driver to the latest 8.4 version and moved to CCM /WEB-INF/lib.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2651 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 09:46:14 +00:00
pb ae9f7503c0 Fixed jsp's to be compatibel with Tomcat 7 and Jasper
git-svn-id: https://svn.libreccm.org/ccm/trunk@2650 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 09:35:04 +00:00
jensp d9eee88edd Refined some of the english labels for the SciPublicationsAbout asset
git-svn-id: https://svn.libreccm.org/ccm/trunk@2649 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 09:25:28 +00:00
jensp 7e1c549723 - Some formatting in the XSL files of Mandalay
- Removal of two calls of mandalay:processAttributes, which may cause errors (Ticket #2076)


git-svn-id: https://svn.libreccm.org/ccm/trunk@2648 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 09:09:37 +00:00
jensp 3683f0e511 PublicationsPersons finished.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2647 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 08:58:35 +00:00
pb 6b0caaff4e Updated versions of Apache xml processors xerces (2.11.0) and xalan/xltc (2.7.2), release date April 2014,
git-svn-id: https://svn.libreccm.org/ccm/trunk@2646 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 06:12:58 +00:00
pb 503263eeb2 Fixed bug in web.xml's (missing surrounding <jsp-config>), fixed bug in mandalay (#2076 )
git-svn-id: https://svn.libreccm.org/ccm/trunk@2645 8810af33-2d31-482b-a856-94f89814c4df
2014-05-22 22:15:34 +00:00
pb 7dd986442b First part of Tomcat 7 compatibility.
* Added Juli to classpath for ecdc Tomcat start script. "ant start" works.
* Fixed error in web-sci.xml, added surrounding <jsp-config> tags tp taglib tags.
* Removed jd.sclt transformer (no longer maintained, latest release from 2003
* Removed XML factory implementation configuration using system wide environment variables (affecting and probably conflicting with other webapps in the container). Alternative configuration facility not yet implemented, using container fallback (which is saxon at the moment for xslt processor).

CCM is currently execting in TC 7 for the public site, content-center doesn't work in TC 7 for now (but in TC6 as previously).
 


git-svn-id: https://svn.libreccm.org/ccm/trunk@2644 8810af33-2d31-482b-a856-94f89814c4df
2014-05-22 22:03:53 +00:00
jensp 445cdef0dc Labels/Texts on ImageSelectPage (which is used for example when inserting an image using the RichText editor) are now localised.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2642 8810af33-2d31-482b-a856-94f89814c4df
2014-05-22 15:29:28 +00:00
jensp 848125cbb5 The year of the end date of new event item is now preset to the current year (Ticket #2070)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2640 8810af33-2d31-482b-a856-94f89814c4df
2014-05-22 13:50:24 +00:00
jensp e34fd6ff68 Next part of ccm-sci-assets-publicationspersons
git-svn-id: https://svn.libreccm.org/ccm/trunk@2639 8810af33-2d31-482b-a856-94f89814c4df
2014-05-22 13:08:04 +00:00
jensp 440f8c1b75 - Some formatting and JavaDoc for ccm-sci-assets-publicationsabout
- First part of the ccm-sci-assets-publicationspersons


git-svn-id: https://svn.libreccm.org/ccm/trunk@2638 8810af33-2d31-482b-a856-94f89814c4df
2014-05-21 13:59:08 +00:00
jensp 18be8f11c6 - Refactored the FolderManipulator, removing potential NPE etc.
- Texts in the select boxes of the subsite admin form are now localised (Ticket #2032).


git-svn-id: https://svn.libreccm.org/ccm/trunk@2636 8810af33-2d31-482b-a856-94f89814c4df
2014-05-20 09:56:53 +00:00
jensp 0c492b9aaf Changed Content Center colours to the new bluish style
git-svn-id: https://svn.libreccm.org/ccm/trunk@2635 8810af33-2d31-482b-a856-94f89814c4df
2014-05-19 13:10:20 +00:00
jensp ee43570f8e Mandalay: Formatierungen
git-svn-id: https://svn.libreccm.org/ccm/trunk@2634 8810af33-2d31-482b-a856-94f89814c4df
2014-05-05 17:59:33 +00:00
pb 0f42cbcd60 Fixed issue in load-bundle where web installation context was hard coded as ROOT. Now uses project.xml to determine installation context.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2633 8810af33-2d31-482b-a856-94f89814c4df
2014-05-03 08:20:38 +00:00
pb b3d55b32b1 Minor enhancement
git-svn-id: https://svn.libreccm.org/ccm/trunk@2632 8810af33-2d31-482b-a856-94f89814c4df
2014-05-02 06:29:30 +00:00
pb dea5ffd1dc Added Apache Tomcat7 and Apache Pluto2 as alternative test environments.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2631 8810af33-2d31-482b-a856-94f89814c4df
2014-05-01 21:37:10 +00:00