[elvystrac] r1710 - better planning, part 4. - People with low resolution won't get epileptic fit while planning :)
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Thu, 11 Feb 2010 18:08:18 +0100
Author: DavidK
Date: 2010-02-11 18:08:18 +0100 (Thu, 11 Feb 2010)
New Revision: 1710
Added:
trunk/server/webServer2/WebContent/js/layoutrel/layoutPreviewComponent.js
trunk/server/webServer2/WebContent/styles/layout/
trunk/server/webServer2/WebContent/styles/layout/layoutPreviewComponent.css
Modified:
trunk/server/webServer2/WebContent/secured/components/layoutPreviewComponent.xhtml
trunk/server/webServer2/WebContent/secured/elvysrel/planDocuments.xhtml
trunk/server/webServer2/WebContent/styles/planning/planDocuments.css
Log:
better planning, part 4. - People with low resolution won't get epileptic fit
while planning :)
(Tooltip with layout-preview on planning component now will show properly.)
Added: trunk/server/webServer2/WebContent/js/layoutrel/layoutPreviewComponent.js
===================================================================
Modified:
trunk/server/webServer2/WebContent/secured/components/layoutPreviewComponent.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/components/layoutPreviewComponent.xhtml
2010-02-11 16:09:49 UTC (rev 1709)
+++
trunk/server/webServer2/WebContent/secured/components/layoutPreviewComponent.xhtml
2010-02-11 17:08:18 UTC (rev 1710)
@@ -24,35 +24,35 @@
USES:
-->
+
+<ui:define name="pageStyle">
+ <a4j:loadStyle src="/styles/layout/layoutPreviewComponent.css"/>
+</ui:define>
+<ui:define name="pageScript">
+ <script type="text/javascript" language="javascript"
src="/webServer2/js/layout/layoutPreviewComponent.js"/>
+</ui:define>
+
+
<h:panelGroup id="layoutPreviewComponentArea"
rendered="#{(not empty layoutID) and (not empty id)}">
<elvys:layoutPreviewInitTagHandler layoutID="#{layoutID}"/>
- <div id="#{id}"
- style="position: relative;
- width: #{layoutPreviewBean.layoutWidth}px;
- height:#{layoutPreviewBean.layoutHeight}px;
- border:1px solid black;
- padding:0px;
- margin:0px;
- -moz-box-sizing:content-box;
- box-sizing: content-box;
- background-color: none;">
+ <div id="#{id}"
+ class="layout-preview-main"
+ style="
+ width: #{layoutPreviewBean.layoutWidth}px;
+ height:#{layoutPreviewBean.layoutHeight}px;">
<ui:repeat
value="#{layoutPreviewBean.rectPositions}" var="rect">
<div id="#{posPrefix}#{rect.number}"
- style="border:2px solid black;
-
position:absolute;
-
margin:0px;
-
padding:0px;
-
top:#{rect.ypoint}px;
-
left:#{rect.xpoint}px;
-
width:#{rect.width}px;
-
height:#{rect.height}px;
-
font-size:#{rect.fontNum}px;
-
text-align:center;
-
background-color: white;">
+ class="layout-preview-position"
+ style="
+ top:#{rect.ypoint}px;
+ left:#{rect.xpoint}px;
+ width:#{rect.width}px;
+ height:#{rect.height}px;
+ font-size:#{rect.fontNum}px;">
<h:outputText value="#{rect.number}" /></div>
</ui:repeat>
</div>
Modified:
trunk/server/webServer2/WebContent/secured/elvysrel/planDocuments.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/elvysrel/planDocuments.xhtml
2010-02-11 16:09:49 UTC (rev 1709)
+++ trunk/server/webServer2/WebContent/secured/elvysrel/planDocuments.xhtml
2010-02-11 17:08:18 UTC (rev 1710)
@@ -31,6 +31,7 @@
<h:panelGroup styleClass="scheduler-head">
<!-- SCHEDULER CONTROLS -->
+ <br/>
<h:panelGrid columns="2"
styleClass="scheduler-controls">
<h:outputLabel
value="#{lbl['elvys.plan.component.category']}:"/>
<h:selectOneMenu id="SelectCategoryBox"
@@ -106,79 +107,84 @@
</h:panelGroup>
</h:panelGrid>
</h:panelGroup>
- <rich:separator height="2" lineType="solid"/><br/>
- <h:panelGroup styleClass="scheduler-time-part">
- <h:outputLabel
value="#{lbl['elvys.plan.component.start']} "/>
- <b>
- <h:outputLabel
value="#{filePlanningBean.segmentFrom}">
-
<f:convertDateTime dateStyle="short" timeZone="#{user.defaultTimezone}"
pattern="dd.MM.yyyy" type="date"/>
- </h:outputLabel>
- </b>
- <h:outputText
value="#{lbl['elvys.plan.component.end']} "/>
- <b>
- <h:outputLabel
value="#{filePlanningBean.segmentTo}">
-
<f:convertDateTime dateStyle="short" timeZone="#{user.defaultTimezone}"
pattern="dd.MM.yyyy" type="date"/>
- </h:outputLabel>
- </b>
- <h:panelGroup
styleClass="scheduler-period-area">
- <h:outputLabel
value="#{lbl['elvys.plan.component.shownperiod']}: "
styleClass="scheduler-period-label"/>
- <h:panelGroup
styleClass="scheduler-period-choice">
- <a4j:commandLink
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'day3'}"
-
reRender="SchedulerComponent"
-
actionListener="#{filePlanningBean.showThreeDaysComponentWidth}"
-
value="#{lbl['elvys.plan.component.shownperiod.threedays']}"
-
styleClass="period-link" />
- <h:outputText
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'day3'}"
-
value="#{lbl['elvys.plan.component.shownperiod.threedays']}"
-
styleClass="period-selected" />
-
- <h:outputText value=" |
" />
-
- <a4j:commandLink
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'week1'}"
-
reRender="SchedulerComponent"
-
actionListener="#{filePlanningBean.showWeekComponentWidth}"
-
value="#{lbl['elvys.plan.component.shownperiod.week']}"
-
styleClass="period-link" />
- <h:outputText
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'week1'}"
-
value="#{lbl['elvys.plan.component.shownperiod.week']}"
-
styleClass="period-selected" />
-
- <h:outputText value=" |
" />
-
- <a4j:commandLink
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'week2'}"
-
reRender="SchedulerComponent"
-
actionListener="#{filePlanningBean.showTwoWeeksComponentWidth}"
-
value="#{lbl['elvys.plan.component.shownperiod.twoweeks']}"
-
styleClass="period-link" />
- <h:outputText
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'week2'}"
-
value="#{lbl['elvys.plan.component.shownperiod.twoweeks']}"
-
styleClass="period-selected" />
-
- <h:outputText value=" |
" />
-
- <a4j:commandLink
-
reRender="SchedulerComponent"
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'month1'}"
-
actionListener="#{filePlanningBean.showMonthComponentWidth}"
-
value="#{lbl['elvys.plan.component.shownperiod.month']}"
-
styleClass="period-link" />
- <h:outputText
-
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'month1'}"
-
value="#{lbl['elvys.plan.component.shownperiod.month']}"
-
styleClass="period-selected" />
- </h:panelGroup>
+
+
+ <br/>
+ <rich:separator height="2" lineType="solid"/>
+ <br/>
+ <h:panelGroup styleClass="scheduler-time-part">
+ <h:outputLabel
value="#{lbl['elvys.plan.component.start']} "/>
+ <b>
+ <h:outputLabel
value="#{filePlanningBean.segmentFrom}">
+ <f:convertDateTime
dateStyle="short" timeZone="#{user.defaultTimezone}" pattern="dd.MM.yyyy"
type="date"/>
+ </h:outputLabel>
+ </b>
+ <h:outputText
value="#{lbl['elvys.plan.component.end']} "/>
+ <b>
+ <h:outputLabel
value="#{filePlanningBean.segmentTo}">
+ <f:convertDateTime
dateStyle="short" timeZone="#{user.defaultTimezone}" pattern="dd.MM.yyyy"
type="date"/>
+ </h:outputLabel>
+ </b>
+ <h:panelGroup
styleClass="scheduler-period-area">
+ <h:outputLabel
value="#{lbl['elvys.plan.component.shownperiod']}: "
styleClass="scheduler-period-label"/>
+ <h:panelGroup
styleClass="scheduler-period-choice">
+ <a4j:commandLink
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'day3'}"
+
reRender="SchedulerComponent"
+
actionListener="#{filePlanningBean.showThreeDaysComponentWidth}"
+
value="#{lbl['elvys.plan.component.shownperiod.threedays']}"
+
styleClass="period-link" />
+ <h:outputText
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'day3'}"
+
value="#{lbl['elvys.plan.component.shownperiod.threedays']}"
+
styleClass="period-selected" />
+
+ <h:outputText value=" | " />
+
+ <a4j:commandLink
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'week1'}"
+
reRender="SchedulerComponent"
+
actionListener="#{filePlanningBean.showWeekComponentWidth}"
+
value="#{lbl['elvys.plan.component.shownperiod.week']}"
+
styleClass="period-link" />
+ <h:outputText
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'week1'}"
+
value="#{lbl['elvys.plan.component.shownperiod.week']}"
+
styleClass="period-selected" />
+
+ <h:outputText value=" | " />
+
+ <a4j:commandLink
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'week2'}"
+
reRender="SchedulerComponent"
+
actionListener="#{filePlanningBean.showTwoWeeksComponentWidth}"
+
value="#{lbl['elvys.plan.component.shownperiod.twoweeks']}"
+
styleClass="period-link" />
+ <h:outputText
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'week2'}"
+
value="#{lbl['elvys.plan.component.shownperiod.twoweeks']}"
+
styleClass="period-selected" />
+
+ <h:outputText value=" | " />
+
+ <a4j:commandLink
+
reRender="SchedulerComponent"
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId != 'month1'}"
+
actionListener="#{filePlanningBean.showMonthComponentWidth}"
+
value="#{lbl['elvys.plan.component.shownperiod.month']}"
+
styleClass="period-link" />
+ <h:outputText
+
rendered="#{filePlanningBean.schedulerPeriodManager.textId == 'month1'}"
+
value="#{lbl['elvys.plan.component.shownperiod.month']}"
+
styleClass="period-selected" />
</h:panelGroup>
- <h:panelGroup
styleClass="scheduler-num-days">
- <b><h:outputLabel
value="#{filePlanningBean.schedulerDays} "/></b>
- <h:outputLabel
value="#{lbl['elvys.plan.component.days']}"/>
- </h:panelGroup>
</h:panelGroup>
+ <h:panelGroup styleClass="scheduler-num-days">
+ <b><h:outputLabel
value="#{filePlanningBean.schedulerDays} "/></b>
+ <h:outputLabel
value="#{lbl['elvys.plan.component.days']}"/>
+ </h:panelGroup>
+ </h:panelGroup>
+ <br/>
<rich:separator height="2" lineType="solid"/><br/>
<!-- SCHEDULER HEADER -->
<h:panelGrid columns="1"
Added:
trunk/server/webServer2/WebContent/styles/layout/layoutPreviewComponent.css
===================================================================
--- trunk/server/webServer2/WebContent/styles/layout/layoutPreviewComponent.css
(rev 0)
+++ trunk/server/webServer2/WebContent/styles/layout/layoutPreviewComponent.css
2010-02-11 17:08:18 UTC (rev 1710)
@@ -0,0 +1,19 @@
+.layout-preview-main {
+ position: relative;
+ border: 1px solid black;
+ padding: 0px;
+ margin: 0px;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ background-color: none;
+}
+
+
+.layout-preview-position {
+ border: 2px solid black;
+ position: absolute;
+ margin: 0px;
+ padding: 0px;
+ text-align: center;
+ background-color: white;
+}
\ No newline at end of file
Modified: trunk/server/webServer2/WebContent/styles/planning/planDocuments.css
===================================================================
--- trunk/server/webServer2/WebContent/styles/planning/planDocuments.css
2010-02-11 16:09:49 UTC (rev 1709)
+++ trunk/server/webServer2/WebContent/styles/planning/planDocuments.css
2010-02-11 17:08:18 UTC (rev 1710)
@@ -1,3 +1,8 @@
+html body {
+ overflow-y:scroll;
+}
+
+
.scheduler-head {
overflow: auto;
display: block;
@@ -65,6 +70,8 @@
display: none;
}
+.layout-preview-main {
+}
@@ -72,8 +79,6 @@
-
-
/* rectangles */
.rectangle_outer {padding-bottom:1px; float:left; }
.rectangle { height: 20px; border:1px solid #000000; display:block;
overflow:hidden; text-align:center;}
Other related posts:
- » [elvystrac] r1710 - better planning, part 4. - People with low resolution won't get epileptic fit while planning :) - elvys
