RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #132 from PaulLuchyn/master

Browse source 
Minor fixes
This commit is contained in:
Jeroen Baten 2016-11-29 15:29:07 +01:00 • committed by GitHub
commit 144aa7c4e1
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardControllerGlobal.java
View file

@ -180,6 +180,7 @@ public class DashboardControllerGlobal extends GenericForwardComposer {
( (Label) pipelineGrid.getCell(i, orderStatus.getIndex()) ).setTooltiptext(tooltipText); ( (Label) pipelineGrid.getCell(i, orderStatus.getIndex()) ).setTooltiptext(tooltipText);
( (Label) pipelineGrid.getCell(i, orderStatus.getIndex()) ).setClass("label-highlight"); ( (Label) pipelineGrid.getCell(i, orderStatus.getIndex()) ).setClass("label-highlight");
( (Label) pipelineGrid.getCell(i, orderStatus.getIndex()) ).setStyle("word-wrap: break-word");
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }

3
libreplan-webapp/src/main/webapp/common/configuration.zul
View file

@ -356,7 +356,8 @@
<hbox> <hbox>
<textbox id="ldapPort" <textbox id="ldapPort"
value="@{configurationController.ldapConfiguration.ldapPort}" value="@{configurationController.ldapConfiguration.ldapPort}"
width="300px"/> width="300px"
maxlength="5"/>
<label value="${i18n:__('Example: {0}', '389')}" /> <label value="${i18n:__('Example: {0}', '389')}" />
</hbox> </hbox>
</row> </row>

7
libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul
View file

@ -93,7 +93,7 @@
<row> <row>
<label value="${i18n:_('Description')}" /> <label value="${i18n:_('Description')}" />
<textbox id="descriptionNameTextBox" width="636px" rows="4" <textbox id="descriptionNameTextBox" width="636px" rows="4"
value="@{issueLogController.issueLog.description}"/> value="@{issueLogController.issueLog.description}" maxlength="512"/>
</row> </row>
<row> <row>
<label value="${i18n:_('Categories')}" /> <label value="${i18n:_('Categories')}" />
@ -124,7 +124,7 @@
<row> <row>
<label value="${i18n:_('Assigned to')}" /> <label value="${i18n:_('Assigned to')}" />
<textbox id="assignedToTextBox" width="636px" <textbox id="assignedToTextBox" width="636px"
value="@{issueLogController.issueLog.assignedTo}"/> value="@{issueLogController.issueLog.assignedTo}" maxlength="50"/>
</row> </row>
<row> <row>
<label value="${i18n:_('Timing')}" /> <label value="${i18n:_('Timing')}" />
@ -152,7 +152,8 @@
</row> </row>
<row> <row>
<label value="${i18n:_('Notes')}" /> <label value="${i18n:_('Notes')}" />
<textbox value="@{issueLogController.issueLog.notes}" width="636px" rows="8" multiline="true" /> <textbox value="@{issueLogController.issueLog.notes}" width="636px" rows="8" multiline="true"
maxlength="256"/>
</row> </row>
</rows> </rows>
</grid> </grid>

14
libreplan-webapp/src/main/webapp/logs/_editRiskLog.zul
View file

@ -42,7 +42,8 @@
<row> <row>
<label value="${i18n:_('Status')}" /> <label value="${i18n:_('Status')}" />
<textbox value="@{riskLogController.riskLog.status}" width="636px" rows="1" multiline="false" /> <textbox value="@{riskLogController.riskLog.status}" width="636px" rows="1" multiline="false"
maxlength="25"/>
</row> </row>
<row> <row>
@ -109,12 +110,12 @@
<row> <row>
<label value="${i18n:_('Description')}" /> <label value="${i18n:_('Description')}" />
<textbox id="descriptionNameTextBox" width="636px" rows="3" <textbox id="descriptionNameTextBox" width="636px" rows="3"
value="@{riskLogController.riskLog.description}"/> value="@{riskLogController.riskLog.description}" maxlength="512"/>
</row> </row>
<row> <row>
<label value="${i18n:_('Counter measures (CM)')}" /> <label value="${i18n:_('Counter measures (CM)')}" />
<textbox id="counterMeasuresTextbox" width="636px" rows="3" <textbox id="counterMeasuresTextbox" width="636px" rows="3"
value="@{riskLogController.riskLog.counterMeasures}"/> value="@{riskLogController.riskLog.counterMeasures}" maxlength="50"/>
</row> </row>
<row> <row>
<label value="${i18n:_('Risk Score After CM')}" /> <label value="${i18n:_('Risk Score After CM')}" />
@ -126,7 +127,7 @@
<row> <row>
<label value="${i18n:_('Contingency')}" /> <label value="${i18n:_('Contingency')}" />
<textbox id="contingencyBox" width="636px" rows="3" <textbox id="contingencyBox" width="636px" rows="3"
value="@{riskLogController.riskLog.contingency}"/> value="@{riskLogController.riskLog.contingency}" maxlength="50"/>
</row> </row>
<row> <row>
<label value="${i18n:_('Prevention')}" /> <label value="${i18n:_('Prevention')}" />
@ -147,14 +148,15 @@
<label value="${i18n:_('Responsible')}" /> <label value="${i18n:_('Responsible')}" />
<textbox id="responsibleBox" width="315px" rows="1" <textbox id="responsibleBox" width="315px" rows="1"
value="@{riskLogController.riskLog.responsible}"/> value="@{riskLogController.riskLog.responsible}" maxlength="25"/>
</row> </row>
</rows> </rows>
</grid> </grid>
</row> </row>
<row> <row>
<label value="${i18n:_('Notes')}" /> <label value="${i18n:_('Notes')}" />
<textbox value="@{riskLogController.riskLog.notes}" width="636px" rows="5" multiline="true" /> <textbox value="@{riskLogController.riskLog.notes}" width="636px" rows="5" multiline="true"
maxlength="256"/>
</row> </row>
</rows> </rows>
</grid> </grid>