Merge branch 'master' into 'master'

sisältöeditori, korjauksia

closes #9

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -36,8 +36,6 @@ public class BootstrapBean implements BootstrapBeanLocal {
 		dbUpdates.add(new String[] { "ALTER TABLE products ALTER COLUMN vat TYPE NUMERIC(4,3)" });
 		dbUpdates.add(new String[] { "ALTER TABLE products ALTER COLUMN vat TYPE NUMERIC(4,3)" });
 		dbUpdates.add(new String[] { "ALTER TABLE actionlog_messages DROP COLUMN crew" });
 		dbUpdates.add(new String[] { "ALTER TABLE actionlog_messages DROP COLUMN crew" });
 		dbUpdates.add(new String[] { "delete from application_permissions where application ilike '%terminal%'" });
 		dbUpdates.add(new String[] { "delete from application_permissions where application ilike '%terminal%'" });
-		
-		
 	}
 	}
 
 
 	@EJB
 	@EJB

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -236,6 +236,7 @@ public class MenuBean implements MenuBeanLocal {
 		contentnavi.addPage(menuitemfacade.findOrCreate("/pages/list"), ContentPermission.MANAGE_PAGES);
 		contentnavi.addPage(menuitemfacade.findOrCreate("/pages/list"), ContentPermission.MANAGE_PAGES);
 		contentnavi.addPage(menuitemfacade.findOrCreate("/pages/create"), ContentPermission.MANAGE_PAGES);
 		contentnavi.addPage(menuitemfacade.findOrCreate("/pages/create"), ContentPermission.MANAGE_PAGES);
 		contentnavi.addPage(menuitemfacade.findOrCreate("/pages/edit"), null).setVisible(false);
 		contentnavi.addPage(menuitemfacade.findOrCreate("/pages/edit"), null).setVisible(false);
+		contentnavi.addPage(menuitemfacade.findOrCreate("/pages/manage"), null).setVisible(false);
 
 
 		MenuNavigation lognavi = adminevent.addPage(null, null);
 		MenuNavigation lognavi = adminevent.addPage(null, null);
 		lognavi.setKey("topnavi.log");
 		lognavi.setKey("topnavi.log");

code/MoyaWeb/WebContent/pages/manage.xhtml

@@ -12,7 +12,7 @@
 			<f:event type="preRenderView" listener="#{sitePageView.initManage}" />
 			<f:event type="preRenderView" listener="#{sitePageView.initManage}" />
 		</f:metadata>
 		</f:metadata>
 		<ui:define name="content">
 		<ui:define name="content">
-			<pages:edit commitaction="#{sitePageView.saveSite()}" commitvalue="#{i18n['sitepage.save']}" />
+			<pages:edit commitaction="#{sitePageView.saveSite()}" commitvalue="#{i18n['sitepage.save']}"  />
 
 
 		</ui:define>
 		</ui:define>
 
 

code/MoyaWeb/WebContent/resources/cditools/pages/edit.xhtml

@@ -59,7 +59,7 @@
 
 
 				</h:panelGrid>
 				</h:panelGrid>
 
 
-				<p:editor value="#{cont.content}" />
+				<p:editor value="#{cont.content}" height="800" />
 			</div>
 			</div>
 		</ui:repeat>
 		</ui:repeat>