extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

pixelegg changes from monday

Browse Source
This commit is contained in:
Ralf Becker 2013-12-10 07:52:15 +00:00
parent 7c33488596
commit 391dde093e
3 changed files with 86 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/templates/default/edit.xet
View File

@ -1,5 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- $Id$ --> <!-- $Id$ -->
<!-- $Id$ -->
<overlay> <overlay>
<template id="addressbook.edit.upload" template="" lang="" group="0" version="1.3.004"> <template id="addressbook.edit.upload" template="" lang="" group="0" version="1.3.004">
<grid class="uploadphoto"> <grid class="uploadphoto">
@ -518,8 +519,8 @@
</rows> </rows>
</grid> </grid>
</row> </row>
<row valign="top"> <row valign="top" class="addressbook_edit_left_tr">
<tabbox id="tabs"> <tabbox id="tabs" class="addressbook_edit_left_td">
<tabs> <tabs>
<tab id="general" label="General" statustext="Name, Address"/> <tab id="general" label="General" statustext="Name, Address"/>
<tab id="cats" label="Categories" statustext="Categories"/> <tab id="cats" label="Categories" statustext="Categories"/>
@ -543,7 +544,7 @@
<template id="addressbook.edit.history"/> <template id="addressbook.edit.history"/>
</tabpanels> </tabpanels>
</tabbox> </tabbox>
<vbox> <vbox class="addressbook_edit_right_td">
<template id="addressbook.editphones"/> <template id="addressbook.editphones"/>
<groupbox class="phoneGroup"> <groupbox class="phoneGroup">
<caption label="Phone Numbers"/> <caption label="Phone Numbers"/>

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

