simplified and fixed calendar edit template

This commit is contained in:
Ralf Becker 2014-02-07 16:13:12 +00:00
parent 5b6064d360
commit cb638a4848
3 changed files with 59 additions and 74 deletions

View File

@ -31,15 +31,13 @@
<description/> <description/>
<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/> <checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
</row> </row>
</rows> </rows>
</grid> </grid>
<vbox align="right" options="0,0" class="row_on" id="details_category"> <vbox align="right" options="0,0" class="calendar_category_details">
<description for="category" value="Categories" class="row_on"/> <description for="category" value="Categories" class="row_on"/>
<listbox type="select-cat" id="category" rows="9"/> <listbox type="select-cat" id="category" rows="9"/>
</vbox> </vbox>
</hbox> </hbox>
</template> </template>
<template id="calendar.edit.description" template="" lang="" group="0" version="1.0.1.001"> <template id="calendar.edit.description" template="" lang="" group="0" version="1.0.1.001">
<textbox multiline="true" id="description" rows="12" cols="70" width="99%" height="317"/> <textbox multiline="true" id="description" rows="12" cols="70" width="99%" height="317"/>
@ -287,42 +285,28 @@
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="88"/> <column width="88"/>
<column/> <column width="80"/>
<column/>
<column/>
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row disabled="!@msg">
<html align="center" id="msg" no_lang="1" span="all" class="message"/>
<description/>
<description/>
<description/>
</row>
<row class="dialog-header" height="28"> <row class="dialog-header" height="28">
<hbox needed="1" options="0,0" span="5">
<description value="Title"/> <description value="Title"/>
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/> <textbox id="title" needed="1" size="75" maxlength="255" tabindex="1" span="all"/>
</hbox>
</row> </row>
<row class="dialog-header2" height="28"> <row class="dialog-header2" height="28">
<hbox options="2,0" vertical-align="middle">
<description for="start" value="Start" width="95"/> <description for="start" value="Start" width="95"/>
<date-time id="start" needed="1" class="required"/> <date-time id="start" needed="1" class="required"/>
<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable"/> <checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable" span="all"/>
</hbox>
</row> </row>
<row class="dialog-header2" height="28"> <row class="dialog-header2" height="28">
<hbox options="3,0" vertical-align="middle">
<description for="duration" value="Duration" width="0" id="calendar_edit_duration"/> <description for="duration" value="Duration" width="0" id="calendar_edit_duration"/>
<hbox>
<menulist> <menulist>
<menupopup statustext="Duration of the meeting" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/> <menupopup statustext="Duration of the meeting" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
</menulist> </menulist>
<date-time id="end"/> <date-time id="end"/>
<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="add" background_image="1"/>
</hbox> </hbox>
<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="add" background_image="1" span="all"/>
</row> </row>
<row> <row>
<tabbox id="tabs" height="300" span="all"> <tabbox id="tabs" height="300" span="all">
@ -353,11 +337,12 @@
<menulist> <menulist>
<menupopup type="select-account" id="owner" readonly="true"/> <menupopup type="select-account" id="owner" readonly="true"/>
</menulist> </menulist>
<description value="Updated"/> <hbox class="et2_nowrap" align="right">
<date-time id="modified" no_lang="1" readonly="true" class="noBreak"/> <date-time label="Updated" id="modified" no_lang="1" readonly="true"/>
<menulist> <menulist>
<menupopup type="select-account" label="by" class="noBreak" id="modifier" readonly="true"/> <menupopup type="select-account" label="by" class="et2_nowrap" id="modifier" readonly="true"/>
</menulist> </menulist>
</hbox>
</row> </row>
</rows> </rows>
</grid> </grid>

View File

@ -11,7 +11,7 @@
* @package calendar * @package calendar
* @version $Id$ * @version $Id$
*/ */
/* $Id: app.css 45548 2014-02-05 10:04:13Z ralfbecker $ */ /* $Id: app.css 45602 2014-02-06 17:36:03Z ralfbecker $ */
.calendar_inputFullWidth input { .calendar_inputFullWidth input {
width: 100%; width: 100%;
} }
@ -148,7 +148,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
/* Calendar Id # /* Calendar Id #
*/ */
.calendar_calId:before { #calendar-edit_id:before {
content: "#"; content: "#";
} }
/* header for the dayCol /* header for the dayCol
@ -958,7 +958,7 @@ div#calendar-edit #calendar-edit_calendar-edit-details table.et2_grid {
line-height: 20px; line-height: 20px;
width: 60% !important; width: 60% !important;
} }
div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_details_category { div#calendar-edit #calendar-edit_calendar-edit-details .calendar_category_details {
margin: 0 1em; margin: 0 1em;
width: 20em; width: 20em;
} }

View File

@ -468,7 +468,7 @@ div#calendar-edit{
// Kategorien // Kategorien
#calendar-edit_details_category{margin: 0 1em; width: 20em;} .calendar_category_details{margin: 0 1em; width: 20em;}
.et2_hbox_right {overflow-y: auto;} .et2_hbox_right {overflow-y: auto;}
.et2_selectbox .ui-multiselect-checkboxes {min-height: 290px;} .et2_selectbox .ui-multiselect-checkboxes {min-height: 290px;}