From 8317d67cba7ec47272d7fd03ee192e223f7e90b1 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 20 Feb 2015 16:28:27 +0000 Subject: [PATCH] - Missing support for cms:tasksPanel in Foundry - Some images for Foundry git-svn-id: https://svn.libreccm.org/ccm/trunk@3259 8810af33-2d31-482b-a856-94f89814c4df --- .../web/themes/foundry-base/texts/cms.xml | 22 ++++ .../web/themes/foundry/foundry/lib/cms.xsl | 1 + .../foundry/foundry/lib/cms/tasks-panel.xsl | 123 ++++++++++++++++++ .../themes/foundry/images/search/action.png | Bin 0 -> 611 bytes .../foundry/images/search/scoreEmpty.gif | Bin 0 -> 70 bytes .../foundry/images/search/scoreFull.gif | Bin 0 -> 53 bytes .../ui/AbstractDomainObjectComponent.java | 71 +++++----- 7 files changed, 181 insertions(+), 36 deletions(-) create mode 100644 ccm-core/web/themes/foundry/foundry/lib/cms/tasks-panel.xsl create mode 100644 ccm-core/web/themes/foundry/images/search/action.png create mode 100755 ccm-core/web/themes/foundry/images/search/scoreEmpty.gif create mode 100755 ccm-core/web/themes/foundry/images/search/scoreFull.gif diff --git a/ccm-core/web/themes/foundry-base/texts/cms.xml b/ccm-core/web/themes/foundry-base/texts/cms.xml index f001779c6..9ddf6d823 100644 --- a/ccm-core/web/themes/foundry-base/texts/cms.xml +++ b/ccm-core/web/themes/foundry-base/texts/cms.xml @@ -132,4 +132,26 @@ View Revision Revision ansehen + + + No tasks assigned + Keine zugewiesenen Aufgaben vorhanden + + + Not locked + Nicht gesperrt + + + Locked by you + Durch Sie gesperrt + + + Locked by someone else + Durch einen anderen Benutzer gesperrt + + + Not assigned + Niemandem zugewiesen + + \ No newline at end of file diff --git a/ccm-core/web/themes/foundry/foundry/lib/cms.xsl b/ccm-core/web/themes/foundry/foundry/lib/cms.xsl index fcbb025cd..cac56fd3a 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/cms.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/cms.xsl @@ -24,5 +24,6 @@ version="2.0"> + \ No newline at end of file diff --git a/ccm-core/web/themes/foundry/foundry/lib/cms/tasks-panel.xsl b/ccm-core/web/themes/foundry/foundry/lib/cms/tasks-panel.xsl new file mode 100644 index 000000000..8129f5620 --- /dev/null +++ b/ccm-core/web/themes/foundry/foundry/lib/cms/tasks-panel.xsl @@ -0,0 +1,123 @@ + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/web/themes/foundry/images/search/action.png b/ccm-core/web/themes/foundry/images/search/action.png new file mode 100644 index 0000000000000000000000000000000000000000..85d843485879fe51af4f80b426e6d91b88fd0cad GIT binary patch literal 611 zcmV-p0-XJcP)>Qp%q^ijiUthP5D5tJ4=@IdTN4N3 zxy<< z?4l#mgHhCbPo38XB7MQ#cr3H@PeJRIKx3uf8?9@oLs2}mHFXg>8&R{l)Xj!YLhXIQ zL_C)H_E&+|=ZUI~VcfEUOID~3p5{VpH$Jbwb0fJn+|uJyB7MQv@mR*%=fuN40ZEXM zL>Gc6;RrUnW)`(E%&i-DXlv;l0hWhGL-+n5aIhQ;%Qi5rB6(e-VC2XYzLPaK3ALzP z>b1pJ;FPKZ^!c{{`6 z;`;?HWlYRWBqxC!V3!eqWgGY_PEzYR$H$cwmX_y8ZSFjI@o3{dkOlO8xI`d{GWGsu z3=N*grudmiPp!^n$5v*yKLNW3!4iRGINP>qGyiUmFKb`twX`w*YCJIs>;UFbuw3N+ x=$Wh6Zr2Y3wSb!=&sHwNkzV>;t#a#@%P)%X)&{zV{+<8;002ovPDHLkV1m3P7n1-0 literal 0 HcmV?d00001 diff --git a/ccm-core/web/themes/foundry/images/search/scoreEmpty.gif b/ccm-core/web/themes/foundry/images/search/scoreEmpty.gif new file mode 100755 index 0000000000000000000000000000000000000000..27230c8fe1d8a39ae72bb93dddb4e15f10376a31 GIT binary patch literal 70 zcmZ?wbhEHbG-BXlXkcOxDmnlE|9>3@1_lO@2m_O9OaIE#YZ({M*>X#o_ud}ox2=!Z Zd(znFWldeD_w$&e_WX0b&pjC#tN}f(8m#~T literal 0 HcmV?d00001 diff --git a/ccm-core/web/themes/foundry/images/search/scoreFull.gif b/ccm-core/web/themes/foundry/images/search/scoreFull.gif new file mode 100755 index 0000000000000000000000000000000000000000..0da00741640b60f11acccca1303fec8c33e36f58 GIT binary patch literal 53 zcmZ?wbhEHbG-BXlXkcUzDmnlE|9>3@1_lO@2m_NyOaIE#Z}}I`*>bCU^SwR4`P&|K Ih%i_K0KV80rvLx| literal 0 HcmV?d00001 diff --git a/ccm-ldn-util/src/com/arsdigita/london/util/ui/AbstractDomainObjectComponent.java b/ccm-ldn-util/src/com/arsdigita/london/util/ui/AbstractDomainObjectComponent.java index dca0edcb0..f63c87e23 100755 --- a/ccm-ldn-util/src/com/arsdigita/london/util/ui/AbstractDomainObjectComponent.java +++ b/ccm-ldn-util/src/com/arsdigita/london/util/ui/AbstractDomainObjectComponent.java @@ -15,8 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - - package com.arsdigita.london.util.ui; import java.io.IOException; @@ -42,18 +40,17 @@ import com.arsdigita.web.RedirectSignal; public abstract class AbstractDomainObjectComponent extends SimpleContainer { - private static final Logger s_log = - Logger.getLogger( AbstractDomainObjectComponent.class ); - + private static final Logger s_log = Logger.getLogger(AbstractDomainObjectComponent.class); + private Map m_actions = new HashMap(); - private Map m_actionPrivileges = new HashMap(); + private Map m_actionPrivileges = new HashMap(); private boolean m_redirecting; public AbstractDomainObjectComponent(String cname, String xmlns) { super(cname, xmlns); } - + public void setRedirecting(boolean redirecting) { m_redirecting = redirecting; } @@ -75,18 +72,18 @@ public abstract class AbstractDomainObjectComponent extends SimpleContainer { OID oid = OID.valueOf(value); DomainObject dobj = DomainObjectFactory.newInstance(oid); - + boolean aborted = false; try { fireDomainObjectActionEvent( new DomainObjectActionEvent(this, state, dobj, name)); - } catch( DomainObjectActionAbortedException ex ) { + } catch (DomainObjectActionAbortedException ex) { aborted = true; - if( s_log.isInfoEnabled() ) { - if( s_log.isDebugEnabled() ) { - s_log.debug( "Action aborted", ex ); + if (s_log.isInfoEnabled()) { + if (s_log.isDebugEnabled()) { + s_log.debug("Action aborted", ex); } else { - s_log.info( "Action aborted" ); + s_log.info("Action aborted"); } } } @@ -97,17 +94,16 @@ public abstract class AbstractDomainObjectComponent extends SimpleContainer { throw new RedirectSignal(state.toURL(), true); } } - + protected void fireDomainObjectActionEvent(DomainObjectActionEvent ev) { Assert.isLocked(this); - - EventListenerList listeners = - (EventListenerList)m_actions.get(ev.getAction()); + + EventListenerList listeners = (EventListenerList) m_actions.get(ev.getAction()); Iterator i = listeners .getListenerIterator(DomainObjectActionListener.class); while (i.hasNext()) { - ((DomainObjectActionListener)i.next()).actionPerformed(ev); + ((DomainObjectActionListener) i.next()).actionPerformed(ev); } } @@ -121,25 +117,27 @@ public abstract class AbstractDomainObjectComponent extends SimpleContainer { new EventListenerList()); } - protected void registerDomainObjectAction(String action, PrivilegeDescriptor privilege) { - registerDomainObjectAction(action); - m_actionPrivileges.put(action, privilege); - } - + protected void registerDomainObjectAction(String action, PrivilegeDescriptor privilege) { + registerDomainObjectAction(action); + m_actionPrivileges.put(action, privilege); + } protected Iterator getDomainObjectActions() { return m_actions.keySet().iterator(); } - - /** - * return privilegeDescripter registered against this action, or null if action was registered without - * a privilege being specified - * @param action - * @return - */ - protected PrivilegeDescriptor getDomainObjectActionPrivilege (String action) { - return (PrivilegeDescriptor)m_actionPrivileges.get(action); - } + + /** + * return privilegeDescripter registered against this action, or null if action was registered + * without a privilege being specified + * + * @param action + * + * @return + */ + protected PrivilegeDescriptor getDomainObjectActionPrivilege(String action) { + return (PrivilegeDescriptor) m_actionPrivileges.get(action); + } + public void addDomainObjectActionListener(String action, DomainObjectActionListener listener) { Assert.isUnlocked(this); @@ -147,11 +145,11 @@ public abstract class AbstractDomainObjectComponent extends SimpleContainer { if (!m_actions.containsKey(action)) { throw new RuntimeException("Action " + action + " not registered"); } - - EventListenerList listeners = (EventListenerList)m_actions.get(action); + + EventListenerList listeners = (EventListenerList) m_actions.get(action); listeners.add(DomainObjectActionListener.class, listener); } - + protected String getDomainObjectActionLink(PageState state, DomainObject dobj, String action) { @@ -167,4 +165,5 @@ public abstract class AbstractDomainObjectComponent extends SimpleContainer { state.clearControlEvent(); return url; } + }