Author: DavidK Date: 2010-02-23 11:24:02 +0100 (Tue, 23 Feb 2010) New Revision: 1823 Modified: trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml Log: layout list changed Modified: trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties =================================================================== --- trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties 2010-02-23 09:39:24 UTC (rev 1822) +++ trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties 2010-02-23 10:24:02 UTC (rev 1823) @@ -145,8 +145,8 @@ layout.list.body.title=Seznam rozvr\u017Een\u00ED layout.list.id=ID -layout.list.name=Jm\u00E9no -layout.list.numposition=Pozic +layout.list.name=N\u00E1zev +layout.list.numposition=Pozice layout.list.revision=Revize layout.list.modified=Modifikov\u00E1no layout.list.created=Vytvo\u0159eno Modified: trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml 2010-02-23 09:39:24 UTC (rev 1822) +++ trunk/server/webServer2/WebContent/secured/components/layoutListComponent.xhtml 2010-02-23 10:24:02 UTC (rev 1823) @@ -75,12 +75,8 @@ width="700px" value="#{layoutListComponentBean.layoutsList}" var="layout" - rows="10"> + rows="15"> <h:column> - <f:facet name="header">#{lbl['layout.list.id']}</f:facet> - <h:outputText value="#{layout.id}" /> - </h:column> - <h:column> <f:facet name="header">#{lbl['layout.list.name']}</f:facet> <h:outputText value="#{layout.name}" /> </h:column> @@ -102,21 +98,6 @@ <f:facet name="header">#{lbl['layout.list.created']}</f:facet> <elvys:dateTimeLabel id="CreatedDate" value="#{layout.created}"/> </h:column> - <!-- SHOW IMAGE BUTTON --> - <h:column rendered="#{showSchema == true}"> - <f:facet name="header">#{lbl['layout.list.preview']}</f:facet> - <a4j:commandButton id="ShowLayoutImgButton" - reRender="ModalShowLayoutImgContent" - onclick="Richfaces.showModalPanel('ModalShowLayoutImg')" - image="/images/icons/detail.png"> - <f:setPropertyActionListener value="#{layout.id}" - target="#{layoutPreviewModalBean.layoutId}" /> - <f:setPropertyActionListener value="layoutListComponentBean.invalidateSelectedForPreview" - target="#{layoutPreviewModalBean.listeners}"/> - </a4j:commandButton> - <rich:toolTip for="ShowLayoutImgButton" - value="#{lbl['layout.list.previewtooltip']}" /> - </h:column> <!-- EDIT AND DELETE LAYOUT --> <h:column> @@ -139,7 +120,7 @@ </a4j:commandButton> <rich:toolTip for="ChooseButton1" value="#{chListenerTooltip1}" - direction="top-left" styleClass="short_tooltip" /> + direction="bottom-left" styleClass="short_tooltip" /> </h:panelGroup> <!-- FIRE LISTENER 2 --> <h:panelGroup styleClass="list-operations-item" @@ -157,8 +138,26 @@ </a4j:commandButton> <rich:toolTip for="ChooseButton2" value="#{chListenerTooltip2}" - direction="top-left" styleClass="short_tooltip" /> + direction="bottom-left" styleClass="short_tooltip" /> </h:panelGroup> + <!-- DELETE --> + <h:panelGroup styleClass="list-operations-item" + rendered="#{showDelete == true}"> + <a4j:commandButton + id="DeleteLayoutButton" + image="/images/icons/delete.gif" + reRender="DeleteLayoutForm" + onclick="Richfaces.showModalPanel('DeleteLayoutModal',{left:300, top:300})"> + <f:setPropertyActionListener value="#{layout.id}" + target="#{layoutListComponentBean.layoutId}" /> + <f:setPropertyActionListener value="#{layout.name}" + target="#{layoutListComponentBean.layoutName}" /> + </a4j:commandButton> + <rich:toolTip for="DeleteLayoutButton" + value="#{lbl['layout.list.deletelayouttooltip']}" + direction="bottom-left" styleClass="short_tooltip" /> + </h:panelGroup> + <!-- EDIT --> <h:panelGroup styleClass="list-operations-item" rendered="#{showEdit}"> @@ -172,24 +171,26 @@ </a4j:commandButton> <rich:toolTip for="EditLayoutButton" value="#{lbl['layout.list.editlayouttooltip']}" - direction="top-left" styleClass="short_tooltip" /> + direction="bottom-left" styleClass="short_tooltip" /> </h:panelGroup> - <!-- DELETE --> + + <!-- SHOW PREVIEW BUTTON --> <h:panelGroup styleClass="list-operations-item" - rendered="#{showDelete == true}"> - <a4j:commandButton - id="DeleteLayoutButton" - image="/images/icons/delete.gif" - reRender="DeleteLayoutForm" - onclick="Richfaces.showModalPanel('DeleteLayoutModal',{left:300, top:300})"> + rendered="#{showSchema == true}"> + + <f:facet name="header">#{lbl['layout.list.preview']}</f:facet> + <a4j:commandButton id="ShowLayoutImgButton" + reRender="ModalShowLayoutImgContent" + onclick="Richfaces.showModalPanel('ModalShowLayoutImg')" + image="/images/icons/detail.png"> <f:setPropertyActionListener value="#{layout.id}" - target="#{layoutListComponentBean.layoutId}" /> - <f:setPropertyActionListener value="#{layout.name}" - target="#{layoutListComponentBean.layoutName}" /> + target="#{layoutPreviewModalBean.layoutId}" /> + <f:setPropertyActionListener value="layoutListComponentBean.invalidateSelectedForPreview" + target="#{layoutPreviewModalBean.listeners}"/> </a4j:commandButton> - <rich:toolTip for="DeleteLayoutButton" - value="#{lbl['layout.list.deletelayouttooltip']}" - direction="top-left" styleClass="short_tooltip" /> + <rich:toolTip for="ShowLayoutImgButton" + value="#{lbl['layout.list.previewtooltip']}" + direction="bottom-left" styleClass="short_tooltip" /> </h:panelGroup> </div> </h:column>