LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kleinere Formatierungen etc. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2106 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2013-03-29 21:28:33 +00:00
parent 019dc54b2b
commit ab780dd89c
7 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp
View File

@ -6,7 +6,7 @@
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/> <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.portalworkspace.ui.AbstractWorkspaceComponent"/> <jsp:directive.page import="com.arsdigita.portalworkspace.ui.AbstractWorkspaceComponent"/>
<jsp:directive.page import="com.arsdigita.portalworkspace.ui.DefaultWorkspaceSelectionModel"/> <jsp:directive.page import="com.arsdigita.portalworkspace.ui.WorkspaceSelectionDefaultModel"/>
<jsp:scriptlet> <jsp:scriptlet>
DispatcherHelper.cacheDisable(response); DispatcherHelper.cacheDisable(response);
@ -18,7 +18,7 @@
classname="com.arsdigita.portalworkspace.ui.WorkspaceEditor" /> classname="com.arsdigita.portalworkspace.ui.WorkspaceEditor" />
<jsp:scriptlet> <jsp:scriptlet>
((AbstractWorkspaceComponent)edit).setWorkspaceModel( ((AbstractWorkspaceComponent)edit).setWorkspaceModel(
new DefaultWorkspaceSelectionModel()); new WorkspaceSelectionDefaultModel());
</jsp:scriptlet> </jsp:scriptlet>
</define:page> </define:page>

4
ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp
View File

@ -7,7 +7,7 @@
<jsp:directive.page import="com.arsdigita.kernel.permissions.PrivilegeDescriptor"/> <jsp:directive.page import="com.arsdigita.kernel.permissions.PrivilegeDescriptor"/>
<jsp:directive.page import="com.arsdigita.portalworkspace.Workspace"/> <jsp:directive.page import="com.arsdigita.portalworkspace.Workspace"/>
<jsp:directive.page import="com.arsdigita.portalworkspace.ui.AbstractWorkspaceComponent"/> <jsp:directive.page import="com.arsdigita.portalworkspace.ui.AbstractWorkspaceComponent"/>
<jsp:directive.page import="com.arsdigita.portalworkspace.ui.DefaultWorkspaceSelectionModel"/> <jsp:directive.page import="com.arsdigita.portalworkspace.ui.WorkspaceSelectionDefaultModel"/>
<jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/> <jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/>
<jsp:scriptlet> <jsp:scriptlet>
@ -27,7 +27,7 @@
classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer" /> classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer" />
<jsp:scriptlet> <jsp:scriptlet>
((AbstractWorkspaceComponent) view).setWorkspaceModel( ((AbstractWorkspaceComponent) view).setWorkspaceModel(
new DefaultWorkspaceSelectionModel()); new WorkspaceSelectionDefaultModel());
</jsp:scriptlet> </jsp:scriptlet>
</define:page> </define:page>

4
ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader.java
View File

@ -42,7 +42,7 @@ public class Loader extends PackageLoader {
private StringParameter typeName = new StringParameter private StringParameter typeName = new StringParameter
("uk.gov.westsussex.portlet.news.name", ("uk.gov.westsussex.portlet.news.name",
Parameter.REQUIRED, "News"); Parameter.REQUIRED, "Latest News");
public Loader() { public Loader() {
register(typeName); register(typeName);
@ -56,7 +56,7 @@ public class Loader extends PackageLoader {
.createPortletType((String)get(typeName), .createPortletType((String)get(typeName),
PortletType.WIDE_PROFILE, PortletType.WIDE_PROFILE,
NewsPortlet.BASE_DATA_OBJECT_TYPE); NewsPortlet.BASE_DATA_OBJECT_TYPE);
type.setDescription("See your personalised news"); type.setDescription("Displays the latest news.");
} }
}.run(); }.run();
} }

2
ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader_parameter.properties
View File

@ -1,5 +1,5 @@
uk.gov.westsussex.portlet.news.name.title=Portlet Type Name uk.gov.westsussex.portlet.news.name.title=Portlet Type Name
uk.gov.westsussex.portlet.news.name.purpose=The name of the portlet type that appears in the drop down list of portlet types uk.gov.westsussex.portlet.news.name.purpose=The name of the portlet type that appears in the drop down list of portlet types
uk.gov.westsussex.portlet.news.name.example=News uk.gov.westsussex.portlet.news.name.example=Latest News
uk.gov.westsussex.portlet.news.name.format=[string] uk.gov.westsussex.portlet.news.name.format=[string]

12
ccm-portlet-latestnews/src/com/arsdigita/portlet/news/NewsPortlet.java
View File

