holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplified and fixed calendar edit template

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
calendar/templates/default/edit.xet
View File

@ -31,15 +31,13 @@
<description/>
<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
</row>
</rows>
</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"/>
<listbox type="select-cat" id="category" rows="9"/>
</vbox>
</hbox>
</template>
<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"/>
@ -55,11 +53,11 @@
<column/>
</columns>
<rows>
<row class="th gray" disabled="@view">
<description value="Add new participants or resource" span="all"/>
<row class="th gray" disabled="@view">
<description value="Add new participants or resource" span="all"/>
</row>
<row class="row optional" disabled="@no_add">
<vbox options="0,0" span="2">
<vbox options="0,0" span="2">
<menulist>
<menupopup type="select-account" statustext="User or group" id="account" options="User or group,calendar+,,10"/>
</menulist>
@ -197,8 +195,8 @@
<column/>
</columns>
<rows>
<row class="th gray" disabled="@view">
<description value="Add new alarm" span="all"/>
<row class="th gray" disabled="@view">
<description value="Add new alarm" span="all"/>
</row>
<row class="row add_alarm_action" height="50" disabled="@no_add_alarm">
<menulist>
@ -287,48 +285,34 @@
<grid width="100%">
<columns>
<column width="88"/>
<column width="80"/>
<column/>
<column/>
<column/>
<column/>
</columns>
<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">
<hbox needed="1" options="0,0" span="5">
<description value="Title"/>
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/>
</hbox>
<description value="Title"/>
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1" span="all"/>
</row>
<row class="dialog-header2" height="28">
<hbox options="2,0" vertical-align="middle">
<description for="start" value="Start" width="95"/>
<date-time id="start" needed="1" class="required"/>
<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable"/>
</hbox>
<row class="dialog-header2" height="28">
<description for="start" value="Start" width="95"/>
<date-time id="start" needed="1" class="required"/>
<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable" span="all"/>
</row>
<row class="dialog-header2" height="28">
<hbox options="3,0" vertical-align="middle">
<description for="duration" value="Duration" width="0" id="calendar_edit_duration"/>
<menulist>
<menupopup statustext="Duration of the meeting" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
<row class="dialog-header2" height="28">
<description for="duration" value="Duration" width="0" id="calendar_edit_duration"/>
<hbox>
<menulist>
<menupopup statustext="Duration of the meeting" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
</menulist>
<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>
<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>
<tabbox id="tabs" height="300" span="all">
<tabs>
<tab id="description" label="Description" statustext="Full description"/>
<tab id="participants" label="Participants" statustext="Participants, Resources, ..."/>
<tab id="description" label="Description" statustext="Full description"/>
<tab id="participants" label="Participants" statustext="Participants, Resources, ..."/>
<tab id="details" label="Details" statustext="Location, Start- and Endtimes, ..."/>
<tab id="recurrence" label="Recurrence" statustext="Repeating Event Information"/>
<tab id="custom" label="Custom" statustext="Custom fields"/>
@ -337,8 +321,8 @@
<tab id="history" label="History" statustext="Change history"/>
</tabs>
<tabpanels>
<template id="calendar.edit.description"/>
<template id="calendar.edit.participants"/>
<template id="calendar.edit.description"/>
<template id="calendar.edit.participants"/>
<template id="calendar.edit.details"/>
<template id="calendar.edit.recurrence"/>
<template id="calendar.edit.custom"/>
@ -353,11 +337,12 @@
<menulist>
<menupopup type="select-account" id="owner" readonly="true"/>
</menulist>
<description value="Updated"/>
<date-time id="modified" no_lang="1" readonly="true" class="noBreak"/>
<menulist>
<menupopup type="select-account" label="by" class="noBreak" id="modifier" readonly="true"/>
</menulist>
<hbox class="et2_nowrap" align="right">
<date-time label="Updated" id="modified" no_lang="1" readonly="true"/>
<menulist>
<menupopup type="select-account" label="by" class="et2_nowrap" id="modifier" readonly="true"/>
</menulist>
</hbox>
</row>
</rows>
</grid>

6
calendar/templates/pixelegg/app.css
View File

@ -11,7 +11,7 @@
* @package calendar
* @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 {
width: 100%;
}
@ -148,7 +148,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
}
/* Calendar Id #
*/
.calendar_calId:before {
#calendar-edit_id:before {
content: "#";
}
/* header for the dayCol
@ -958,7 +958,7 @@ div#calendar-edit #calendar-edit_calendar-edit-details table.et2_grid {
line-height: 20px;
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;
width: 20em;
}

54
calendar/templates/pixelegg/app.less
View File

@ -421,8 +421,8 @@ div#calendar-edit{
.et2_tabcntr {
overflow-y: auto;
}
input.hasDatepicker,
#calendar-edit_start{width: 129px;}
@ -430,23 +430,23 @@ div#calendar-edit{
#calendar-edit_whole_day{
margin: 0 0.8em 0 23px;
}
//duration
label.et2_label#calendar-edit_calendar_edit_duration{
/*margin-left: 20px;*/
margin-right: 49px;
}
select#calendar-edit_duration{width: 133px;}
// Terminsuche
button#calendar-edit_freetime {
height: 16px;
height: 16px;
background-size: 12px auto !important;
margin-left: 32px;
padding: 0px;
}
// ID
#calendar-edit_id{float: right;margin-right: 5px;}
@ -456,7 +456,7 @@ div#calendar-edit{
display: block;
float: left;
width: 100%;
table.et2_grid{
/*background-color: yellow;*/
line-height: 20px;
@ -468,8 +468,8 @@ div#calendar-edit{
// 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_selectbox .ui-multiselect-checkboxes {min-height: 290px;}
.et2_selectbox .ui-multiselect-checkboxes li {text-indent: -20px;}
@ -493,19 +493,19 @@ div#calendar-edit{
#calendar-edit_details_alarms{
background-color: @gray_20;
display: block !important;
}
}
/*###########################################*/
/*Tab Beschreibung*/
#calendar-edit_calendar-edit-description{
// Kategorien
#calendar-edit_details_category{margin: 0 1em; width: 20em;}
.et2_hbox_right {overflow-y: auto;}
.et2_selectbox .ui-multiselect-checkboxes {min-height: 290px;}
.et2_selectbox .ui-multiselect-checkboxes li {text-indent: -20px;}
@ -524,36 +524,36 @@ div#calendar-edit{
}
}
}
}
/*###########################################*/
// Teilnehmer
#calendar-edit_calendar-edit-participants{
table#calendar-edit_participants {
margin: 5px;
td {padding: 0.2em 0.5em;}
// User and Group
#calendar-edit_account{ width: 160px;}
//Adress
#calendar-edit_resource {
select{
select{
width: 160px !important;
}
// Search
input{
input{
width: 160px !important;
}
}
}
tr.optional {background-color: @color_optional;}
@ -612,11 +612,11 @@ div#calendar-edit{
// hinzufügen button
#calendar-edit_add {
position: relative;
left: -145px;
top: 31px;
}
}
@ -661,7 +661,7 @@ div#calendar-edit{
.et2_file {margin-left: 100px; width: 357px;}
span.et2_label {padding: 1em;}
div.delete {background-image: url("https:://192.168.1.100/egroupware2/pixelegg/images/delete.png");}
}