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

pixelegg changes from last days

Browse Source
This commit is contained in:
Ralf Becker 2013-12-12 03:46:53 +00:00
parent fef5bb4972
commit 4f7976cdff
4 changed files with 270 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/templates/default/app.css
View File

@ -93,3 +93,10 @@ fieldset.emailGroup {
.image16 img {
height: 16px;
}
/* changes from pixelegg 11/12/13 - upload foto in right column */
#addressbook-edit_addressbook-edit-general table.addressbook_edit_general td.addressbook_edit_general_right {
widtH: 20%;
vertical-align: top;
text-align: center;
}

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

@ -57,14 +57,18 @@
<template id="addressbook.edit.general" template="" lang="" group="0" version="1.9.003">
<!-- <image src="accounts"/> -->
<vbox class="addressbook_edit_general_picture">
<image src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;" class="photo"/>
<template id="addressbook.edit.upload"/>
</vbox>
<!-- <image src="accounts"/> -->
<grid class="addressbook_edit_general">
<columns>
<column width="80%" class="addressbook_edit_general_left"/>
<column width="20%" class="addressbook_edit_general_right"/>
</columns>
<rows>
<row>
<grid width="auto">
<columns>
<column />
<column/>
<column/>
<column/>
<column/>
@ -73,13 +77,15 @@
<row>
<description value="Name"/>
<textbox id="n_fn" no_lang="1" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" rows="1" size="36" span="3" tabindex="-1" class="cursorHand"/>
</row>
<row>
<description/>
<template id="addressbook.edit.name"/>
</row>
<row>
<row>
<description for="title" value="Title"/>
<textbox id="title" size="36" maxlength="64" span="2"/>
@ -159,7 +165,15 @@
</menulist>
</row>
</rows>
</grid>
<hbox class="addressbook_edit_general_picture">
<image src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;" class="photo"/>
<template id="addressbook.edit.upload"/>
</hbox>
</row>
</rows>
</grid>
</template>
@ -238,7 +252,7 @@
<textbox id="adr_two_countryname" class="custom_country"/>
</hbox>
</row>
<row height="30">
<row height="30" class="add_bday_timezone">
<image src="gear"/>
<description for="bday" value="Birthday"/>
<hbox options="0,0">

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

