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

latest pixelegg changes

Browse Source
This commit is contained in:
Klaus Leithoff 2013-12-16 09:37:11 +00:00
parent f1da90887a
commit b41be95681
10 changed files with 516 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/templates/pixelegg/app.css
View File

@ -340,7 +340,7 @@ fieldset.emailGroup {
padding: 1em; padding: 1em;
/*min-height: 250px;*/ /*min-height: 250px;*/
/*ADD*/ /*ADD*/
/* div.et2_hbox, /* div.et2_hbox,
div.et2_box_widget*/ div.et2_box_widget*/
} }
.et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] { .et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] {
@ -416,8 +416,9 @@ fieldset.emailGroup {
vertical-align: top; vertical-align: top;
text-align: center; text-align: center;
} }
/*#######################################################*/ #addressbook-edit tr.dialog-footer-toolbar label.et2_label {
/*#######################################################*/ top: 0px !important;
}
/*#######################################################*/ /*#######################################################*/
/*State: Address selected*/ /*State: Address selected*/
/*Layout*/ /*Layout*/
@ -458,7 +459,7 @@ fieldset.emailGroup {
/*# #*/ /*# #*/
/*#################################################################*/ /*#################################################################*/
/*#addressbook-edit .et2_tabbox { /*#addressbook-edit .et2_tabbox {
max-width: 100%; max-width: 100%;
min-width: 530px; min-width: 530px;
width: 550px width: 550px
}*/ }*/

307
addressbook/templates/pixelegg/app.less
View File

