[elvystrac] r1665 - 1) redirection on index page fixed (phaseListener replaced by html forward in header)
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Wed, 3 Feb 2010 13:47:26 +0100
Author: DavidK
Date: 2010-02-03 13:47:25 +0100 (Wed, 03 Feb 2010)
New Revision: 1665
Added:
trunk/server/webServer2/WebContent/js/elvys-template.js
Removed:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/support/IndexPageRedirectPhaseListener.java
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ElvysesCompanyBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
trunk/server/webServer2/WebContent/applets/bin/LayoutDesigner.jar
trunk/server/webServer2/WebContent/index.xhtml
trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml
trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
trunk/server/webServer2/WebContent/template/elvys-template.xhtml
Log:
1) redirection on index page fixed (phaseListener replaced by html forward in
header)
2) enabling/disabling of elvys fixed
3) calling 'create new layout' from menu fixed
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ElvysesCompanyBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ElvysesCompanyBean.java
2010-01-29 18:30:52 UTC (rev 1664)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ElvysesCompanyBean.java
2010-02-03 12:47:25 UTC (rev 1665)
@@ -210,6 +210,7 @@
}
/**
+ * method for setting whether elvys is active or not
* @param boolValue
*/
public void setActiveState(boolean boolValue) {
@@ -224,6 +225,8 @@
throw new RuntimeException(e);
}
+ // reload UC
+ prepareList();
}
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-01-29 18:30:52 UTC (rev 1664)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-03 12:47:25 UTC (rev 1665)
@@ -182,7 +182,7 @@
catdef.edit.form.button.cancel=Zp\u011Bt
catdef.assign.maintitle=Kategorie pl\u00E1nov\u00E1n\u00ED
catdef.assign.step1.link.toelvyses=Zp\u011Bt na seznam kiosk\u016F
-catdef.assign.step1.title=Nastaven\u00ED kategorie pl\u00E1nov\u00E1n\u00ED
pro kiosek
+catdef.assign.step1.title=P\u0159i\u0159azen\u00ED kategorie
pl\u00E1nov\u00E1n\u00ED pro kiosek
catdef.assign.step1.elvys=Zpracov\u00E1van\u00FD kiosek
catdef.assign.step1.listofavailable=Nep\u0159i\u0159azen\u00E9 kategorie
catdef.assign.step1.listofavailable.add.tooltip=P\u0159id\u00E1 pro kiosek
mo\u017Enost pl\u00E1nov\u00E1n\u00ED dat na danou kategorii
@@ -242,11 +242,10 @@
elvys.list.table.screenshot=Sn\u00EDmek obrazovky
elvys.list.table.screenshotnotactive=Neaktivn\u00ED
elvys.list.table.manage=Spr\u00E1va
-elvys.list.table.setlayout=Nastaven\u00ED rozvr\u017Een\u00ED obrazovky
elvys.list.table.assigncategory=P\u0159i\u0159azen\u00ED kategori\u00ED
pl\u00E1nov\u00E1n\u00ED pro dan\u00FD kiosek
elvys.list.table.activate=Aktivovat
elvys.list.table.deactivate=Deaktivovat
-elvys.list.table.cannotactivate=Elvys m\u016F\u017Ee b\u00FDt aktivov\u00E1n
a\u017E po p\u0159i\u0159azen\u00ED rozvr\u017Een\u00ED obrazovky
+elvys.list.table.cannotactivate=Kiosek, kter\u00FD nem\u00E1
p\u0159i\u0159azenou \u017E\u00E1dnou kategorii, nem\u016F\u017Ee b\u00FDt
aktivov\u00E1n.
elvys.list.table.companyname=Jm\u00E9no spole\u010Dnosti
elvys.list.table.city=M\u011Bsto
elvys.list.table.adress=Adresa
Deleted:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/support/IndexPageRedirectPhaseListener.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/support/IndexPageRedirectPhaseListener.java
2010-01-29 18:30:52 UTC (rev 1664)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/support/IndexPageRedirectPhaseListener.java
2010-02-03 12:47:25 UTC (rev 1665)
@@ -1,26 +0,0 @@
-package cz.elvys.webServer.support;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-
-public class IndexPageRedirectPhaseListener implements PhaseListener {
-
- public void afterPhase(PhaseEvent arg0) {
- }
-
- public void beforePhase(PhaseEvent phaseEvent) {
- FacesContext facesContext = phaseEvent.getFacesContext();
- String destViewPage = facesContext.getViewRoot().getViewId();
- if(destViewPage.equals("/index.xhtml") ||
destViewPage.equals("//index.xhtml")) {
- // redirect to login...
- facesContext.getViewRoot().setViewId("/login.jsf");
- }
- }
-
- public PhaseId getPhaseId() {
- return PhaseId.RENDER_RESPONSE;
- }
-
-}
Modified: trunk/server/webServer2/WebContent/applets/bin/LayoutDesigner.jar
===================================================================
(Binary files differ)
Modified: trunk/server/webServer2/WebContent/index.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/index.xhtml 2010-01-29 18:30:52 UTC
(rev 1664)
+++ trunk/server/webServer2/WebContent/index.xhtml 2010-02-03 12:47:25 UTC
(rev 1665)
@@ -1,8 +1,6 @@
<!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:h="http://java.sun.com/jsf/html";
- xmlns:f="http://java.sun.com/jsf/core";
- xmlns:ui="http://java.sun.com/jsf/facelets";>
-
-
+<html xmlns="http://www.w3.org/1999/xhtml";>
+<head>
+ <meta http-equiv="Refresh" content="0; URL=login.jsf"/>
+</head>
</html>
\ No newline at end of file
Added: trunk/server/webServer2/WebContent/js/elvys-template.js
===================================================================
--- trunk/server/webServer2/WebContent/js/elvys-template.js
(rev 0)
+++ trunk/server/webServer2/WebContent/js/elvys-template.js 2010-02-03
12:47:25 UTC (rev 1665)
@@ -0,0 +1,4 @@
+function showLayoutEditor() {
+
features="height=700,width=1000,status=yes,toolbar=no,menubar=no,location=no,scrollbars=yes";
+
winId=window.open('/webServer2/secured/layoutrel/layoutEdit.jsf','NOVEOKNO',features);
// open an empty window
+}
\ No newline at end of file
Modified:
trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml
2010-01-29 18:30:52 UTC (rev 1664)
+++
trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml
2010-02-03 12:47:25 UTC (rev 1665)
@@ -229,7 +229,7 @@
<!-- CREATE NEW LAYOUT -->
<a4j:commandButton id="CreateLayoutButton"
image="/images/icons/create.png"
-
oncomplete="showLayoutEditor(this,'LayoutDesignerHiddenForm','show')"
+
oncomplete="showLayoutEditor2(this,'LayoutDesignerHiddenForm','show')"
reRender="#{id}">
<f:setPropertyActionListener
value="#{null}"
target="#{layoutEditBean.layoutToEdit}" />
Modified:
trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
2010-01-29 18:30:52 UTC (rev 1664)
+++ trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
2010-02-03 12:47:25 UTC (rev 1665)
@@ -86,21 +86,8 @@
<rich:toolTip
for="AssignCategoryButton">
<h:outputText
value="#{lbl['elvys.list.table.assigncategory']}"/>
</rich:toolTip>
- </h:panelGroup>
- <h:panelGroup rendered="#{false and
user.compStr!='user'}">
- <!-- SET LAYOUT -->
- <a4j:commandButton
-
id="SetLayoutButton"
-
rendered="#{user.compStr!='superadmin'}"
-
image="/images/icons/edit.png"
-
onclick="Richfaces.showModalPanel('ElvysSettingModalWindow',{left:10, top:10})"
-
reRender="ElvysSettingModalWindowContent, layoutListComponent">
-
<f:setPropertyActionListener value="#{record.elvys}"
target="#{elvysesBean.selectedElvys}" />
-
<f:setPropertyActionListener value="elvysesBean.invalidateSelected"
target="#{elvysesBean.listeners}"/>
- </a4j:commandButton>
- <rich:toolTip
for="SetLayoutButton">
- <h:outputText
value="#{lbl['elvys.list.table.setlayout']}"/>
- </rich:toolTip>
+
+
<!-- DEACTIVATE ELVYS -->
<a4j:commandButton
id="DeactivateButton"
@@ -116,7 +103,7 @@
<!-- ACTIVATE ELVYS -->
<a4j:commandButton
id="ActivateButton"
-
rendered="#{!record.elvys.active and
record.elvys.elvysSetting.layoutByDayLayout != null}"
+
rendered="#{!record.elvys.active and record.catCount > 0}"
reRender="listOfElvyses"
image="/images/icons/activate.png">
<f:setPropertyActionListener value="#{record.elvys}"
target="#{elvysesBean.selectedElvys}" />
@@ -126,7 +113,7 @@
<h:outputText
value="#{lbl['elvys.list.table.activate']}"/>
</rich:toolTip>
<!-- CANNOT ACTIVATE ELVYS -->
- <h:graphicImage
id="CannotActivate" url="/images/icons/activate.png"
rendered="#{!record.elvys.active and
record.elvys.elvysSetting.layoutByDayLayout == null}"/>
+ <h:graphicImage
id="CannotActivate" url="/images/icons/activate.png"
rendered="#{!record.elvys.active and record.catCount == 0}"/>
<rich:toolTip
for="CannotActivate">
<h:outputText
value="#{lbl['elvys.list.table.cannotactivate']}"/>
</rich:toolTip>
Modified: trunk/server/webServer2/WebContent/template/elvys-template.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/template/elvys-template.xhtml
2010-01-29 18:30:52 UTC (rev 1664)
+++ trunk/server/webServer2/WebContent/template/elvys-template.xhtml
2010-02-03 12:47:25 UTC (rev 1665)
@@ -18,14 +18,7 @@
<ui:define name="script">
<ui:insert name="pageScript"/>
- <script type="text/javascript" language="javascript">
- <!--
- function showLayoutEditor() {
-
features="height=700,width=1000,status=yes,toolbar=no,menubar=no,location=no,scrollbars=yes";
-
winId=window.open('/webServer2/secured/layoutrel/layoutEdit.jsf','NOVEOKNO',features);
// open an empty window
- }
- -->
- </script>
+ <script type="text/javascript" language="javascript"
src="/webServer2/js/elvys-template.js"/>
</ui:define>
<ui:define name="style">
@@ -67,8 +60,8 @@
<rich:menuItem
id="LayoutListMenuItem" value="#{lbl['template.menu.layout.list']}"
action="layoutList" submitMode="server"/>
<rich:menuItem
id="LayoutCreateMenuItem"
value="#{lbl['template.menu.layout.create']}"
-
submitMode="client"
-
onclick="showLayoutEditor();">
+
submitMode="ajax"
+
oncomplete="showLayoutEditor();">
<f:setPropertyActionListener value="#{null}"
target="#{layoutEditBean.layoutToEdit}" />
<f:actionListener
type="cz.elvys.webServer.beans.layoutrel.LayoutEditBean$StartCreatingLayoutListener"/>
Other related posts:
- » [elvystrac] r1665 - 1) redirection on index page fixed (phaseListener replaced by html forward in header) - elvys