@ -144,23 +144,22 @@ fieldset.emailGroup {
/* #############################################################################
// iframe
// Rahmen + padding**/
/*############################################
# # #
# # #
# # #
# # #
# # #
# # #
# # #
# # iframge #
# # #
# # #
# # #
# # #
# # #
# # #
##############################################
*/
/*################## iframe ####################*/
/*# # #*/
/*# # #*/
/*# # Addressbook #*/
/*# # #*/
/*# # #*/
/*# # #*/
/*# ############################### #*/
/*# # #*/
/*# # #*/
/*# # #*/
/*# # infolog #*/
/*# # #*/
/*# # #*/
/*# # #*/
/*##############################################*/
/**
* Give space to both contact view & infolog list
*/
@ -171,9 +170,6 @@ fieldset.emailGroup {
height: auto;
min-height: 390px;
}
.et2_container[id^="infolog-index-addressbook"] {
min-height: 250px;
}
div#addressbook-index div.et2_hbox_left {
padding: 1em;
}
@ -327,8 +323,60 @@ div#addressbook-index div.filters select#infolog-index_filter2 {
div#addressbook-index table.egwGridView_outer {
width: 99%;
}
.et2_container {
/*##################################################################*/
/*Infolog*/
.et2_container[id^="infolog-index-addressbook"] {
height: auto;
min-height: 250px;
/*ADD*/
/* div.et2_hbox,
div.et2_box_widget*/
}
.et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] {
background-color: #0b5fa4 !important;
color: #FFF;
text-shadow: none;
/* height: auto;*/
background-image: none !important;
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 20px;
border-radius: 3px;
border-top-left-radius: 20px;
height: auto;
color: #ffffff;
font-size: 0.9em;
}
.et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"]:before {
content: "+";
font-size: 1.5em;
color: #ffc200;
line-height: 1.1em;
}
.et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"]:before {
padding-left: 5px;
}
.et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"]:hover {
background-color: #66a1d2 !important;
color: #ffc200;
-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);
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 20px;
border-radius: 3px;
border-top-left-radius: 20px;
}
.et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] span.et2_label {
color: #ffffff;
font-size: 0.9em;
padding-right: 11px;
}
.et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] img.et2_button {
margin-top: -15px;
}
/*###########################################
# #
@ -349,9 +397,14 @@ div#addressbook-index table.egwGridView_outer {
# #
##############################################*/
#addressbook-edit_addressbook-edit-general table.addressbook_edit_general {
width: 80%;
width: 100%;
height: 286px;
}
#addressbook-edit_addressbook-edit-general table.addressbook_edit_general td.addressbook_edit_general_right {
widtH: 20%;
vertical-align: top;
text-align: center;
}
/*#######################################################*/
/*#######################################################*/
/*#######################################################*/
@ -363,80 +416,45 @@ div#addressbook-index table.egwGridView_outer {
# Address # #
# # Email #
# # #
# left # right #
################################ */
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%;
width: 70%;
}
td.addressbook_edit_right_td {
min-width: 300px;
max-width: 100%;
width: 30%;
}
/*ADD AREA*/
#infolog-index_infolog-index-header_right .et2_box_widget {
background-color: #0b5fa4 !important;
color: #FFF;
text-shadow: none;
/* height: auto;*/
background-image: none !important;
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 20px;
border-radius: 3px;
border-top-left-radius: 20px;
height: auto;
color: #ffffff;
font-size: 0.9em;
.egw_fw_ui_tab_content #addressbook-edit .et2_tabs {
max-height: 25em;
}
#infolog-index_infolog-index-header_right .et2_box_widget:before {
content: "+";
font-size: 1.5em;
color: #ffc200;
line-height: 1.1em;
}
#infolog-index_infolog-index-header_right .et2_box_widget:hover {
background-color: #66a1d2 !important;
color: #ffc200;
-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);
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 20px;
border-radius: 3px;
border-top-left-radius: 20px;
}
#infolog-index_infolog-index-header_right .et2_box_widget span.et2_label {
color: #ffffff;
font-size: 0.9em;
padding-right: 11px;
}
#infolog-index_infolog-index-header_right .et2_box_widget img.et2_button {
margin-top: -15px;
}
/*#######################################################*/
/*#######################################################*/
/*#######################################################*/
/* State: address edit min*/
#addressbook-edit .et2_tabbox {
max-width: 100%;
min-width: 530px;
}
#addressbook-edit .et2_tabs {
height: 380px;
min-width: 530px;
}
table.et2_grid .addressbook_edit_general {
width: 80% !important;
/* popup window */
#popupMainDiv #addressbook-edit .et2_tabs {
height: 400px;
}
/*############ tabbox##############################################*/
/*# et2_tabheader # et2_tabheader # et2_tabheader # et2_tabheader #*/
/*#################################################################*/
/*# #*/
/*# #*/
/*# #*/
/*# et2_tabs #*/
/*# #*/
/*# #*/
/*#################################################################*/
/*#addressbook-edit .et2_tabbox {
max-width: 100%;
min-width: 530px;
width: 550px
}*/
/*#######################################################*/
/* Tab Generell */
.leftPad5 {
padding-left: 0px;
}
/*##################
# #
# #
@ -446,14 +464,12 @@ table.et2_grid .addressbook_edit_general {
##################*/
/*Div Image*/
div.addressbook_edit_general_picture {
float: right;
/*Picture*/
}
div.addressbook_edit_general_picture img {
width: 180% !important;
max-width: 100px !important;
height: auto !important;
margin-right: 70px;
}
div.addressbook_edit_general_picture img.photo {
border: 1px solid rgba(0, 0, 0, 0.15);
@ -685,13 +701,23 @@ div#addressbook-edit_addressbook-edit-cats {
display: table-header-group;
vertical-align: top;
}
#addressbook-edit_addressbook-edit-home {
/*Birthday + Timezone*/
/*row*/
}
#addressbook-edit_addressbook-edit-home #addressbook_edit_adr_two_countrycode_chzn {
width: 200px !important;
padding-top: 1em;
padding-top: 0em;
}
#addressbook-edit_addressbook-edit-home #addressbook_edit_tz_chzn {
#addressbook-edit_addressbook-edit-home .add_bday_timezone {
/*Birthday Label*/
}
#addressbook-edit_addressbook-edit-home .add_bday_timezone #addressbook_edit_tz_chzn {
width: 15% !important;
padding-top: 1em;
padding-top: 0em;
}
#addressbook-edit_addressbook-edit-home .add_bday_timezone label.et2_label {
padding-left: 1em;
}
/*################## Tab 4 Details ###############################*/
/*################## Tab 5 Verknüpfungen ###############################*/
@ -799,9 +825,6 @@ div.addressbook.edit.general table img:nth-child(2) {
color: red;
font-style: italic;
}
.leftPad5 {
padding-left: 5px;
}
.bold {
font-weight: bold;
}

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

