extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

pixelegg changes from today

Browse Source
This commit is contained in:
Ralf Becker 2014-02-06 17:36:03 +00:00
parent 4dab9cba88
commit 0198a5196f
5 changed files with 276 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/templates/default/app.css
View File

@ -137,7 +137,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
/* Calendar Id # /* Calendar Id #
*/ */
.calendar_calId:before { content:"#" } .calendar_calId:before {}
#calendar-edit_id:before { content:"#"}
/* header for the dayCol /* header for the dayCol
*/ */

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

@ -1,34 +1,14 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="calendar.edit.general" template="" lang="" group="0" version="1.9.001"> <template id="calendar.edit.details" template="" lang="" group="0" version="1.9.001">
<hbox options="0,0"> <hbox options="0,0">
<grid height="210"> <grid height="141">
<columns> <columns>
<column width="95"/> <column width="85" />
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row>
<description for="start" value="Start" width="95"/>
<hbox options="0,0">
<date-time id="start" needed="1"/>
<checkbox align="center" statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable"/>
</hbox>
</row>
<row>
<description for="duration" value="Duration" width="0"/>
<hbox options="0,0">
<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"/>
</hbox>
</row>
<row>
<description/>
<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"/>
</row>
<row> <row>
<description for="location" value="Location" width="0"/> <description for="location" value="Location" width="0"/>
<textbox id="location" maxlength="255" class="calendar_inputFullWidth"/> <textbox id="location" maxlength="255" class="calendar_inputFullWidth"/>
@ -51,21 +31,23 @@
<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"> <vbox align="right" options="0,0" class="row_on" id="details_category">
<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="290"/> <textbox multiline="true" id="description" rows="12" cols="70" width="99%" height="317"/>
</template> </template>
<template id="calendar.edit.participants" template="" lang="" group="0" version="1.9.001"> <template id="calendar.edit.participants" template="" lang="" group="0" version="1.9.001">
<grid width="100%" height="210" overflow="auto" id="participants"> <grid width="99%" height="20" overflow="auto" id="participants">
<columns> <columns>
<column width="95"/> <column width="85"/>
<column/> <column/>
<column/> <column/>
<column width="70"/> <column width="70"/>
@ -73,9 +55,11 @@
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row class="th gray" disabled="@view">
<description value="Add new participants or resource" span="all"/>
</row>
<row class="row optional" disabled="@no_add"> <row class="row optional" disabled="@no_add">
<description value="New"/> <vbox options="0,0" span="2">
<vbox options="0,0">
<menulist> <menulist>
<menupopup type="select-account" statustext="User or group" id="account" options="User or group,calendar+,,10"/> <menupopup type="select-account" statustext="User or group" id="account" options="User or group,calendar+,,10"/>
</menulist> </menulist>
@ -88,7 +72,7 @@
<button align="center" label="Add" id="add" image="add" background_image="1"/> <button align="center" label="Add" id="add" image="add" background_image="1"/>
<description/> <description/>
</row> </row>
<row class="th"> <row class="th gray">
<description value="Type"/> <description value="Type"/>
<description value="Participants"/> <description value="Participants"/>
<description align="center" value="Quantity"/> <description align="center" value="Quantity"/>
@ -121,11 +105,9 @@
<column width="50%"/> <column width="50%"/>
</columns> </columns>
<rows> <rows>
<row class="th" height="12"> <row class="th gray">
<description value="Repeating Event Information" span="all" class="gray"/> <description value="Repeating Event Information" span="3"/>
<description/> <description font_style="n" id="id"/>
<description/>
<description/>
</row> </row>
<row disabled="!@reference"> <row disabled="!@reference">
<description value="Exception"/> <description value="Exception"/>
@ -193,13 +175,13 @@
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row class="th" disabled="@view"> <row class="th gray" disabled="@view">
<description value="Create new links" span="all" class="gray"/> <description value="Create new links" span="all"/>
</row> </row>
<row disabled="@view"> <row disabled="@view">
<link-to id="link_to" span="all"/> <link-to id="link_to" span="all"/>
</row> </row>
<row class="th"> <row class="th gray">
<description value="Existing links" span="all" /> <description value="Existing links" span="all" />
</row> </row>
<row class="row_off" valign="top"> <row class="row_off" valign="top">
@ -215,6 +197,9 @@
<column/> <column/>
</columns> </columns>
<rows> <rows>
<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"> <row class="row add_alarm_action" height="50" disabled="@no_add_alarm">
<menulist> <menulist>
<menupopup label="%s the event" id="before_after"/> <menupopup label="%s the event" id="before_after"/>
@ -301,7 +286,8 @@
<template id="calendar.edit" template="" lang="" group="0" version="1.9.001"> <template id="calendar.edit" template="" lang="" group="0" version="1.9.001">
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="100"/> <column width="88"/>
<column/>
<column/> <column/>
<column/> <column/>
<column/> <column/>
@ -314,18 +300,36 @@
<description/> <description/>
</row> </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"/>
<hbox needed="1" options="0,0" span="4">
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/> <textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/>
<description font_style="b" id="id" class="calendar_calId"/>
</hbox>
</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>
<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"/>
</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> </hbox>
</row> </row>
<row> <row>
<tabbox id="tabs" height="300" span="all"> <tabbox id="tabs" height="300" span="all">
<tabs> <tabs>
<tab id="general" label="General" statustext="Location, Start- and Endtimes, ..."/>
<tab id="description" label="Description" statustext="Full description"/> <tab id="description" label="Description" statustext="Full description"/>
<tab id="participants" label="Participants" statustext="Participants, Resources, ..."/> <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="recurrence" label="Recurrence" statustext="Repeating Event Information"/>
<tab id="custom" label="Custom" statustext="Custom fields"/> <tab id="custom" label="Custom" statustext="Custom fields"/>
<tab id="links" label="Links" statustext="Links, Attachments"/> <tab id="links" label="Links" statustext="Links, Attachments"/>
@ -333,9 +337,9 @@
<tab id="history" label="History" statustext="Change history"/> <tab id="history" label="History" statustext="Change history"/>
</tabs> </tabs>
<tabpanels> <tabpanels>
<template id="calendar.edit.general"/>
<template id="calendar.edit.description"/> <template id="calendar.edit.description"/>
<template id="calendar.edit.participants"/> <template id="calendar.edit.participants"/>
<template id="calendar.edit.details"/>
<template id="calendar.edit.recurrence"/> <template id="calendar.edit.recurrence"/>
<template id="calendar.edit.custom"/> <template id="calendar.edit.custom"/>
<template id="calendar.edit.links"/> <template id="calendar.edit.links"/>
@ -349,9 +353,10 @@
<menulist> <menulist>
<menupopup type="select-account" id="owner" readonly="true"/> <menupopup type="select-account" id="owner" readonly="true"/>
</menulist> </menulist>
<date-time align="right" label="Updated" id="modified" no_lang="1" readonly="true" class="noBreak"/> <description value="Updated"/>
<date-time id="modified" no_lang="1" readonly="true" class="noBreak"/>
<menulist> <menulist>
<menupopup type="select-account" align="right" class="noBreak" label="by" id="modifier" readonly="true"/> <menupopup type="select-account" label="by" class="noBreak" id="modifier" readonly="true"/>
</menulist> </menulist>
</row> </row>
</rows> </rows>

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