@ -356,6 +356,26 @@ div#addressbook-index table.egwGridView_outer {
/*#######################################################*/ /*#######################################################*/
/*#######################################################*/ /*#######################################################*/
/*State: Address selected*/ /*State: Address selected*/
/*Layout*/
/*##############################
# # #
# # Phone #
# Address # #
# # Email #
# # #
################################ */
td.addressbook_edit_left_td {
min-width: 500px;
max-width: 100%;
}
td.addressbook_edit_left_td .et2_tabs .et2_tabcntr {
min-width: 500px;
max-width: 100%;
}
td.addressbook_edit_right_td {
min-width: 300px;
max-width: 100%;
}
/*ADD AREA*/ /*ADD AREA*/
#infolog-index_infolog-index-header_right .et2_box_widget { #infolog-index_infolog-index-header_right .et2_box_widget {
background-color: #0b5fa4 !important; background-color: #0b5fa4 !important;
@ -404,19 +424,19 @@ div#addressbook-index table.egwGridView_outer {
/*#######################################################*/ /*#######################################################*/
/*#######################################################*/ /*#######################################################*/
/* State: address edit min*/ /* State: address edit min*/
/*#######################################################*/
/* Tab Generell */
/*Layout*/
#addressbook-edit .et2_tabbox { #addressbook-edit .et2_tabbox {
max-width: 100%; max-width: 100%;
min-width: 530px; min-width: 530px;
} }
#addressbook-edit .et2_tabs { #addressbook-edit .et2_tabs {
height: 380px; height: 380px;
min-width: 530px;
} }
table.et2_grid .addressbook_edit_general { table.et2_grid .addressbook_edit_general {
width: 80% !important; width: 80% !important;
} }
/*#######################################################*/
/* Tab Generell */
/*################## /*##################
# # # #
# # # #
@ -451,10 +471,10 @@ div.addressbook_edit_general_picture img.photo:hover {
div.addressbook_edit_general_picture table.uploadphoto { div.addressbook_edit_general_picture table.uploadphoto {
background-color: #f0f0f0; background-color: #f0f0f0;
width: auto; width: auto;
border-top: solid 1px 1px; border-top: solid 1px #e6e6e6;
border-left: solid 1px 0; border-left: solid 1px #e6e6e6;
border-right: solid 1px 1px; border-right: solid 1px #e6e6e6;
border-bottom: solid 1px 1px; border-bottom: solid 1px #e6e6e6;
left: 243px; left: 243px;
top: 189px; top: 189px;
} }
@ -726,10 +746,12 @@ div#addressbook-edit_addressbook-edit-links table#addressbook-edit_link_to {
display: table-header-group; display: table-header-group;
vertical-align: top; vertical-align: top;
} }
#addressbook-edit_addressbook-edit-history .et2_historylog div:first-child { #addressbook-edit_addressbook-edit-history .et2_historylog div:first-child,
#addressbook-edit_addressbook-edit-history #addressbook-edit_history div:first-child {
height: auto !important; height: auto !important;
} }
#addressbook-edit_addressbook-edit-history .et2_historylog table.egwGridView_outer th.optcol span.selectcols { #addressbook-edit_addressbook-edit-history .et2_historylog table.egwGridView_outer th.optcol span.selectcols,
#addressbook-edit_addressbook-edit-history #addressbook-edit_history table.egwGridView_outer th.optcol span.selectcols {
position: relative !important; position: relative !important;
} }
/*################################################################ /*################################################################

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

@ -49,6 +49,8 @@
.et2_container[id^="infolog-index-addressbook"] { .et2_container[id^="infolog-index-addressbook"] {
min-height: 250px; min-height: 250px;
} }
@ -238,8 +240,33 @@ div#addressbook-index{
/*#######################################################*/ /*#######################################################*/
/*State: Address selected*/ /*State: Address selected*/
/*Layout*/
/*##############################
# # #
# # Phone #
# Address # #
# # Email #
# # #
################################ */
td.addressbook_edit_left_td {
min-width: 500px;
max-width: 100%;
.et2_tabs {
.et2_tabcntr {
min-width: 500px;
max-width: 100%;
}
}
}
td.addressbook_edit_right_td {min-width: 300px; max-width: 100%;}
@ -269,17 +296,15 @@ div#addressbook-index{
/*#######################################################*/
/* Tab Generell */
/*Layout*/
#addressbook-edit .et2_tabbox {max-width: 100%; min-width: 530px;} #addressbook-edit .et2_tabbox {max-width: 100%; min-width: 530px;}
#addressbook-edit .et2_tabs {height: 380px;} #addressbook-edit .et2_tabs {height: 380px; min-width: 530px;}
table.et2_grid .addressbook_edit_general {width: 80% !important;} table.et2_grid .addressbook_edit_general {width: 80% !important;}
/*#######################################################*/
/* Tab Generell */
/*################## /*##################
# # # #
@ -293,7 +318,11 @@ div.addressbook_edit_general_picture {
float: right; float: right;
img {width: 180% !important; max-width: 100px !important; height: auto !important; margin-right: 70px; } img {width: 180% !important;
max-width: 100px !important;
height: auto !important;
margin-right: 70px;
}
/*Picture*/ /*Picture*/
@ -308,7 +337,7 @@ div.addressbook_edit_general_picture {
table.uploadphoto { table.uploadphoto {
.background-color-10-gray; .background-color-10-gray;
width: auto; width: auto;
.bordered(1px, 1px, 1px, 0); .bordered(@gray-10, @gray-10, @gray-10, @gray-10);
left: 243px; left: 243px;
top: 189px; top: 189px;
} }
@ -581,24 +610,32 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
} }
/*################## Tab 8 Extra Privat###############################*/ /*################## Tab 8 Extra Privat###############################*/
/*seems to be ok*/ /*seems to be ok*/
/*################## Tab 9 History ###############################*/ /*################## Tab 9 History ###############################*/
// 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 {
} }
}
#addressbook-edit_addressbook-edit-history{ .et2_historylog,
#addressbook-edit_history{
.et2_historylog{
div:first-child {height: auto !important;} div:first-child {height: auto !important;}
table.egwGridView_outer { table.egwGridView_outer {
th.optcol { th.optcol {