@ -17,26 +17,30 @@
// iframe
// Rahmen + padding**/
/*############################################
# # #
# # #
# # #
# # #
# # #
# # #
# # #
# # iframge #
# # #
# # #
# # #
# # #
# # #
# # #
##############################################
*/
/*################## iframe ####################*/
/*# # #*/
/*# # #*/
/*# # Addressbook #*/
/*# # #*/
/*# # #*/
/*# # #*/
/*# ############################### #*/
/*# # #*/
/*# # #*/
/*# # #*/
/*# # infolog #*/
/*# # #*/
/*# # #*/
/*# # #*/
/*##############################################*/
/**
* Give space to both contact view & infolog list
*/
#addressbook-index {
height: 100%;
}
@ -47,15 +51,6 @@
.et2_container[id^="infolog-index-addressbook"] {
min-height: 250px;
}
div#addressbook-index{
// min-height: 700px;
// height: auto !important;
@ -171,7 +166,35 @@ div#addressbook-index{
} // iframe
.et2_container {height: auto;}
/*##################################################################*/
/*Infolog*/
.et2_container[id^="infolog-index-addressbook"] {
height: auto;
min-height: 250px;
/*ADD*/
/* div.et2_hbox,
div.et2_box_widget*/
.et2_hbox_right[id*="_infolog-index-header_right"]{
.Complete_Button_add;
height: auto;
.color-0-gray; // white
font-size: 0.9em;
&:before {padding-left: 5px;}
&:hover {.Complete_Button_add_hover;}
span.et2_label {color: @gray-0; font-size: 0.9em;padding-right: 11px;}
img.et2_button {margin-top: -15px;}
}
}
//******************************************************************
@ -226,10 +249,18 @@ div#addressbook-index{
table.addressbook_edit_general {
width:80%;
width:100%;
height:286px;
td.addressbook_edit_general_right {
widtH: 20%;
vertical-align: top;
text-align: center;
}
}
}
@ -247,64 +278,63 @@ div#addressbook-index{
# Address # #
# # Email #
# # #
# left # right #
################################ */
td.addressbook_edit_left_td {
min-width: 500px;
max-width: 100%;
.et2_tabs {
.et2_tabcntr {
min-width: 500px;
max-width: 100%;
}
}
width: 70%;
}
td.addressbook_edit_right_td {
min-width: 300px;
max-width: 100%;
width: 30%;
}
td.addressbook_edit_right_td {min-width: 300px; max-width: 100%;}
.egw_fw_ui_tab_content #addressbook-edit .et2_tabs {
max-height: 25em;
}
/*ADD AREA*/
#infolog-index_infolog-index-header_right{
.et2_box_widget{
.Complete_Button_add;
height: auto;
.color-0-gray; // white
font-size: 0.9em;
&:hover {.Complete_Button_add_hover;}
span.et2_label {color: @gray-0; font-size: 0.9em;padding-right: 11px;}
img.et2_button {margin-top: -15px;}
}
}
/* popup window */
#popupMainDiv #addressbook-edit .et2_tabs {
height: 400px;
}
/*#######################################################*/
/*#######################################################*/
/*#######################################################*/
/* State: address edit min*/
/*############ tabbox##############################################*/
/*# et2_tabheader # et2_tabheader # et2_tabheader # et2_tabheader #*/
/*#################################################################*/
/*# #*/
/*# #*/
/*# #*/
/*# et2_tabs #*/
/*# #*/
/*# #*/
/*#################################################################*/
/*#addressbook-edit .et2_tabbox {
max-width: 100%;
min-width: 530px;
width: 550px
}*/
#addressbook-edit .et2_tabbox {max-width: 100%; min-width: 530px;}
#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 */
.leftPad5 {
padding-left: 0px;
}
/*##################
# #
@ -315,13 +345,17 @@ table.et2_grid .addressbook_edit_general {width: 80% !important;}
##################*/
/*Div Image*/
div.addressbook_edit_general_picture {
float: right;
// float: right;
// width: 180% !important;
// max-width: 100px !important;
// height: auto !important;
// margin-right: 10px;
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;
}
/*Picture*/
@ -548,15 +582,28 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
#addressbook_edit_adr_two_countrycode_chzn{
width: 200px !important;
// background-color: red !important;
padding-top: 1em;
padding-top: 0em;
}
// Timezone
#addressbook_edit_tz_chzn{
width: 15% !important;
padding-top: 1em;
/*Birthday + Timezone*/
/*row*/
.add_bday_timezone {
// Timezone
#addressbook_edit_tz_chzn{
width: 15% !important;
padding-top: 0em;
}
/*Birthday Label*/
label.et2_label {padding-left: 1em;}
}
}
/*################## Tab 4 Details ###############################*/
@ -723,13 +770,6 @@ div.addressbook.edit.general{
}
.leftPad5 {
padding-left: 5px;
}
.bold {
font-weight: bold;
}
@ -816,4 +856,4 @@ table.uploadphoto {width: 360px !important; background-color: @gray-20 !importan
// Ende Addressbuch
// Ende Addressbuch