mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
small layout fix: limit width of owner and responsible selectbox to 100px, using selected category when creating new entries
This commit is contained in:
parent
9b476e0687
commit
d4910c0e0a
@ -211,7 +211,7 @@ class uiinfolog
|
||||
if (!$show_links) $show_links = $this->prefs['show_links'];
|
||||
|
||||
if (($show_links != 'none' && $show_links != 'no_describtion' ||
|
||||
$this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
|
||||
$this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
|
||||
($links = $this->link->get_links('infolog',$info['info_id'])))
|
||||
{
|
||||
$timesheets = array();
|
||||
|
File diff suppressed because one or more lines are too long
@ -15,4 +15,5 @@
|
||||
table.fullWidth { width: 100%; }
|
||||
.infoId:before { content:"#" }
|
||||
.fixedHeight { line-height: 12px; }
|
||||
.noWrap { white-space: nowrap; }
|
||||
.noWrap { white-space: nowrap; }
|
||||
.user_filter select { width: 100px; }
|
@ -5,12 +5,12 @@
|
||||
<description class="headertext bold" value="InfoLog"/>
|
||||
<styles>.bold { font-weight: bold; }</styles>
|
||||
</template>
|
||||
<template id="infolog.index.header_right" template="" lang="" group="0" version="1.2.002">
|
||||
<template id="infolog.index.header_right" template="" lang="" group="0" version="1.4.001">
|
||||
<hbox>
|
||||
<description class="headertext" value="Add:"/>
|
||||
<button image="task" label="ToDo" id="add[task]" statustext="Add a new ToDo" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
<button image="phone" label="Phonecall" id="add[phone]" statustext="Add a new Phonecall" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
<button image="note" label="Note" id="add[note]" statustext="Add a new Note" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
<button image="task" label="ToDo" id="add[task]" statustext="Add a new ToDo" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
<button image="phone" label="Phonecall" id="add[phone]" statustext="Add a new Phonecall" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]}'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
<button image="note" label="Note" id="add[note]" statustext="Add a new Note" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
</hbox>
|
||||
</template>
|
||||
<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.3.003">
|
||||
@ -20,8 +20,8 @@
|
||||
<column/>
|
||||
<column width="120"/>
|
||||
<column disabled="@no_info_used_time_info_planned_time"/>
|
||||
<column width="8%" disabled="@no_users"/>
|
||||
<column width="12%" disabled="@no_modified"/>
|
||||
<column width="8%" disabled="@no_info_onwer_info_responsible"/>
|
||||
<column width="12%" disabled="@no_info_datemodified"/>
|
||||
<column width="3%" disabled="@no_actions"/>
|
||||
<column width="3%" disabled="@no_actions"/>
|
||||
</columns>
|
||||
@ -111,10 +111,11 @@
|
||||
<columns>
|
||||
<column width="2%"/>
|
||||
<column/>
|
||||
<column/>
|
||||
<column width="120"/>
|
||||
<column/>
|
||||
<column width="8%" disabled="@no_users"/>
|
||||
<column width="12%" disabled="@no_modified"/>
|
||||
<column width="8%" disabled="@no_info_owner_info_responsible"/>
|
||||
<column width="12%"/>
|
||||
<column width="3%" disabled="@no_actions"/>
|
||||
<column width="3%" disabled="@no_actions"/>
|
||||
</columns>
|
||||
@ -145,6 +146,7 @@
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<nextmatch-header label="Category" id="cat_id"/>
|
||||
<vbox options="0,0">
|
||||
<nextmatch-sortheader label="Startdate" id="info_startdate"/>
|
||||
<nextmatch-sortheader label="Enddate" id="info_enddate"/>
|
||||
@ -155,8 +157,8 @@
|
||||
<nextmatch-sortheader id="info_planned_time" class="planned" label="planned"/>
|
||||
</vbox>
|
||||
<vbox options="0,0">
|
||||
<nextmatch-accountfilter id="info_owner" options="Owner" statustext="Select to filter by owner"/>
|
||||
<nextmatch-accountfilter id="info_responsible" options="Responsible,both" statustext="Select to filter by responsible"/>
|
||||
<nextmatch-accountfilter id="info_owner" options="Owner" statustext="Select to filter by owner" class="user_filter"/>
|
||||
<nextmatch-accountfilter id="info_responsible" options="Responsible,both" statustext="Select to filter by responsible" class="user_filter"/>
|
||||
</vbox>
|
||||
<nextmatch-sortheader label="last changed" id="info_datemodified" options="DESC"/>
|
||||
<description value="Sub" class="noPrint"/>
|
||||
@ -178,6 +180,9 @@
|
||||
<description no_lang="1" id="${row}[info_des]" options=",,1"/>
|
||||
<link-string id="${row}[filelinks]"/>
|
||||
</vbox>
|
||||
<menulist>
|
||||
<menupopup type="select-cat" id="${row}[info_cat]" readonly="true"/>
|
||||
</menulist>
|
||||
<vbox options="0,0,1" rows="3" cols="1">
|
||||
<date-time options=",8" id="${row}[info_startdate]" readonly="true" class="fixedHeight"/>
|
||||
<date class="$row_cont[end_class] fixedHeight" id="${row}[info_enddate]" readonly="true"/>
|
||||
@ -215,7 +220,7 @@
|
||||
</rows>
|
||||
</grid>
|
||||
</template>
|
||||
<template id="infolog.index" template="" lang="" group="0" version="1.2.001">
|
||||
<template id="infolog.index" template="" lang="" group="0" version="1.4.001">
|
||||
<grid width="100%" border="0" spacing="0" padding="0">
|
||||
<columns>
|
||||
<column width="90%"/>
|
||||
@ -241,7 +246,7 @@
|
||||
</row>
|
||||
<row class="noPrint">
|
||||
<hbox span="all">
|
||||
<button label="Add" id="add[note]" statustext="Add a new Entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
<button label="Add" id="add[note]" statustext="Add a new Entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
|
||||
<button label="Cancel" id="cancel" statustext="Back to main list"/>
|
||||
</hbox>
|
||||
</row>
|
||||
|
Loading…
Reference in New Issue
Block a user