Menu
▾
▴
[Openuss-svn-commits] SF.net SVN: openuss:[4817] branches/openuss-plexus-3.1/plexus/plexus-web/ src/main
|
From: <id...@us...> - 2008-10-07 13:22:57
|
Revision: 4817
http://openuss.svn.sourceforge.net/openuss/?rev=4817&view=rev
Author: idueppe
Date: 2008-10-07 13:18:36 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
renamed courseparticipants to participants and enabled course participants to see the participants table.
Modified Paths:
--------------
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/course/CourseParticipantsPage.java
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/faces-navigation.xml
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/pages.xml
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/navigation/course.xhtml
Added Paths:
-----------
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participants.xhtml
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participantstable.xhtml
Removed Paths:
-------------
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipants.xhtml
branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipantstable.xhtml
Modified: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/course/CourseParticipantsPage.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/course/CourseParticipantsPage.java 2008-10-07 13:15:59 UTC (rev 4816)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/course/CourseParticipantsPage.java 2008-10-07 13:18:36 UTC (rev 4817)
@@ -16,7 +16,7 @@
import org.openuss.lecture.LectureException;
import org.openuss.web.Constants;
-@Bean(name = "views$secured$course$courseparticipants", scope = Scope.REQUEST)
+@Bean(name = "views$secured$course$participants", scope = Scope.REQUEST)
@View
public class CourseParticipantsPage extends AbstractCoursePage {
private static final Logger logger = Logger.getLogger(CourseParticipantsPage.class);
Modified: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/faces-navigation.xml
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/faces-navigation.xml 2008-10-07 13:15:59 UTC (rev 4816)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/faces-navigation.xml 2008-10-07 13:18:36 UTC (rev 4817)
@@ -562,7 +562,7 @@
<navigation-case>
<from-outcome>course_options_members</from-outcome>
- <to-view-id>/views/secured/course/courseparticipants.xhtml</to-view-id>
+ <to-view-id>/views/secured/course/participants.xhtml</to-view-id>
</navigation-case>
<navigation-case>
Modified: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/pages.xml 2008-10-07 13:15:59 UTC (rev 4816)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/WEB-INF/pages.xml 2008-10-07 13:18:36 UTC (rev 4817)
@@ -248,6 +248,13 @@
converterId="javax.faces.Long" />
</page>
+ <page view-id="/views/secured/course/participants.xhtml">
+ <securityConstraint domainObject="#{courseInfo}"
+ permissions="#{ACL.READ}" />
+ <parameter name="course" value="#{courseInfo.id}"
+ converterId="javax.faces.Long" />
+ </page>
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Periods
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
Modified: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/navigation/course.xhtml
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/navigation/course.xhtml 2008-10-07 13:15:59 UTC (rev 4816)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/navigation/course.xhtml 2008-10-07 13:18:36 UTC (rev 4817)
@@ -91,6 +91,14 @@
rendered="#{courseInfo.wiki}">
<h:outputText value="Wiki"/>
</t:commandNavigation2>
+ <c:if test="#{courseInfo.accessType.value != 0 and courseInfo.accessType.value != 2 }">
+ <t:commandNavigation2
+ id="cmd_members" forceId="true"
+ action="course_options_members"
+ activeOnViewIds="/views/secured/course/participants.xhtml">
+ <h:outputText value="#{msg['course_command_options_participants']}" />
+ </t:commandNavigation2>
+ </c:if>
</s:authorize>
<s:authorize ifAllGranted="ROLE_USER">
<s:acl domainObject="#{courseInfo}" hasPermission="#{ACL.ASSIST}">
@@ -106,14 +114,6 @@
activeOnViewIds="/views/secured/course/courseassistants.xhtml">
<h:outputText value="#{msg['course_command_options_assistants']}" />
</t:commandNavigation2>
- <c:if test="#{courseInfo.accessType.value != 0 and courseInfo.accessType.value != 1 }">
- <t:commandNavigation2
- id="cmd_members" forceId="true"
- action="course_options_members"
- activeOnViewIds="/views/secured/course/courseparticipants.xhtml">
- <h:outputText value="#{msg['course_command_options_participants']}" />
- </t:commandNavigation2>
- </c:if>
<c:if test="#{courseInfo.accessType.value == 4}">
<t:commandNavigation2
id="cmd_aspirants" forceId="true"
Deleted: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipants.xhtml
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipants.xhtml 2008-10-07 13:15:59 UTC (rev 4816)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipants.xhtml 2008-10-07 13:18:36 UTC (rev 4817)
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:news="http://www.openuss.org/news/jsf"
- xmlns:t="http://myfaces.apache.org/tomahawk"
- xmlns:o="http://www.openuss.org/jsfcontrols"
- xmlns:s="http://www.openuss.org/jsf-security"
- xmlns:c="http://java.sun.com/jstl/core">
-
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title><ui:insert name="title"/></title>
- <link href="../../css/openuss.css" rel="stylesheet" type="text/css" media="screen,screen" />
- <!-- css-Datei mit Farbdefinitionen der Rubrik -->
- <link href="../../css/openuss-typo.css" rel="stylesheet" type="text/css" media="screen" />
- </head>
-
- <body>
- <!-- text above will be ignored -->
- <ui:composition template="/views/layout/layout.xhtml">
- <ui:define name="title"><h:outputText value="#{msg.course_main_title} - #{courseInfo.shortcut}"/></ui:define>
- <ui:define name="navigation">
- <ui:include src="/views/commons/navigation/course.xhtml" />
- </ui:define>
- <ui:define name="content">
- <!-- removed ACL tags -->
-
- <h:form id="participantsForm">
- <ui:include src="courseparticipantstable.xhtml" />
- </h:form>
- </ui:define>
- </ui:composition>
-
- <!-- text above will be ignored -->
-
- </body>
-</html>
Deleted: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipantstable.xhtml
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipantstable.xhtml 2008-10-07 13:15:59 UTC (rev 4816)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipantstable.xhtml 2008-10-07 13:18:36 UTC (rev 4817)
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:plexus="http://www.openuss.org/plexus/jsf"
- xmlns:t="http://myfaces.apache.org/tomahawk"
- xmlns:o="http://www.openuss.org/jsfcontrols"
- xmlns:c="http://java.sun.com/jstl/core">
-
- <plexus:dataTable
- id="courseparticipants"
- label="#{msg.institute_members_subheading}"
- value="views$secured$course$courseparticipants.data"
- columnClasses="col_max_left, col_max_left, col_max_left, col_max_left, col_commands"
- var="member"
- rows="20"
- infoText="#{msg.table_info_text_users}">
-
- <t:column>
- <plexus:commandSortHeader columnName="username"> #{msg['user_username']} </plexus:commandSortHeader>
- <h:outputText value="#{member.username}"/>
- </t:column>
-
- <t:column>
- <plexus:commandSortHeader columnName="firstName"> #{msg['user_firstname']}</plexus:commandSortHeader>
- <h:outputText value="#{member.firstName}"/>
- </t:column>
-
- <t:column>
- <plexus:commandSortHeader columnName="lastName">#{msg['user_lastname']}</plexus:commandSortHeader>
- <h:outputText value="#{member.lastName}"/>
- </t:column>
-
- <t:column>
- <plexus:commandSortHeader columnName="email">#{msg['user_email']}</plexus:commandSortHeader>
- <h:outputText value="#{member.email}"/>
- </t:column>
-
- <!--
- <t:column>
- <f:facet name="header">#{msg['commands_header']}</f:facet>
- <h:selectOneMenu styleClass="pulldown_small" valueChangeListener="#{views$secured$course$coursemembers.changedMember}">
- <f:selectItem itemValue="null" itemLabel=""/>
- <f:selectItem itemValue="suspend" itemLabel="#{msg['course_member_suspend']}"/>
- <f:selectItem itemValue="readonly" itemLabel="#{msg['course_member_readonly']}"/>
- <f:selectItem itemValue="active" itemLabel="#{msg['course_member_active']}"/>
- </h:selectOneMenu>
- </t:column>
- -->
-
- <plexus:column header="#{msg.commands_header}">
- <plexus:linkProfileIcon user="#{member.userId}"/>
- <plexus:command
- bean="#{views$secured$course$courseparticipants}"
- action="delete"
- onclick="if (!confirm('#{msg.message_course_remove_member_confirmation} #{member.username}')) return false"
- label="#{msg['course_members_delete']}"
- title="#{msg['course_members_delete_hint']}"
- styleClass="icon_remove" />
- </plexus:column>
-
- </plexus:dataTable>
-
-</ui:composition>
Copied: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participants.xhtml (from rev 4779, branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipants.xhtml)
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participants.xhtml (rev 0)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participants.xhtml 2008-10-07 13:18:36 UTC (rev 4817)
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:news="http://www.openuss.org/news/jsf"
+ xmlns:t="http://myfaces.apache.org/tomahawk"
+ xmlns:o="http://www.openuss.org/jsfcontrols"
+ xmlns:s="http://www.openuss.org/jsf-security"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title><ui:insert name="title"/></title>
+ <link href="../../css/openuss.css" rel="stylesheet" type="text/css" media="screen,screen" />
+ <!-- css-Datei mit Farbdefinitionen der Rubrik -->
+ <link href="../../css/openuss-typo.css" rel="stylesheet" type="text/css" media="screen" />
+ </head>
+
+ <body>
+ <!-- text above will be ignored -->
+ <ui:composition template="/views/layout/layout.xhtml">
+ <ui:define name="title"><h:outputText value="#{msg.course_main_title} - #{courseInfo.shortcut}"/></ui:define>
+ <ui:define name="navigation">
+ <ui:include src="/views/commons/navigation/course.xhtml" />
+ </ui:define>
+ <ui:define name="content">
+ <!-- removed ACL tags -->
+
+ <h:form id="participantsForm">
+ <ui:include src="participantstable.xhtml" />
+ </h:form>
+ </ui:define>
+ </ui:composition>
+
+ <!-- text above will be ignored -->
+
+ </body>
+</html>
Property changes on: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participants.xhtml
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participantstable.xhtml (from rev 4779, branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/courseparticipantstable.xhtml)
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participantstable.xhtml (rev 0)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participantstable.xhtml 2008-10-07 13:18:36 UTC (rev 4817)
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:plexus="http://www.openuss.org/plexus/jsf"
+ xmlns:t="http://myfaces.apache.org/tomahawk"
+ xmlns:o="http://www.openuss.org/jsfcontrols"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+ <plexus:dataTable
+ id="courseparticipants"
+ label="#{msg.institute_members_subheading}"
+ value="views$secured$course$participants.data"
+ columnClasses="col_max_left, col_max_left, col_max_left, col_max_left, col_commands"
+ var="member"
+ rows="20"
+ infoText="#{msg.table_info_text_users}">
+
+ <t:column>
+ <plexus:commandSortHeader columnName="username"> #{msg['user_username']} </plexus:commandSortHeader>
+ <h:outputText value="#{member.username}"/>
+ </t:column>
+
+ <t:column>
+ <plexus:commandSortHeader columnName="firstName"> #{msg['user_firstname']}</plexus:commandSortHeader>
+ <h:outputText value="#{member.firstName}"/>
+ </t:column>
+
+ <t:column>
+ <plexus:commandSortHeader columnName="lastName">#{msg['user_lastname']}</plexus:commandSortHeader>
+ <h:outputText value="#{member.lastName}"/>
+ </t:column>
+
+ <t:column>
+ <plexus:commandSortHeader columnName="email">#{msg['user_email']}</plexus:commandSortHeader>
+ <h:outputText value="#{member.email}"/>
+ </t:column>
+
+ <plexus:column header="#{msg.commands_header}">
+ <plexus:linkProfileIcon user="#{member.userId}"/>
+ <plexus:command
+ bean="#{views$secured$course$participants}"
+ action="delete"
+ onclick="if (!confirm('#{msg.message_course_remove_member_confirmation} #{member.username}')) return false"
+ label="#{msg['course_members_delete']}"
+ title="#{msg['course_members_delete_hint']}"
+ styleClass="icon_remove" />
+ </plexus:column>
+
+ </plexus:dataTable>
+
+</ui:composition>
Property changes on: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/secured/course/participantstable.xhtml
___________________________________________________________________
Added: svn:mergeinfo
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
