Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 79 → Rev 80

/impl/conf/language/MessageResourcesBlog.properties
11,4 → 11,5
blog.created.success=Blog criado com sucesso
blog.edited.success=Blog alterado com sucesso
blog.status=VĂ¡lido
submit.blog=Criar um Blog
 
/impl/conf/WEB-INF/struts/struts-blog.xml
29,8 → 29,8
scope="request"
parameter="dispatch"
validate="false"
input="page.blog">
<forward name="success" path="page.welcome"/>
input="page.submit.blog">
<forward name="success" path="page.load.blog"/>
</action>
<action path="/loadBlog"
type="pt.estgp.estgweb.web.controllers.blog.BlogController"
38,8 → 38,9
scope="request"
parameter="dispatch"
validate="false"
input="page.blog">
input="page.welcome">
<forward name="success" path="page.load.blog"/>
<forward name="submit" path="page.submit.blog"/>
</action>
</action-mappings>
</struts-config>
/impl/conf/WEB-INF/struts/tiles-blog.xml
7,15 → 7,15
<tiles-definitions>
 
<definition name="page.blog" extends="base.layout1">
<definition name="page.submit.blog" extends="base.layout1">
<put name="title" value="Create a Blog"/>
<put name="topnav" value="/admin/blog/topnavCreateBlog.jsp"/>
<put name="body" value="/admin/blog/submitBlog.jsp"/>
</definition>
 
<definition name="page.load.blog" extends="base.layout1">
<put name="title" value="Create a Blog"/>
<put name="body" value="/admin/blog/submitBlog.jsp"/>
<put name="body" value="/public/blog/blog.jsp"/>
</definition>
 
</tiles-definitions>
/impl/conf/WEB-INF/struts/struts-announcements.xml
40,6 → 40,8
validate="false">
<forward name="success" path="page.welcome"/>
<forward name="load" path="page.load.announcement"/>
<forward name="submit" path="page.submit.announcement"/>
 
</action>
</action-mappings>
 
/impl/src/java/pt/estgp/estgweb/web/controllers/AddRolesController.java
4,7 → 4,6
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionForm;
import pt.estgp.estgweb.web.form.announcements.AnnouncementsForm;
import pt.estgp.estgweb.web.form.AddRolesForm;
import pt.estgp.estgweb.web.UserSessionProxy;
import pt.estgp.estgweb.domain.UserSessionImpl;
42,7 → 41,7
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
sess.remove(TARGET_ROLES_KEY);
sess.serialize(request);
return mapping.getInputForward();
return mapping.findForward("submit");
}
catch(FilterChainFailedException e)
{
63,7 → 62,7
{
try
{
AddRolesForm addRolesForm = (AnnouncementsForm) form;
AddRolesForm addRolesForm = (AddRolesForm) form;
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
List<String> l = (List<String>) sess.get(TARGET_ROLES_KEY);
if(l == null)
/impl/src/java/pt/estgp/estgweb/web/controllers/blog/BlogController.java
78,6 → 78,7
Object[] args = new Object[]{blog};
BlogView bV = (BlogView) sm.execute(RequestUtils.getRequester(request),"CreateBlog",args,names);
addMessage(request,"blog.created.success","" + bV.getId());
request.setAttribute("BlogView",bV);
return mapping.findForward("success");
}
else
/impl/src/web/admin/blog/topnavCreateBlog.jsp
New file
0,0 → 1,10
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="jomm.web.utils.TopNav" %>
<%
TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
topNav.addNavPlace("/Welcome.do", "Home");
topNav.addNavPlace(null, "submit.blog");
%>
<jsp:include page="/layout/topnav.jsp"/>
/impl/src/web/layout/navigationLeft.jsp
22,6 → 22,9
<li>
<html:link action="/startSubmitAnnouncement"><bean:message key="submit.announcement"/></html:link>
</li>
<li>
<html:link action="/startSubmitBlog"><bean:message key="submit.blog"/></html:link>
</li>
 
<!--OTHER PLACES-->
<h2><bean:message key="Others"/></h2>
/impl/src/web/public/blog/blog.jsp
New file
0,0 → 1,17
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
<%@ taglib uri="/WEB-INF/tlds/estgweb.tld" prefix="estgweb" %>
<jsp:useBean id="BlogView" type="pt.estgp.estgweb.domain.views.BlogView"/>
 
<div class="seccao">
 
<h1><bean:write name="BlogView" property="title"/></h1>
<p>
<bean:write name="BlogView" property="description"/>
<bean:write name="BlogView" property="image.id"/>
</p>
</div>