@ -924,56 +924,116 @@ div#calendar-edit .et2_tabs {
div#calendar-edit .et2_tabcntr { div#calendar-edit .et2_tabcntr {
overflow-y: auto; overflow-y: auto;
} }
div#calendar-edit #calendar-edit_calendar-edit-general { div#calendar-edit input.hasDatepicker,
div#calendar-edit #calendar-edit_start {
width: 129px;
}
div#calendar-edit #calendar-edit_whole_day {
margin: 0 0.8em 0 23px;
}
div#calendar-edit label.et2_label#calendar-edit_calendar_edit_duration {
/*margin-left: 20px;*/
margin-right: 49px;
}
div#calendar-edit select#calendar-edit_duration {
width: 133px;
}
div#calendar-edit button#calendar-edit_freetime {
height: 16px;
background-size: 12px auto !important;
margin-left: 32px;
padding: 0px;
}
div#calendar-edit #calendar-edit_id {
float: right;
margin-right: 5px;
}
div#calendar-edit #calendar-edit_calendar-edit-details {
display: block; display: block;
float: left; float: left;
width: 100%; width: 100%;
} }
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid { div#calendar-edit #calendar-edit_calendar-edit-details table.et2_grid {
line-height: 30px; /*background-color: yellow;*/
line-height: 20px;
width: 60% !important; width: 60% !important;
/* button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/
} }
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid #calendar-edit_start { div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_details_category {
margin-top: 5px; margin: 0 1em;
margin-right: 5px; width: 20em;
} }
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid td { div#calendar-edit #calendar-edit_calendar-edit-details .et2_hbox_right {
padding: 4px;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid #calendar-edit_duration {
float: left;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_checkbox,
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid input#calendar-edit_whole_day {
margin-left: 5px important;
border-left: 10px solid red;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_date {
float: left;
}
div#calendar-edit #calendar-edit_calendar-edit-general .et2_hbox_right {
overflow-y: auto; overflow-y: auto;
} }
div#calendar-edit #calendar-edit_calendar-edit-general .et2_selectbox .ui-multiselect-checkboxes { div#calendar-edit #calendar-edit_calendar-edit-details .et2_selectbox .ui-multiselect-checkboxes {
min-height: 290px; min-height: 290px;
} }
div#calendar-edit #calendar-edit_calendar-edit-general .et2_selectbox .ui-multiselect-checkboxes li { div#calendar-edit #calendar-edit_calendar-edit-details .et2_selectbox .ui-multiselect-checkboxes li {
text-indent: -20px; text-indent: -20px;
} }
div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category { div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category {
border: 1px solid; border: 1px solid;
border-color: #b4b4b4; border-color: #b4b4b4;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
padding: 0 0.3em 0 0;
} }
div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category li .ui-state-hover { div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category li .ui-state-hover {
font-weight: normal !important; font-weight: normal !important;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
} }
div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_details_alarms {
background-color: #cdcdcd;
display: block !important;
}
div#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_details_category {
margin: 0 1em;
width: 20em;
}
div#calendar-edit #calendar-edit_calendar-edit-description .et2_hbox_right {
overflow-y: auto;
}
div#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes {
min-height: 290px;
}
div#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes li {
text-indent: -20px;
}
div#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_category {
border: 1px solid;
border-color: #b4b4b4;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
padding: 0 0.3em 0 0;
}
div#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_category li .ui-state-hover {
font-weight: normal !important;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
}
div#calendar-edit #calendar-edit_calendar-edit-participants {
/*.et2_label {padding: 0 5px 0 0;}*/
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants {
margin: 5px;
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants td {
padding: 0.2em 0.5em;
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_account {
width: 160px;
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource select {
width: 160px !important;
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource input {
width: 160px !important;
}
div#calendar-edit #calendar-edit_calendar-edit-participants tr.optional { div#calendar-edit #calendar-edit_calendar-edit-participants tr.optional {
background-color: rgba(255, 221, 115, 0.1); background-color: rgba(255, 221, 115, 0.1);
} }
@ -1025,7 +1085,8 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-s
div#calendar-edit #calendar-edit_calendar-edit-participants tbody input#calendar-edit_quantity { div#calendar-edit #calendar-edit_calendar-edit-participants tbody input#calendar-edit_quantity {
width: 30px; width: 30px;
position: relative; position: relative;
top: 4px; top: 34px;
left: 40px;
} }
div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource { div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource {
margin: 5px 0 10px 0; margin: 5px 0 10px 0;
@ -1034,10 +1095,16 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-e
margin-right: 3px; margin-right: 3px;
} }
div#calendar-edit #calendar-edit_calendar-edit-participants tbody select#calendar-edit_role { div#calendar-edit #calendar-edit_calendar-edit-participants tbody select#calendar-edit_role {
margin-top: 6px; /*width: 30px;*/
position: relative;
top: 6px;
left: -177px;
width: 135px;
} }
div#calendar-edit #calendar-edit_calendar-edit-participants .et2_label { div#calendar-edit #calendar-edit_calendar-edit-participants tbody #calendar-edit_add {
padding: 0 5px 0 0; position: relative;
left: -145px;
top: 31px;
} }
div#calendar-edit #calendar-edit_calendar-edit-recurrence tbody { div#calendar-edit #calendar-edit_calendar-edit-recurrence tbody {
display: table; display: table;
@ -1063,6 +1130,9 @@ div#calendar-edit #calendar-edit_calendar-edit-links .et2_file {
div#calendar-edit #calendar-edit_calendar-edit-links span.et2_label { div#calendar-edit #calendar-edit_calendar-edit-links span.et2_label {
padding: 1em; padding: 1em;
} }
div#calendar-edit #calendar-edit_calendar-edit-links div.delete {
background-image: url("https:://192.168.1.100/egroupware2/pixelegg/images/delete.png");
}
div#calendar-edit #calendar-edit_calendar-edit-alarms tbody { div#calendar-edit #calendar-edit_calendar-edit-alarms tbody {
display: table; display: table;
width: 100%; width: 100%;
@ -1089,7 +1159,7 @@ div#calendar-edit #calendar-edit_action {
margin-left: 5px; margin-left: 5px;
padding-left: 10px; padding-left: 10px;
width: 10em; width: 10em;
padding: 5px 0 5px 10px; padding: 3px 0 5px 10px;
} }
.calendar_inputFullWidth input { .calendar_inputFullWidth input {
width: 60%; width: 60%;
@ -1233,7 +1303,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
@ -1469,7 +1539,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
-moz-transition-timing-function: linear; -moz-transition-timing-function: linear;
-o-transition-timing-function: linear; -o-transition-timing-function: linear;
transition-timing-function: linear; transition-timing-function: linear;
background-color: #e6e6e6; background-color: #b4b4b4;
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
@ -1763,7 +1833,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
-moz-transition-timing-function: linear; -moz-transition-timing-function: linear;
-o-transition-timing-function: linear; -o-transition-timing-function: linear;
transition-timing-function: linear; transition-timing-function: linear;
background-color: #e6e6e6; background-color: #b4b4b4;
} }
#delete_series { #delete_series {
top: 100px; top: 100px;

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