@ -11,7 +11,7 @@
* @package addressbook * @package addressbook
* @version $Id$ * @version $Id$
*/ */
@import (reference) "../../../pixelegg/less/def_buttons.less"; @import (reference) "../../../pixelegg/less/def_buttons.less";
@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
@import (less) "../default/app.css"; @import (less) "../default/app.css";
@ -123,8 +123,8 @@ div#addressbook-index{
&:hover {.Complete_Button_add_hover;} &:hover {.Complete_Button_add_hover;}
} }
} // rechte Box } // rechte Box
@ -149,9 +149,9 @@ div#addressbook-index{
// Suchen Button // Suchen Button
button.et2_button {} button.et2_button {}
} }
// Filter // Filter
.filters{ .filters{
// #addressbook-index_cat_id{width: 7%;} // #addressbook-index_cat_id{width: 7%;}
@ -167,9 +167,9 @@ div#addressbook-index{
} }
} // iframe } // iframe
@ -177,32 +177,32 @@ div#addressbook-index{
/*##################################################################*/ /*##################################################################*/
/*Infolog*/ /*Infolog*/
.et2_container[id^="infolog-index-addressbook"] { .et2_container[id^="infolog-index-addressbook"] {
/*height: auto;*/ /*height: auto;*/
padding: 1em; padding: 1em;
/*min-height: 250px;*/ /*min-height: 250px;*/
/*ADD*/ /*ADD*/
/* div.et2_hbox, /* div.et2_hbox,
div.et2_box_widget*/ div.et2_box_widget*/
.et2_hbox_right[id*="_infolog-index-header_right"]{ .et2_hbox_right[id*="_infolog-index-header_right"]{
.Complete_Button_add; .Complete_Button_add;
/*height: auto;*/ /*height: auto;*/
.color-0-gray; // white .color-0-gray; // white
font-size: 0.9em; font-size: 0.9em;
&:before {padding-left: 5px;} &:before {padding-left: 5px;}
&:hover {.Complete_Button_add_hover;} &:hover {.Complete_Button_add_hover;}
span.et2_label {color: @gray-0; font-size: 0.9em;padding-right: 11px;} span.et2_label {color: @gray-0; font-size: 0.9em;padding-right: 11px;}
img.et2_button {margin-top: -15px;} img.et2_button {margin-top: -15px;}
} }
} }
@ -254,9 +254,9 @@ div#addressbook-index{
#addressbook-edit_addressbook-edit-general { #addressbook-edit_addressbook-edit-general {
table.addressbook_edit_general { table.addressbook_edit_general {
width:100%; width:100%;
height:286px; height:286px;
@ -264,19 +264,16 @@ div#addressbook-index{
widtH: 20%; widtH: 20%;
vertical-align: top; vertical-align: top;
text-align: center; text-align: center;
} }
} }
}
}
#addressbook-edit tr.dialog-footer-toolbar label.et2_label {top: 0px !important;}
/*#######################################################*/
/*#######################################################*/
/*#######################################################*/ /*#######################################################*/
/*State: Address selected*/ /*State: Address selected*/
@ -292,13 +289,13 @@ div#addressbook-index{
td.addressbook_edit_left_td { td.addressbook_edit_left_td {
min-width: 500px; min-width: 500px;
max-width: 100%; max-width: 100%;
width: 70%; width: 70%;
} }
td.addressbook_edit_right_td { td.addressbook_edit_right_td {
min-width: 300px; min-width: 300px;
max-width: 100%; max-width: 100%;
width: 30%; width: 30%;
} }
@ -306,30 +303,30 @@ td.addressbook_edit_right_td {
.egw_fw_ui_tab_content #addressbook-edit .et2_tabs { .egw_fw_ui_tab_content #addressbook-edit .et2_tabs {
max-height: 25em; max-height: 25em;
height: 296px; height: 296px;
} }
/* popup window */ /* popup window */
#popupMainDiv #addressbook-edit .et2_tabs { #popupMainDiv #addressbook-edit .et2_tabs {
height: 400px; height: 400px;
} }
/*############ tabbox##############################################*/ /*############ tabbox##############################################*/
/*# et2_tabheader # et2_tabheader # et2_tabheader # et2_tabheader #*/ /*# et2_tabheader # et2_tabheader # et2_tabheader # et2_tabheader #*/
/*#################################################################*/ /*#################################################################*/
/*# #*/ /*# #*/
/*# #*/ /*# #*/
/*# #*/ /*# #*/
/*# et2_tabs #*/ /*# et2_tabs #*/
/*# #*/ /*# #*/
/*# #*/ /*# #*/
/*#################################################################*/ /*#################################################################*/
/*#addressbook-edit .et2_tabbox { /*#addressbook-edit .et2_tabbox {
max-width: 100%; max-width: 100%;
min-width: 530px; min-width: 530px;
width: 550px width: 550px
}*/ }*/
@ -356,18 +353,18 @@ td.addressbook_edit_right_td {
/*Div Image*/ /*Div Image*/
div.addressbook_edit_general_picture { div.addressbook_edit_general_picture {
// float: right; // float: right;
// width: 180% !important; // width: 180% !important;
// max-width: 100px !important; // max-width: 100px !important;
// height: auto !important; // height: auto !important;
// margin-right: 10px; // margin-right: 10px;
img { img {
width: 180% !important; width: 180% !important;
max-width: 100px !important; max-width: 100px !important;
height: auto !important; height: auto !important;
} }
/*Picture*/ /*Picture*/
// Photo // Photo
@ -375,19 +372,19 @@ div.addressbook_edit_general_picture {
.Complete_Button_normal; .Complete_Button_normal;
&:hover {.Complete_Button_hover;} &:hover {.Complete_Button_hover;}
} }
// Photo Upload - POPUP // Photo Upload - POPUP
table.uploadphoto { table.uploadphoto {
.background-color-10-gray; .background-color-10-gray;
width: auto; width: auto;
.bordered(@gray-10, @gray-10, @gray-10, @gray-10); .bordered(@gray-10, @gray-10, @gray-10, @gray-10);
left: 243px; left: 243px;
top: 189px; top: 189px;
} }
} }
@ -411,16 +408,16 @@ div#addressbook-search{
top: 5%; top: 5%;
.box_shadow_standard_light; .box_shadow_standard_light;
} }
table.et2_grid{ table.et2_grid{
width: 100%; width: 100%;
border-top: 0px; border-top: 0px;
img {width: 16px; height: 16px;} img {width: 16px; height: 16px;}
} }
table.addressbook_edit_general{ table.addressbook_edit_general{
// background: red; // background: red;
@ -436,7 +433,7 @@ div#addressbook-search{
//Name //Name
input#addressbook-edit_n_fn {width: 95%;} input#addressbook-edit_n_fn {width: 95%;}
/*POPUP*/ /*POPUP*/
/* edit Name */ /* edit Name */
table.editname { table.editname {
@ -478,9 +475,9 @@ div#addressbook-search{
// Telefonnummer: // Telefonnummer:
div#addressbook-edit_addressbook-editphones {margin-left: 1em;} div#addressbook-edit_addressbook-editphones {margin-left: 1em;}
fieldset.phoneGroup { fieldset.phoneGroup {
border: none; border: none;
margin-bottom: 0; margin-bottom: 0;
@ -500,7 +497,7 @@ div#addressbook-search{
table.et2_grid td.telNumbers{ table.et2_grid td.telNumbers{
width: 155px; width: 155px;
input { width: 140px !important; } input { width: 140px !important; }
} }
// Radio Box // Radio Box
@ -527,48 +524,48 @@ div#addressbook-search{
.background-color-15-gray; .background-color-15-gray;
.border_radius_button_normal; .border_radius_button_normal;
legend { text-transform: uppercase;} legend { text-transform: uppercase;}
table.et2_grid {margin-left: -7px;} table.et2_grid {margin-left: -7px;}
td { td {
input {width: 82%;} input {width: 82%;}
// image after Link // image after Link
a.et2_url { a.et2_url {
margin-left: 5px; margin-left: 5px;
&:hover {.Complete_Button_Icon_hover;} &:hover {.Complete_Button_Icon_hover;}
} }
/* a.et2_url:after { /* a.et2_url:after {
content: "\221E"; content: "\221E";
font-size: 1.2em; font-size: 1.2em;
}*/ }*/
a.et2_url.url { a.et2_url.url {
.Complete_Button_Icon_normal; .Complete_Button_Icon_normal;
background-size: 16px 16px; background-size: 16px 16px;
background-image: url('images/url.png'); background-image: url('images/url.png');
} }
a.et2_url.email { a.et2_url.email {
.Complete_Button_Icon_normal; .Complete_Button_Icon_normal;
background-size: 16px 16px; background-size: 16px 16px;
background-image: url('images/email.png'); background-image: url('images/email.png');
} }
}
}
} }
fieldset.emailGroup * img {display: none !important; width: 20px;} // Bilder ausblenden fieldset.emailGroup * img {display: none !important; width: 20px;} // Bilder ausblenden
@ -624,24 +621,24 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
padding-top: 0em; padding-top: 0em;
} }
/*Birthday + Timezone*/ /*Birthday + Timezone*/
/*row*/ /*row*/
.add_bday_timezone { .add_bday_timezone {
// Timezone // Timezone
#addressbook_edit_tz_chzn{ #addressbook_edit_tz_chzn{
width: 15% !important; width: 15% !important;
padding-top: 0em; padding-top: 0em;
} }
/*Birthday Label*/ /*Birthday Label*/
label.et2_label {padding-left: 1em;} label.et2_label {padding-left: 1em;}
} }
} }
/*################## Tab 4 Details ###############################*/ /*################## Tab 4 Details ###############################*/
@ -657,57 +654,57 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
tbody{ tbody{
display: table-header-group; display: table-header-group;
vertical-align: top; vertical-align: top;
} }
tr:first { tr:first {
td {height: 150px;} td {height: 150px;}
} }
}
div#addressbook-edit_addressbook-edit-links {
/*overflow-y: scroll;*/
table.et2_grid {
tr:first td {height: 150px;}
}
/*neue verknüpfung erstellen - div*/
div#addressbook-edit_link_to {
width: 100% !important;
// 1. with Addressbook
div#addressbook-edit_link_to_link_entry{ margin: 1em;}
// 2. Icon
img.et2_button_icon {
.Complete_Button_Icon_normal;
float: left;
margin: 0.5em 2em;
padding: 0.5em;
height: 32px;
width: 32px;
&:hover {.Complete_Button_Icon_hover;}
&:active {.Complete_Button_Icon_active;}
}
// Upload
div.et2_file {}
}
table#addressbook-edit_link_to {overflow-y: scroll;}
}
} div#addressbook-edit_addressbook-edit-links {
/*overflow-y: scroll;*/
table.et2_grid {
tr:first td {height: 150px;}
}
/*neue verknüpfung erstellen - div*/
div#addressbook-edit_link_to {
width: 100% !important;
// 1. with Addressbook
div#addressbook-edit_link_to_link_entry{ margin: 1em;}
// 2. Icon
img.et2_button_icon {
.Complete_Button_Icon_normal;
float: left;
margin: 0.5em 2em;
padding: 0.5em;
height: 32px;
width: 32px;
&:hover {.Complete_Button_Icon_hover;}
&:active {.Complete_Button_Icon_active;}
}
// Upload
div.et2_file {}
}
table#addressbook-edit_link_to {overflow-y: scroll;}
}
@ -723,9 +720,9 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
display: table-header-group; display: table-header-group;
vertical-align: top; vertical-align: top;
} }
} }
/*################## Tab 7 Extra ###############################*/ /*################## Tab 7 Extra ###############################*/
/*seems to be ok*/ /*seems to be ok*/
@ -747,36 +744,36 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
// History // History
#addressbook-edit_addressbook-edit-history{ #addressbook-edit_addressbook-edit-history{
.th{ height: 20px;} .th{ height: 20px;}
tbody{ tbody{
display: table-header-group; display: table-header-group;
vertical-align: top; vertical-align: top;
} }
table.et2_grid { table.et2_grid {
} }
.et2_historylog, .et2_historylog,
#addressbook-edit_history{ #addressbook-edit_history{
div:first-child {height: auto !important;} div:first-child {height: auto !important;}
table.egwGridView_outer { table.egwGridView_outer {
th.optcol { th.optcol {
span.selectcols {position: relative !important;} span.selectcols {position: relative !important;}
} }
} }
} }
} }
@ -944,8 +941,8 @@ table.uploadphoto {width: 360px !important; background-color: @gray-20 !importan
@media only screen and (min-width: 980px) and (max-width: 1279px) { @media only screen and (min-width: 980px) and (max-width: 1279px) {
.nextmatch_header > .filters select { margin: 0px;} .nextmatch_header > .filters select { margin: 0px;}
} }
@media only screen and (min-width: 760px) and (max-width: 979px) { @media only screen and (min-width: 760px) and (max-width: 979px) {

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

@ -80,7 +80,7 @@
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row class="row" disabled="@no_add"> <row class="row optional" disabled="@no_add">
<description value="New"/> <description value="New"/>
<vbox options="0,0"> <vbox options="0,0">
<menulist> <menulist>
@ -128,18 +128,18 @@
<column width="50%"/> <column width="50%"/>
</columns> </columns>
<rows> <rows>
<row class="row" disabled="!@reference"> <row class="th" height="12">
<description value="Exception"/>
<date-time id="recurrence" readonly="true" class="gray"/>
<description id="reference" class="gray"/>
<description id="uid" class="gray"/>
</row>
<row class="th" height="12">
<description value="Repeating Event Information" span="all" class="gray"/> <description value="Repeating Event Information" span="all" class="gray"/>
<description/> <description/>
<description/> <description/>
<description/> <description/>
</row> </row>
<row class="row" disabled="!@reference">
<description value="Exception"/>
<date-time id="recurrence" readonly="true"/>
<description id="reference" />
<description id="uid" />
</row>
<row class="row" height="12"> <row class="row" height="12">
<description for="recur_type" value="Repeat type"/> <description for="recur_type" value="Repeat type"/>
<menulist> <menulist>
@ -218,11 +218,11 @@
<template id="calendar.edit.alarms" template="" lang="" group="0" version="1.9.001"> <template id="calendar.edit.alarms" template="" lang="" group="0" version="1.9.001">
<grid width="100%" height="210" overflow="auto"> <grid width="100%" height="210" overflow="auto">
<columns> <columns>
<column width="120px"/> <column width="120px" height="30px"/>
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row class="row" height="20" 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"/>
</menulist> </menulist>
@ -242,7 +242,7 @@
<menulist> <menulist>
<menupopup statustext="Select who should get the alarm" label="for" id="new_alarm[owner]" no_lang="1"/> <menupopup statustext="Select who should get the alarm" label="for" id="new_alarm[owner]" no_lang="1"/>
</menulist> </menulist>
<button label="Add alarm" id="button[add_alarm]"/> <button label="Add alarm" id="button[add_alarm]" image="add" background_image="1"/>
</hbox> </hbox>
</row> </row>
<row valign="top" disabled="!@alarm"> <row valign="top" disabled="!@alarm">
@ -383,4 +383,4 @@
.noBreak { white-space: nowrap; } .noBreak { white-space: nowrap; }
</styles> </styles>
</template> </template>
</overlay> </overlay>

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

@ -13,12 +13,12 @@
padding-left: 0px !important; padding-left: 0px !important;
} }
img.sideboxstar { img.sideboxstar {
width: 14px; width: 12px;
height: 14px; height: 12px;
background-color: #f0f0f0; background-color: #f0f0f0;
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@ -45,12 +45,12 @@ img.sideboxstar:hover {
border: none; border: none;
} }
.calendar_calDayColHeader img { .calendar_calDayColHeader img {
height: 16px;
width: 16px; width: 16px;
height: 16px;
} }
.calendar_calEventBodySmall img { .calendar_calEventBodySmall img {
height: 16px;
width: 16px; width: 16px;
height: 16px;
} }
/* calender view*/ /* calender view*/
/*defind in layout_raster.less , because frame*/ /*defind in layout_raster.less , because frame*/
@ -269,27 +269,63 @@ div.calendar {
background-color: #000; background-color: #000;
color: #0f0; color: #0f0;
} }
/*###########################################
# #
# dialog-header #
#############################################
# #
# #
# #
# #
# #
# dialog #
# #
# #
#############################################
# #
# buttons #
# #
# #
##############################################*/
div#calendar-edit { div#calendar-edit {
width: 870px; width: 99%;
padding: 5px; padding: 5px;
/*###########################################*/ /*###########################################*/
/*###########################################*/
/*Tab Beschreibung*/
/*###########################################*/
/*###########################################*/
/*###########################################*/
/*###########################################*/
/*###########################################*/
} }
div#calendar-edit label.et2_label { div#calendar-edit label.et2_label {
/*padding: 0 2px;*/ /*padding: 0 2px;*/
} }
div#calendar-edit .chzn-container { div#calendar-edit .chzn-container {
padding-top: 1em; padding-top: 0;
} }
div#calendar-edit .et2_tabheader { div#calendar-edit .et2_tabheader {
background-color: transparent; background-color: transparent;
} }
div#calendar-edit .et2_tabcntr {
height: 299px;
overflow: auto;
}
div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(even) {
background: #e6e6e6;
}
div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(odd) {
background: #ffffff;
}
div#calendar-edit #calendar-edit_calendar-edit-general { div#calendar-edit #calendar-edit_calendar-edit-general {
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-general table.et2_grid {
width: auto !important; width: 72% !important;
/* button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/
} }
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid td { div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid td {
padding: 4px; padding: 4px;
@ -297,9 +333,6 @@ div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid td {
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid #calendar-edit_duration { div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid #calendar-edit_duration {
float: left; float: left;
} }
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid button#calendar-edit_freetime {
background-image: url('images/add.png') !important;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_checkbox, 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 { div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid input#calendar-edit_whole_day {
margin-left: 5px important; margin-left: 5px important;
@ -315,6 +348,9 @@ div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category {
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
div#calendar-edit #calendar-edit_calendar-edit-participants tr.optional {
background-color: rgba(255, 194, 0, 0.1);
}
div#calendar-edit #calendar-edit_calendar-edit-participants tbody { div#calendar-edit #calendar-edit_calendar-edit-participants tbody {
display: table; display: table;
width: 100%; width: 100%;
@ -324,7 +360,38 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody td {
padding-top: 3px; padding-top: 3px;
} }
div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search { div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search {
background-size: 16px 16px; background-color: #f0f0f0;
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
background-size: 24px 24px;
width: 24px;
height: 24px;
margin-left: 1em;
}
div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search:hover {
background-color: #b3b3b3 !important;
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
border: 1px solid rgba(0, 0, 0, 0.5);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-searchactive {
background-color: #808080;
border: 1px solid rgba(0, 0, 0, 0.9);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
-moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
} }
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;
@ -347,6 +414,9 @@ div#calendar-edit #calendar-edit_calendar-edit-links tbody {
display: table; display: table;
width: 100%; width: 100%;
} }
div#calendar-edit #calendar-edit_calendar-edit-links tbody .et2_link_to {
width: auto !important;
}
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;
} }
@ -354,6 +424,14 @@ div#calendar-edit #calendar-edit_calendar-edit-alarms tbody {
display: table; display: table;
width: 100%; width: 100%;
} }
div#calendar-edit #calendar-edit_calendar-edit-alarms tbody label.et2_label {
white-space: nowrap;
padding: 0 5px;
}
div#calendar-edit #calendar-edit_calendar-edit-alarms tbody tr.add_alarm_action {
background-color: rgba(255, 194, 0, 0.1);
margin-bottom: 1em;
}
div#calendar-edit #calendar-edit_calendar-edit-history { div#calendar-edit #calendar-edit_calendar-edit-history {
max-width: 800px; max-width: 800px;
} }
@ -642,6 +720,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
position: absolute; position: absolute;
right: 0px; right: 0px;
top: 0px; top: 0px;
background-color: #e6e6e6;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
} }
.calendar_calEventIcons img { .calendar_calEventIcons img {
height: 16px; height: 16px;
@ -683,12 +765,15 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
.calendar_calDayTodos .calendar_calDayTodosHeader a img { .calendar_calDayTodos .calendar_calDayTodosHeader a img {
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
color: #000000; color: #000000;
height: 16px;
width: 16px; width: 16px;
height: 16px;
} }
.calendar_calDayTodos .calendar_calDayTodosHeader a img:hover { .calendar_calDayTodos .calendar_calDayTodosHeader a img:hover {
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@ -700,6 +785,48 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
overflow: auto; overflow: auto;
max-height: 400px; max-height: 400px;
} }
.calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(even) {
background: #e6e6e6;
}
.calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(odd) {
background: #ffffff;
}
.calendar_calDayTodos .calendar_calDayTodosTable table td {
padding: 3px;
}
.calendar_calDayTodos .calendar_calDayTodosTable table td img {
width: 12px;
height: 12px;
background-color: #f0f0f0;
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.calendar_calDayTodos .calendar_calDayTodosTable table td img:hover {
background-color: #b3b3b3 !important;
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
border: 1px solid rgba(0, 0, 0, 0.5);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.calendar_calDayTodos .calendar_calDayTodosTable table td img:active {
background-color: #808080;
border: 1px solid rgba(0, 0, 0, 0.9);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
-moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
background-color: #00ab00 !important;
}
.calendar_calDayTodos { .calendar_calDayTodos {
width: 250px; width: 250px;
margin-left: 10px; margin-left: 10px;
@ -780,11 +907,15 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_plannerMonthScale { .calendar_plannerMonthScale {
font-weight: bold; font-weight: bold;
} }
.calendar_plannerMonthScale a img {
width: 16px;
height: 16px;
}
.calendar_plannerDayScale img, .calendar_plannerDayScale img,
.calendar_plannerWeekScale img, .calendar_plannerWeekScale img,
.calendar_plannerMonthScale img, .calendar_plannerMonthScale img,
.calendar_plannerDayOfMonthScale img { .calendar_plannerDayOfMonthScale img {
vertical-align: middle; vertical-align: text-top;
} }
/* calendar_plannerRowHeader contains the user or category name of the calendar_plannerRowWidget /* calendar_plannerRowHeader contains the user or category name of the calendar_plannerRowWidget
*/ */
@ -856,9 +987,15 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
.calendar_plannerEvent img, .calendar_plannerEvent img,
.calendar_plannerEventPrivate img { .calendar_plannerEventPrivate img {
padding-top: 2px; padding-top: 0px;
width: 16px; padding: 2px;
height: 16px; width: 12px;
height: 12px;
margin: 3px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background-color: #e6e6e6;
} }
.calendar_plannerEvent:hover { .calendar_plannerEvent:hover {
cursor: pointer; cursor: pointer;
@ -896,9 +1033,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
border-spacing: 0px; border-spacing: 0px;
background-color: #fff; background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
color: #000000; color: #000000;
} }
#delete_series { #delete_series {

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

@ -24,8 +24,7 @@
img.sideboxstar { img.sideboxstar {
width: 14px; .dimension_width_height_xs;
height: 14px;
.Complete_Button_Icon_normal; .Complete_Button_Icon_normal;
padding: 3px; padding: 3px;
margin: 1px; margin: 1px;
@ -33,8 +32,6 @@ img.sideboxstar {
&:hover { &:hover {
.Complete_Button_Icon_hover; .Complete_Button_Icon_hover;
} }
} }
.chzn-container { .chzn-container {
@ -60,8 +57,8 @@ img.sideboxstar {
// Images // Images
.calendar_calDayColHeader img {height: 16px; width: 16px;} .calendar_calDayColHeader img {.dimension_width_height_s;}
.calendar_calEventBodySmall img {height: 16px; width: 16px;} .calendar_calEventBodySmall img {.dimension_width_height_s;}
@ -351,20 +348,55 @@ div.calendar { position: relative; }
//# Bearbeiten Formular //# Bearbeiten Formular
//################################################################### //###################################################################
/*###########################################
# #
# dialog-header #
#############################################
# #
# #
# #
# #
# #
# dialog #
# #
# #
#############################################
# #
# buttons #
# #
# #
##############################################*/
div#calendar-edit{ div#calendar-edit{
width: 870px; width: 99%;
padding: 5px; padding: 5px;
label.et2_label{ label.et2_label{
/*padding: 0 2px;*/ /*padding: 0 2px;*/
} }
.chzn-container { .chzn-container {
padding-top: 1em; padding-top: 0;
} }
.et2_tabheader{ .et2_tabheader{
background-color: transparent; background-color: transparent;
} }
// Size for tabs
.et2_tabcntr {
height: 299px;
overflow: auto;
table.et2_grid {
// Listendarstellung
tr:nth-child(even) {background: @color-even;}
tr:nth-child(odd) {background: @color-odd;}
}
}
/*###########################################*/ /*###########################################*/
// Tab General // Tab General
@ -374,7 +406,11 @@ div#calendar-edit{
width: 100%; width: 100%;
table.et2_grid{ table.et2_grid{
width: auto !important; width: 72% !important;
td { td {
padding: 4px; padding: 4px;
} }
@ -385,7 +421,7 @@ div#calendar-edit{
// Terminsuche // Terminsuche
button#calendar-edit_freetime {background-image: url('images/add.png') !important;} /* button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/
// hole day // hole day
@ -404,19 +440,37 @@ div#calendar-edit{
} }
} }
/*###########################################*/
/*Tab Beschreibung*/
/*###########################################*/
// Teilnehmer // Teilnehmer
#calendar-edit_calendar-edit-participants{ #calendar-edit_calendar-edit-participants{
tbody{
tr.optional {background-color: @color-optional;}
tbody{
display: table; display: table;
width: 100%; width: 100%;
td {vertical-align: top; padding-top: 3px;} td {vertical-align: top; padding-top: 3px;}
// Suchen Bild // Suchen Bild
span.ui-icon-search {background-size: 16px 16px;} span.ui-icon-search {
.Complete_Button_Icon_normal;
background-size: 24px 24px;
.dimension_width_height_m;
margin-left: 1em;
&:hover {.Complete_Button_Icon_hover;}
&active {.Complete_Button_Icon_active;}
}
// Ressourcen // Ressourcen
@ -445,6 +499,8 @@ div#calendar-edit{
} }
} }
/*###########################################*/
// Wiederholung // Wiederholung
#calendar-edit_calendar-edit-recurrence{ #calendar-edit_calendar-edit-recurrence{
@ -455,6 +511,7 @@ div#calendar-edit{
} }
} }
/*###########################################*/
// Benutzerdefiniert // Benutzerdefiniert
#calendar-edit_calendar-edit-custom{ #calendar-edit_calendar-edit-custom{
@ -465,23 +522,30 @@ div#calendar-edit{
} }
} }
/*###########################################*/
// Verknüpfungen // Verknüpfungen
#calendar-edit_calendar-edit-links{ #calendar-edit_calendar-edit-links{
tbody{ tbody{
display: table; display: table;
width: 100%; width: 100%;
.et2_link_to {width: auto !important;}
} }
span.et2_label {padding: 1em;} span.et2_label {padding: 1em;}
} }
/*###########################################*/
// Alarme // Alarme
#calendar-edit_calendar-edit-alarms{ #calendar-edit_calendar-edit-alarms{
tbody{ tbody{
display: table; display: table;
width: 100%; width: 100%;
label.et2_label {white-space: nowrap; padding: 0 5px;}
tr.add_alarm_action {background-color: @color-optional; margin-bottom: 1em;}
} }
} }
@ -645,7 +709,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
white-space: nowrap; white-space: nowrap;
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
border-right: 1px solid silver; border-right: 1px solid silver;
height: 16px; .dimension_height_s;
line-height: 12px; line-height: 12px;
z-index: 30; z-index: 30;
} }
@ -790,9 +854,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
position: absolute; position: absolute;
right: 0px; right: 0px;
top: 0px; top: 0px;
background-color: @gray-10;
.rounded (2px);
} }
.calendar_calEventIcons img{ .calendar_calEventIcons img{
height: 16px; .dimension_height_s;
} }
.calendar_calEventHeaderSmall .calendar_calEventIcons img{ .calendar_calEventHeaderSmall .calendar_calEventIcons img{
height: 13px; height: 13px;
@ -836,8 +902,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
a { a {
img { img {
.Complete_Button_normal; .Complete_Button_normal;
height: 16px; .dimension_width_height_s;
width: 16px;
&:hover{.Complete_Button_hover;} &:hover{.Complete_Button_hover;}
} }
@ -846,6 +911,33 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_calDayTodos .calendar_calDayTodosTable { .calendar_calDayTodos .calendar_calDayTodosTable {
overflow: auto; overflow: auto;
max-height: 400px; max-height: 400px;
table {
// Listendarstellung
// Reihen ohne Border left und right
tr:nth-child(even) {background: @color-even;}
tr:nth-child(odd) {background: @color-odd;}
td {
padding: 3px;
img {
.dimension_width_height_xs;
.Complete_Button_Icon_normal;
&:hover {.Complete_Button_Icon_hover;}
&:active {
.Complete_Button_Icon_active;
background-color: @color-positive-action !important;
}
}
}
}
} }
.calendar_calDayTodos { .calendar_calDayTodos {
width: 250px; width: 250px;
@ -926,9 +1018,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
.calendar_plannerMonthScale { .calendar_plannerMonthScale {
font-weight: bold; font-weight: bold;
a img {.dimension_width_height_s;}
} }
.calendar_plannerDayScale img,.calendar_plannerWeekScale img,.calendar_plannerMonthScale img,.calendar_plannerDayOfMonthScale img { .calendar_plannerDayScale img,.calendar_plannerWeekScale img,.calendar_plannerMonthScale img,.calendar_plannerDayOfMonthScale img {
vertical-align: middle; vertical-align: text-top;
} }
/* calendar_plannerRowHeader contains the user or category name of the calendar_plannerRowWidget /* calendar_plannerRowHeader contains the user or category name of the calendar_plannerRowWidget
@ -1000,9 +1094,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
*/ */
} }
.calendar_plannerEvent img,.calendar_plannerEventPrivate img { .calendar_plannerEvent img,.calendar_plannerEventPrivate img {
padding-top: 2px; padding-top: 0px;
width: 16px; padding: 2px;
height: 16px; .dimension_width_height_xs;
margin: 3px;
.rounded (2px);
background-color: @gray-10;
} }
.calendar_plannerEvent:hover{ .calendar_plannerEvent:hover{
cursor: pointer; cursor: pointer;
@ -1106,4 +1203,5 @@ tr.prefRow:hover .prefHelp {
padding-bottom: 5px; padding-bottom: 5px;
} }
// //
//

3
filemanager/templates/pixelegg/app.css
View File

@ -81,6 +81,9 @@ div.filemanager_navigation > label {
div.filemanager_navigation > label > input { div.filemanager_navigation > label > input {
width: 100%; width: 100%;
} }
input#filemanager-index_upload {
width: 315px;
}
/** /**
* Select file dialog * Select file dialog
*/ */

4
filemanager/templates/pixelegg/app.less
View File

@ -135,8 +135,8 @@ div.filemanager_navigation > label > input {
table#filemanager-select_dir{ table#filemanager-select_dir{
.border_normal; .border_normal;
tr:nth-child(even) {background: @gray-10;} tr:nth-child(even) {background: @color-even;}
tr:nth-child(odd) {background: @gray-20;} tr:nth-child(odd) {background: @color-odd;}
} }

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

@ -180,7 +180,7 @@
</hbox> </hbox>
<textbox type="integer" id="info_number" readonly="true" span="2" class="infolog_infoId"/> <textbox type="integer" id="info_number" readonly="true" span="2" class="infolog_infoId"/>
</row> </row>
<row class="row dialog-header" valign="top"> <row class="row dialog-header2" valign="top">
<description value="Contact" for="info_from"/> <description value="Contact" for="info_from"/>
<vbox options="0,0" span="2"> <vbox options="0,0" span="2">
<hbox options="0,0"> <hbox options="0,0">
@ -192,7 +192,7 @@
<description value="Phone/Email" for="info_addr"/> <description value="Phone/Email" for="info_addr"/>
<textbox statustext="Custom contact-address, leave empty to use information from most recent link" id="info_addr" size="30" maxlength="255" class="_inputFullWidth"/> <textbox statustext="Custom contact-address, leave empty to use information from most recent link" id="info_addr" size="30" maxlength="255" class="_inputFullWidth"/>
</row> </row>
<row class="row dialog-header"> <row class="row dialog-header3">
<description value="Category" for="info_cat"/> <description value="Category" for="info_cat"/>
<menulist span="2"> <menulist span="2">
<menupopup type="select-cat" statustext="select a category for this entry" id="info_cat" options="None"/> <menupopup type="select-cat" statustext="select a category for this entry" id="info_cat" options="None"/>
@ -201,7 +201,7 @@
<description value="Parent" font_style="1"/> <description value="Parent" font_style="1"/>
<link-entry id="info_id_parent" onchange="if(egw &amp;&amp; widget) { if(widget._oldValue) window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget._oldValue,false);window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget.getValue(),false);}" options="infolog" class="noWrap searchParent"/> <link-entry id="info_id_parent" onchange="if(egw &amp;&amp; widget) { if(widget._oldValue) window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget._oldValue,false);window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget.getValue(),false);}" options="infolog" class="noWrap searchParent"/>
</row> </row>
<row class="row dialog-header"> <row class="row dialog-header4">
<description value="Subject" for="info_subject"/> <description value="Subject" for="info_subject"/>
<textbox statustext="a short subject for the entry" id="info_subject" class="inputFullWidth" size="80" maxlength="255" needed="true" span="all" tabindex="1"/> <textbox statustext="a short subject for the entry" id="info_subject" class="inputFullWidth" size="80" maxlength="255" needed="true" span="all" tabindex="1"/>
</row> </row>

22
infolog/templates/pixelegg/app.css
View File

@ -257,8 +257,26 @@ input#infolog-edit_info_subject {
/*#############################################*/ /*#############################################*/
/*Tabs */ /*Tabs */
/*Beschreibung*/ /*Beschreibung*/
/*Verknüpfung*/ /*Verknüpfung ************************************/
/*Delegation*/ #infolog-edit_infolog-edit-links {
/*neue verknüpfung erstellen - div*/
/*img.et2_button_icon defined in etemplate2.less*/
}
#infolog-edit_infolog-edit-links div#addressbook-edit_link_to {
width: 100% !important;
}
#infolog-edit_infolog-edit-links div.et2_file {
float: left;
margin-left: 121px;
margin-top: -46px;
}
#infolog-edit_infolog-edit-links table#infolog-edit_link_to {
overflow-y: scroll;
}
/*Delegation ************************************/
#infolog-edit_infolog-edit-delegation .inputFullWidth input {
width: 96%;
}
/*Projektmanager*/ /*Projektmanager*/
#infolog-edit_infolog-edit-project .et2_link_entry.no_app input.ui-autocomplete-input { #infolog-edit_infolog-edit-project .et2_link_entry.no_app input.ui-autocomplete-input {
width: auto; width: auto;

37
infolog/templates/pixelegg/app.less
View File

@ -314,9 +314,42 @@ input#infolog-edit_info_subject {width: 98% !important;}
/*Beschreibung*/ /*Beschreibung*/
/*Verknüpfung*/ /*Verknüpfung ************************************/
#infolog-edit_infolog-edit-links{
/*neue verknüpfung erstellen - div*/
div#addressbook-edit_link_to {
width: 100% !important;
}
// 1. with Addressbook
// 2. Icon
/*img.et2_button_icon defined in etemplate2.less*/
// Upload
div.et2_file {
float: left;
margin-left: 121px;
margin-top: -46px;
}
table#infolog-edit_link_to {overflow-y: scroll;}
}
/*Delegation ************************************/
#infolog-edit_infolog-edit-delegation {
.inputFullWidth input { width: 96%; }
}
/*Delegation*/
/*Projektmanager*/ /*Projektmanager*/
#infolog-edit_infolog-edit-project{ #infolog-edit_infolog-edit-project{