@ -91,6 +91,8 @@ public class NewsPortlet extends Portlet implements NewsConstants {
set(ITEM_COUNT, new Integer(count)); set(ITEM_COUNT, new Integer(count));
} }
// Following code it part of 'personalized news' tree which is disabled for
// because we currently (6.6) have no user preferences of something like that.
/** /**
* *
* @return whether any homepage news items have been added or edited since last checked. * @return whether any homepage news items have been added or edited since last checked.
@ -98,10 +100,7 @@ public class NewsPortlet extends Portlet implements NewsConstants {
* deleted news items do not cause true to be returned. * deleted news items do not cause true to be returned.
* *
*/ */
/* /* * starting to look doubtful whether this would actually save any time
*
* starting to look doubtful whether this would actually save any time
*
* will recheck when more data on database * will recheck when more data on database
public boolean isNewNews() { public boolean isNewNews() {
NewsItem latest = NewsItem.getMostRecentNewsItem(); NewsItem latest = NewsItem.getMostRecentNewsItem();
@ -119,8 +118,7 @@ public class NewsPortlet extends Portlet implements NewsConstants {
} }
return false; return false;
}
*/
}*/
} }

4
ccm-portlet-latestnews/src/com/arsdigita/portlet/news/PersonalisedNewsTarget.java
View File

@ -21,6 +21,10 @@ package com.arsdigita.portlet.news;
import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainCollection;
// Following code it part of 'personalized news' tree which is disabled for now
// because we currently (6.6) have no user preferences of something like that
// in the trunk code. West Sussex used to have a specialized module.
/** /**
* Service is used by news portlet to display potentially useful articles * Service is used by news portlet to display potentially useful articles
* to the user. * to the user.

25
ccm-portlet-latestnews/src/com/arsdigita/portlet/news/ui/NewsPortletRenderer.java
View File

@ -19,9 +19,6 @@
package com.arsdigita.portlet.news.ui; package com.arsdigita.portlet.news.ui;
//import uk.gov.westsussex.authentication.ExternalUserFactory; //import uk.gov.westsussex.authentication.ExternalUserFactory;
import com.arsdigita.portlet.news.NewsConstants;
import com.arsdigita.portlet.news.NewsPortlet;
import com.arsdigita.portlet.news.PersonalisedNewsTarget;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer; import com.arsdigita.bebop.portal.AbstractPortletRenderer;
@ -42,6 +39,9 @@ import com.arsdigita.london.terms.Term;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.portal.PortletType; import com.arsdigita.portal.PortletType;
import com.arsdigita.portlet.news.NewsConstants;
import com.arsdigita.portlet.news.NewsPortlet;
import com.arsdigita.portlet.news.PersonalisedNewsTarget;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import java.text.DateFormat; import java.text.DateFormat;
@ -52,7 +52,7 @@ import org.apache.log4j.Logger;
/** /**
* * Class selects the news to display and generates the xml.
* *
* @author Chris Gilbert (cgyg9330) &lt;chris.gilbert@westsussex.gov.uk&gt; * @author Chris Gilbert (cgyg9330) &lt;chris.gilbert@westsussex.gov.uk&gt;
* @version $Id: NewsPortletRenderer.java 2005/03/07 13:48:49 cgyg9330 Exp $ * @version $Id: NewsPortletRenderer.java 2005/03/07 13:48:49 cgyg9330 Exp $
@ -94,6 +94,10 @@ public class NewsPortletRenderer extends AbstractPortletRenderer
thisUser = Kernel.getPublicUser(); thisUser = Kernel.getPublicUser();
} }
// Following code it part of 'personalized news' tree which is disabled for now
// because we currently (6.6) have no user preferences of something like that
// in the trunk code. West Sussex used to have a specialized module.
//
// Object customUser = ExternalUserFactory.getCustomUserObject(thisUser); // Object customUser = ExternalUserFactory.getCustomUserObject(thisUser);
// if (customUser instanceof PersonalisedNewsTarget) { // if (customUser instanceof PersonalisedNewsTarget) {
// newsPortlet.addAttribute(PERSONALISED_ATTRIBUTE, "true"); // newsPortlet.addAttribute(PERSONALISED_ATTRIBUTE, "true");
@ -115,11 +119,14 @@ public class NewsPortletRenderer extends AbstractPortletRenderer
s_log.debug("FINISH - generateBodyXML"); s_log.debug("FINISH - generateBodyXML");
} }
/** // Following code it part of 'personalized news' tree which is disabled for now
* // because we currently (6.6) have no user preferences of something like that
* @param newsPortlet // in the trunk code. West Sussex used to have a specialized module.
* @param profiledUser // /**
*/ // *
// * @param newsPortlet
// * @param profiledUser
// */
/* CURRENTLY NOT AVAILABLE /* CURRENTLY NOT AVAILABLE
private void getPersonalisedNews( PageState state, private void getPersonalisedNews( PageState state,
Element main, Element main,