style timesheet edit popup window

This commit is contained in:
Hadi Nategh 2014-03-10 15:19:28 +00:00
parent d62bec8088
commit 306e3488ba
3 changed files with 62 additions and 46 deletions

View File

@ -1374,4 +1374,8 @@ ul.et2_nowrap, div.et2_nowrap{
height: 16px; height: 16px;
right: -16px; right: -16px;
top: 8px; top: 8px;
} }
.et2_fullWidth select.et2_date_duration {
width: 79%;
}

View File

@ -1,2 +1,5 @@
/* $Id$ */ /* $Id$ */
.timesheet_titleSum,.timesheet_titleDetails { font-weight: bold; } .timesheet_titleSum,.timesheet_titleDetails { font-weight: bold; }
div#timesheet-edit.et2_container {
width: 842px;
}

View File

@ -4,51 +4,65 @@
<template id="timesheet.edit.general" template="" lang="" group="0" version="1.7.002"> <template id="timesheet.edit.general" template="" lang="" group="0" version="1.7.002">
<grid width="100%" height="165"> <grid width="100%" height="165">
<columns> <columns>
<column width="95"/> <column width="102"/>
<column width="120"/> <column width="200"/>
<column width="80" disabled="@ts_viewtype"/> <column width="102" disabled="@ts_viewtype"/>
<column disabled="@ts_viewtype"/> <column width="200" disabled="@ts_viewtype"/>
<column width="220"/>
</columns> </columns>
<rows> <rows>
<row class="row" disabled="@ts_viewtype"> <row class="row" disabled="@ts_viewtype">
<description value="Title" for="ts_title"/> <description value="Title" for="ts_title"/>
<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="80" span="all" class="fullWidth" tabindex="1"/> <textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="80" class="et2_fullWidth" tabindex="1"/>
<description/>
<description/> <description/>
<description/> <description/>
</row> </row>
<row class="row" disabled="!@ts_viewtype"> <row class="row" disabled="!@ts_viewtype">
<description value="comment"/> <description value="comment"/>
<textbox multiline="true" id="ts_description" rows="5" cols="50" span="all" class="fullWidth"/> <textbox multiline="true" id="ts_description" rows="5" cols="50" class="et2_fullWidth"/>
<description/>
<description/> <description/>
<description/> <description/>
</row> </row>
<row class="row"> <row class="row">
<description value="Category" for="cat_id"/> <description value="Category" for="cat_id"/>
<menulist span="all"> <menulist>
<menupopup type="select-cat" id="cat_id" options="None,,,timesheet"/> <menupopup type="select-cat" id="cat_id" options="None,,,timesheet" class="et2_fullWidth"/>
</menulist> </menulist>
<description/>
<description/>
<description/>
</row> </row>
<row class="row"> <row class="row">
<description value="Date" for="ts_start"/> <description value="Date" for="ts_start"/>
<date id="ts_start" needed="1" options=",8"/> <date id="ts_start" needed="1" options=",8" class="et2_fullWidth"/>
<description value="Starttime"/> <description value="Starttime"/>
<date-timeonly id="start_time" options="H:i"/> <date-timeonly id="start_time" options="H:i" class="et2_fullWidth"/>
<description/>
</row> </row>
<row class="row"> <row class="row">
<description value="Duration" for="ts_duration"/> <description value="Duration" for="ts_duration"/>
<date-duration id="ts_duration" options=",hm"/> <date-duration id="ts_duration" options=",hm" class="et2_fullWidth"/>
<description value="or endtime" class="noWrap"/> <description value="or endtime" class="noWrap"/>
<date-timeonly id="end_time" options="H:i"/> <date-timeonly id="end_time" options="H:i" class="et2_fullWidth"/>
<description/>
</row> </row>
<row class="row" disabled="@ts_viewtype"> <row class="row" disabled="@ts_viewtype">
<description value="Quantity" for="ts_quantity"/> <description value="Quantity" for="ts_quantity"/>
<textbox type="float" blur="@ts_quantity_blur" statustext="empty if identical to duration" id="ts_quantity" precision="3" span="all"/> <textbox type="float" blur="@ts_quantity_blur" statustext="empty if identical to duration" id="ts_quantity" precision="3" class="et2_fullWidth"/>
<description/>
<description/>
<description/>
</row> </row>
<row class="row" disabled="@no_ts_status"> <row class="row" disabled="@no_ts_status">
<description value="Status"/> <description value="Status"/>
<menulist span="all"> <menulist>
<menupopup statustext="select a status of the timesheet" id="ts_status" options="please select"/> <menupopup statustext="select a status of the timesheet" id="ts_status" class="et2_fullWidth" options="please select"/>
</menulist> </menulist>
<description/>
<description/>
<description/>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -60,7 +74,7 @@
</columns> </columns>
<rows> <rows>
<row class="row" valign="top"> <row class="row" valign="top">
<textbox multiline="true" id="ts_description" rows="11" cols="70" class="fullWidth"/> <textbox multiline="true" id="ts_description" rows="11" cols="70" class="et2_fullWidth"/>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -90,61 +104,54 @@
<template id="timesheet.edit.customfields" template="" lang="" group="0" version="1.5.001"> <template id="timesheet.edit.customfields" template="" lang="" group="0" version="1.5.001">
<grid width="100%" height="165" overflow="auto"> <grid width="100%" height="165" overflow="auto">
<columns> <columns>
<column/> <column width="102"/>
<column width="224"/>
<column width="520"/>
</columns> </columns>
<rows> <rows>
<row> <row>
<customfields/> <customfields class="et2_fullWidth" span="2"/>
<description/>
</row> </row>
</rows> </rows>
</grid> </grid>
</template> </template>
<template id="timesheet.edit.history" template="" lang="" group="0" version="1.7.001"> <template id="timesheet.edit.history" template="" lang="" group="0" version="1.7.001">
<grid width="100%" height="165" overflow="auto"> <historylog id="history" overflow="auto" height="165"/>
<columns>
<column/>
</columns>
<rows>
<row valign="top">
<historylog id="history"/>
</row>
</rows>
</grid>
</template> </template>
<template id="timesheet.edit" template="" lang="" group="0" version="1.9.002"> <template id="timesheet.edit" template="" lang="" group="0" version="1.9.002">
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="100"/> <column width="107"/>
<column/> <column width="200"/>
<column width="534"/>
</columns> </columns>
<rows> <rows>
<row disabled="!@msg">
<description align="center" id="msg" no_lang="1" span="all" class="redItalic"/>
<description/>
</row>
<row class="th dialog-header" height="28"> <row class="th dialog-header" height="28">
<description value="User" for="ts_owner"/> <description value="User" for="ts_owner"/>
<menulist span="all"> <menulist >
<menupopup id="ts_owner" no_lang="1"/> <menupopup id="ts_owner" no_lang="1" class="et2_fullWidth"/>
</menulist> </menulist>
<description/>
</row> </row>
<row class="row dialog-header2"> <row>
<description value="Project" for="ts_project"/> <description value="Project" for="ts_project"/>
<grid spacing="1" padding="1"> <grid>
<columns> <columns>
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row disabled="@pm_integration=none"> <row disabled="@pm_integration=none">
<link-entry id="pm_id" onchange="1" only_app='projectmanager' blur='None'/> <link-entry id="pm_id" onchange="1" only_app='projectmanager' blur='None' class="et2_fullWidth"/>
</row> </row>
<row disabled="@pm_integration=full"> <row disabled="@pm_integration=full">
<textbox blur="@ts_project_blur" id="ts_project" size="65" maxlength="80" class="fullWidth"/> <textbox blur="@ts_project_blur" id="ts_project" size="65" maxlength="80" class="et2_fullWidth"/>
</row> </row>
</rows> </rows>
</grid> </grid>
<description/>
</row> </row>
<row class="row dialog-header3" disabled="@ts_viewtype"> <row disabled="@ts_viewtype">
<description value="Unitprice" for="ts_unitprice"/> <description value="Unitprice" for="ts_unitprice"/>
<grid> <grid>
<columns> <columns>
@ -154,13 +161,14 @@
<rows> <rows>
<row> <row>
<projectmanager-pricelist id="pl_id" onchange="this.form['exec[ts_unitprice]'].value=this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1);" options="None"/> <projectmanager-pricelist id="pl_id" onchange="this.form['exec[ts_unitprice]'].value=this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1);" options="None"/>
<textbox type="float" id="ts_unitprice" span="all"/> <textbox type="float" id="ts_unitprice" span="all" class="et2_fullWidth"/>
</row> </row>
</rows> </rows>
</grid> </grid>
<description/>
</row> </row>
<row> <row>
<tabbox id="tabs" span="all"> <tabbox id="tabs" class="et2_nowrap" width="100%" span="all">
<tabs> <tabs>
<tab id="general" label="General"/> <tab id="general" label="General"/>
<tab id="notes" label="Notes"/> <tab id="notes" label="Notes"/>
@ -185,9 +193,10 @@
<menupopup type="select-account" label="by" id="ts_modifier" readonly="true"/> <menupopup type="select-account" label="by" id="ts_modifier" readonly="true"/>
</menulist> </menulist>
</hbox> </hbox>
<description/>
</row> </row>
<row class="dialog-footer-toolbar"> <row>
<hbox orient="0" span="2"> <hbox orient="0" span="3">
<hbox> <hbox>
<button statustext="Edit this entry" label="Edit" id="button[edit]" image="edit" background_image="1"/> <button statustext="Edit this entry" label="Edit" id="button[edit]" image="edit" background_image="1"/>
<button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]" image="save_new" background_image="1"/> <button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]" image="save_new" background_image="1"/>