extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add break column in infolog edit popup edit and a few more changes

Browse Source
This commit is contained in:
Hadi Nategh 2014-03-12 11:19:07 +00:00
parent f21f3ebfa9
commit 3a8044223c
2 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infolog/templates/default/app.css
View File

@ -18,7 +18,7 @@ table.infolog_fullWidth { width: 100%; }
.infolog_infoId:before span{ content:"#" } .infolog_infoId:before span{ content:"#" }
#infolog-edit_info_contact { width: 98%;} #infolog-edit_info_contact { width: 98%;}
.infolog_fixedHeight { height: 12px; } .infolog_fixedHeight { height: 12px; }
.noWrap { white-space: nowrap; } .infolog_normalWrap { white-space: normal; }
.infolog_user_filter select { width: 100px; } .infolog_user_filter select { width: 100px; }
.inputFullWidth input { width: 100%; } .inputFullWidth input { width: 100%; }
.infolog_image16 img { height: 16px; } .infolog_image16 img { height: 16px; }

71
infolog/templates/default/edit.xet
View File

@ -29,7 +29,9 @@
<template id="infolog.edit.project" template="" lang="" group="0" version="1.5.004"> <template id="infolog.edit.project" template="" lang="" group="0" version="1.5.004">
<grid width="100%" height="245"> <grid width="100%" height="245">
<columns> <columns>
<column width="80" class="infolog_normalWrap"/>
<column width="90"/> <column width="90"/>
<column width="100"/>
<column/> <column/>
</columns> </columns>
<rows> <rows>
@ -42,22 +44,24 @@
</row> </row>
<row class="row"> <row class="row">
<description value="Price"/> <description value="Price"/>
<hbox span="all"> <projectmanager-pricelist id="pl_id" onchange="this.form['exec[info_price]'].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" class="et2_fullWidth"/>
<projectmanager-pricelist id="pl_id" onchange="this.form['exec[info_price]'].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="info_price" class="et2_fullWidth"/>
<textbox type="float" id="info_price" span="all"/> <description/>
</hbox>
</row> </row>
<row class="row"> <row class="row">
<description value="planned time" for="info_planned_time"/> <description value="planned time" for="info_planned_time"/>
<date-duration id="info_planned_time" display_format="$cont[duration_format]" hours_per_day="$cont[hours_per_workday]"/> <date-duration id="info_planned_time" display_format="$cont[duration_format]" class="et2_fullWidth" hours_per_day="$cont[hours_per_workday]" span="2"/>
<description/>
</row> </row>
<row class="row"> <row class="row">
<description value="Re-planned time" for="info_replanned_time"/> <description value="Re-planned time" for="info_replanned_time"/>
<date-duration id="info_replanned_time" display_format="$cont[duration_format]" hours_per_day="$cont[hours_per_workday]"/> <date-duration id="info_replanned_time" display_format="$cont[duration_format]" class="et2_fullWidth" hours_per_day="$cont[hours_per_workday]" span="2"/>
<description/>
</row> </row>
<row class="row" valign="top" height="60%"> <row class="row" valign="top" height="60%">
<description statustext="Leave blank to get the used time calculated by timesheet entries" value="used time" for="info_used_time"/> <description statustext="Leave blank to get the used time calculated by timesheet entries" value="used time" for="info_used_time"/>
<date-duration id="info_used_time"/> <date-duration id="info_used_time" span="2" class="et2_fullWidth"/>
<description/>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -83,18 +87,20 @@
<template id="infolog.edit.details" template="" lang="" group="0" version="1.9.001"> <template id="infolog.edit.details" template="" lang="" group="0" version="1.9.001">
<grid height="245" width="100%"> <grid height="245" width="100%">
<columns> <columns>
<column width="45%"/> <column width="46%"/>
<column width="54%"/> <column width="4%"/>
<column width="49%"/>
</columns> </columns>
<rows> <rows>
<row height="20" class="th"> <row height="20" class="th">
<description value="Delegation" class="et2_fullWidth"/> <description value="Delegation" class="et2_fullWidth"/>
<description/>
<description value="Details" class="et2_fullWidth"/> <description value="Details" class="et2_fullWidth"/>
</row> </row>
<row> <row valign="top">
<grid> <grid>
<columns> <columns>
<column width="56"/> <column width="78"/>
<column width="300"/> <column width="300"/>
</columns> </columns>
<rows> <rows>
@ -128,9 +134,10 @@
</row> </row>
</rows> </rows>
</grid> </grid>
<description/>
<grid> <grid>
<columns> <columns>
<column/> <column width="78"/>
<column/> <column/>
</columns> </columns>
<rows> <rows>
@ -181,34 +188,41 @@
<template id="infolog.edit" template="" lang="" group="0" version="1.9.101"> <template id="infolog.edit" template="" lang="" group="0" version="1.9.101">
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="78"/> <column width="88"/>
<column width="302"/> <column width="302"/>
<column width="80"/> <column width="30"/>
<column width="88"/>
<column width="122"/> <column width="122"/>
<column width="30"/> <column width="30"/>
<column width="50"/> <column width="50"/>
<column width="30"/> <column width="30"/>
<column width="12"/>
</columns> </columns>
<rows> <rows>
<row class="dialogHeader"> <row class="dialogHeader">
<description value="Title" for="info_subject"/> <description value="Title" for="info_subject"/>
<textbox statustext="a short subject for the entry" id="info_subject" class="et2_fullWidth et2_required" maxlength="255" span="4" tabindex="1"/> <textbox statustext="a short subject for the entry" id="info_subject" class="et2_fullWidth et2_required" maxlength="255" span="5" tabindex="1"/>
<textbox type="integer" id="info_number" readonly="true" class="infolog_infoId"/> <textbox type="integer" id="info_number" readonly="true" class="infolog_infoId"/>
<appicon src="infolog" for="info_number"/> <appicon src="infolog" for="info_number"/>
<description/>
</row> </row>
<row class="dialogHeader2"> <row class="dialogHeader2">
<description value="Type" for="info_type"/> <description value="Type" for="info_type"/>
<menulist class="et2_fullWidth"> <menulist class="et2_fullWidth">
<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="1" /> <menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="1" />
</menulist> </menulist>
<description/>
<description value="Contact"/> <description value="Contact"/>
<link-entry id="info_contact" span="all"/> <link-entry id="info_contact" span="4"/>
<description/>
</row> </row>
<row class="dialogHeader3"> <row class="dialogHeader3">
<description value="Startdate" for="info_startdate"/> <description value="Startdate" for="info_startdate"/>
<date-time statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate" class="et2_fullWidth"/> <date-time statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate" class="et2_fullWidth"/>
<description/>
<description value="Enddate" for="info_enddate"/> <description value="Enddate" for="info_enddate"/>
<date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate" class="et2_fullWidth" span="all"/> <date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate" class="et2_fullWidth" span="4"/>
<description/>
</row> </row>
<row height="250"> <row height="250">
<tabbox id="tabs" class="et2_nowrap" span="all" width="100%"> <tabbox id="tabs" class="et2_nowrap" span="all" width="100%">
@ -238,26 +252,30 @@
<menulist class="et2_fullWidth"> <menulist class="et2_fullWidth">
<menupopup statustext="@status_help" id="info_status" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/> <menupopup statustext="@status_help" id="info_status" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
</menulist> </menulist>
<description/>
<description value="Completed" for="info_percent"/> <description value="Completed" for="info_percent"/>
<menulist class="et2_fullWidth" span="all"> <menulist class="et2_fullWidth" span="4">
<menupopup type="select-percent" statustext="Percent completed" id="info_percent" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/> <menupopup type="select-percent" statustext="Percent completed" id="info_percent" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
</menulist> </menulist>
<description/>
</row> </row>
<row disabled="!@info_owner" class="dialogOperators"> <row disabled="!@info_owner" class="dialogOperators">
<description value="Owner"/> <description value="Owner"/>
<hbox> <hbox width="100%">
<menulist class="et2_nowrap"> <menulist>
<menupopup type="select-account" id="info_owner" readonly="true"/> <menupopup type="select-account" id="info_owner" readonly="true"/>
</menulist> </menulist>
<date-time id="info_created" readonly="true" class="et2_nowrap"/> <date-time id="info_created" readonly="true" align="right"/>
</hbox> </hbox>
<description/>
<description value="Last modified"/> <description value="Last modified"/>
<hbox span="all"> <hbox width="100%" span="4">
<menulist> <menulist>
<menupopup type="select-account" id="info_modifier" readonly="true"/> <menupopup type="select-account" id="info_modifier" readonly="true"/>
</menulist> </menulist>
<date-time id="info_datemodified" readonly="true"/> <date-time id="info_datemodified" readonly="true" align="right"/>
</hbox> </hbox>
<description/>
</row> </row>
<row class="dialogFooterToolbar"> <row class="dialogFooterToolbar">
<hbox span="5"> <hbox span="5">
@ -267,9 +285,8 @@
<menulist> <menulist>
<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.infolog.edit_actions()" options="Actions..."/> <menupopup statustext="Execute a further action for this entry" id="action" onchange="app.infolog.edit_actions()" options="Actions..."/>
</menulist> </menulist>
<checkbox label="Do not notify of these changes" id="no_notifications"/> <checkbox label="Do not notify" id="no_notifications"/>
</hbox> </hbox>
<button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" background_image="1" span="all"/> <button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" background_image="1" span="all"/>
</row> </row>
</rows> </rows>