@ -423,46 +423,53 @@ div#calendar-edit{
} }
input.hasDatepicker,
#calendar-edit_start{width: 129px;}
//whole day
#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;
background-size: 12px auto !important;
margin-left: 32px;
padding: 0px;
}
// ID
#calendar-edit_id{float: right;margin-right: 5px;}
/*###########################################*/ /*###########################################*/
// Tab General // Tab Details
#calendar-edit_calendar-edit-general{ #calendar-edit_calendar-edit-details{
display: block; display: block;
float: left; float: left;
width: 100%; width: 100%;
table.et2_grid{ table.et2_grid{
/*background-color: yellow;*/
line-height: 30px; line-height: 20px;
#calendar-edit_start{
margin-top: 5px;
margin-right: 5px;
}
width: 60% !important; width: 60% !important;
td {
padding: 4px;
}
#calendar-edit_duration{
float: left;
}
// Terminsuche
/* button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/
// hole day
.et2_checkbox,
input#calendar-edit_whole_day {margin-left: 5px important; border-left: 10px solid red;}
.et2_date{
float: left;
}
} }
// Kategorien // Kategorien
#calendar-edit_details_category{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;}
.et2_selectbox .ui-multiselect-checkboxes li {text-indent: -20px;} .et2_selectbox .ui-multiselect-checkboxes li {text-indent: -20px;}
@ -472,6 +479,7 @@ div#calendar-edit{
border: 1px solid; border: 1px solid;
border-color: @gray_30; border-color: @gray_30;
.border_radius_button_normal; .border_radius_button_normal;
padding: 0 0.3em 0 0;
li{ li{
.ui-state-hover{ .ui-state-hover{
@ -481,8 +489,10 @@ div#calendar-edit{
} }
} }
// Kalender Widget // Alarme
div#ui-datepicker-div{ #calendar-edit_details_alarms{
background-color: @gray_20;
display: block !important;
} }
@ -491,11 +501,61 @@ div#calendar-edit{
/*###########################################*/ /*###########################################*/
/*Tab Beschreibung*/ /*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;}
//selectbox
#calendar-edit_category{
border: 1px solid;
border-color: @gray_30;
.border_radius_button_normal;
padding: 0 0.3em 0 0;
li{
.ui-state-hover{
font-weight: normal !important;
.box_shadow_standard_light_hover;
}
}
}
}
/*###########################################*/ /*###########################################*/
// Teilnehmer // Teilnehmer
#calendar-edit_calendar-edit-participants{ #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{
width: 160px !important;
}
// Search
input{
width: 160px !important;
}
}
}
tr.optional {background-color: @color_optional;} tr.optional {background-color: @color_optional;}
tbody{ tbody{
@ -525,7 +585,8 @@ div#calendar-edit{
input#calendar-edit_quantity { input#calendar-edit_quantity {
width: 30px; width: 30px;
position: relative; position: relative;
top: 4px; top: 34px;
left: 40px;
} }
@ -540,24 +601,28 @@ div#calendar-edit{
// Rolle // Rolle
select#calendar-edit_role {margin-top: 6px;} select#calendar-edit_role {
/*width: 30px;*/
position: relative;
top: 6px;
left: -177px;
width: 135px;
}
// hinzufügen button // hinzufügen button
// #calendar-edit_add { #calendar-edit_add {
//
// .Complete_Button_add; position: relative;
// height: 28px; left: -145px;
// padding: 0px !important; top: 31px;
// margin: 0px;
// &:hover {.Complete_Button_add_hover;} }
//
// }
} }
// Table // Table
.et2_label {padding: 0 5px 0 0;} /*.et2_label {padding: 0 5px 0 0;}*/
} }
@ -596,6 +661,8 @@ div#calendar-edit{
.et2_file {margin-left: 100px; width: 357px;} .et2_file {margin-left: 100px; width: 357px;}
span.et2_label {padding: 1em;} span.et2_label {padding: 1em;}
div.delete {background-image: url("https:://192.168.1.100/egroupware2/pixelegg/images/delete.png");}
} }
/*###########################################*/ /*###########################################*/
@ -636,7 +703,7 @@ div#calendar-edit{
margin-left: 5px; margin-left: 5px;
padding-left: 10px; padding-left: 10px;
width: 10em; width: 10em;
padding: 5px 0 5px 10px; padding: 3px 0 5px 10px;
} }
@ -792,7 +859,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
/* Calendar Id # /* Calendar Id #
*/ */
.calendar_calId:before { content:"#" } #calendar-edit_id:before { content:"#"}
/* header for the dayCol /* header for the dayCol
*/ */

2
etemplate/templates/default/etemplate2.css
View File

@ -536,7 +536,7 @@ div.et2_link_entry input.ui-autocomplete-input {
} }
.et2_link_to .progress { .et2_link_to .progress {
max-height: 12em; max-height: 12em;
overflow-y: scroll; overflow-y: auto;
} }
.et2_link_to .progress > .success input { .et2_link_to .progress > .success input {
width: 100%; width: 100%;