pending changes

This commit is contained in:
Stefan Reinhardt 2014-03-10 16:08:59 +00:00
parent 1d9b23f105
commit d674768754
19 changed files with 184 additions and 140 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -51,7 +51,7 @@ Author: Stefan Reinhardt (c) pixelegg
<div id="popupdialog-mail">
<div class="et2_container" id="emailadmin-wizard"><div><table class="et2_grid" style="width: 100%;"><tbody><tr><td class="message" style="width: 120px;" colspan="2"><span class="et2_label message" id="emailadmin-wizard_msg"></span></td></tr><tr class="dialog-header"><td class="emailadmin_header" style="width: 120px;" colspan="2"><span class="et2_label emailadmin_header">Step 1: IMAP - incoming mail</span></td></tr><tr><td style="width: 120px;"><span class="et2_label"><a href="ident_email">E-Mail-Adresse</a></span></td><td><span><input id="emailadmin-wizard_ident_email" name="ident_email" required="required" size="32" maxlength="128"><a class="et2_url email" href="mailto:sysop@sbtest-et2.egroupware.de"></a></span></td></tr><tr class="emailadmin_manual"><td style="width: 120px;"><label class="et2_label" for="acc_imap_username">Benutzername</label></td><td><input size="32" placeholder="if different from EMail address" class="et2_textbox" id="emailadmin-wizard_acc_imap_username" name="acc_imap_username" maxlength="128"></td></tr><tr><td style="width: 120px;"><label class="et2_label" for="acc_imap_password">Passwort</label></td><td><input type="password" size="32" class="et2_textbox" id="emailadmin-wizard_acc_imap_password" name="acc_imap_password" required="required" maxlength="128"></td></tr><tr class="emailadmin_manual"><td style="width: 120px;"><label class="et2_label" for="acc_imap_host">IMAP Server</label></td><td><input size="32" placeholder="Hostname or IP" class="et2_textbox" id="emailadmin-wizard_acc_imap_host" name="acc_imap_host" maxlength="128"></td></tr><tr class="emailadmin_manual"><td style="width: 120px;"><label class="et2_label" for="acc_imap_ssl">Sichere Verbindung</label></td><td><div class="et2_hbox et2_box_widget"><select class="et2_selectbox emailadmin_ssl" id="emailadmin-wizard_acc_imap_ssl" name="acc_imap_ssl"><option value="2">TLS</option><option value="3">SSL</option><option value="1">STARTTLS</option><option value="no">Nein</option></select><label class="et2_label">Port<input type="number" class="et2_textbox emailadmin_port" id="emailadmin-wizard_acc_imap_port" name="acc_imap_port" size="5"></label></div></td></tr><tr class="dialog-footer-toolbar"><td style="width: 120px;" colspan="2"><div class="et2_hbox et2_box_widget"><button class="et2_button et2_button_text et2_button_with_image et2_clickable" id="emailadmin-wizard_button[continue]" style="background-image: url(&quot;https://sbtest-et2.egroupware.de/egw/pixelegg/images/continue.png&quot;);">Weiter</button><button class="et2_button et2_button_text et2_clickable" id="emailadmin-wizard_button[manual]">Manuelle Eingabe</button><button class="et2_button et2_button_text et2_button_with_image et2_clickable" id="emailadmin-wizard_button[cancel]" style="background-image: url(&quot;https://sbtest-et2.egroupware.de/egw/pixelegg/images/cancel.png&quot;);">Abbruch</button></div></td></tr><tr><td class="emailadmin_progress" style="width: 120px;" colspan="2"><img class="emailadmin_progress" src="https://sbtest-et2.egroupware.de/egw/emailadmin/templates/default/images/progress.gif" style="display: inline;"></td></tr><tr><td style="width: 120px;" colspan="2"><label class="et2_label" id="emailadmin-wizard_output"><span class="et2_textbox_ro"></span></label></td></tr></tbody></table></div></div>
<div class="et2_container" id="emailadmin-wizard"><div><table class="et2_grid" style="width: 100%;"><tbody><tr><td class="message" style="width: 120px;" colspan="2"><span class="et2_label message" id="emailadmin-wizard_msg"></span></td></tr><tr class="dialogHeader"><td class="emailadmin_header" style="width: 120px;" colspan="2"><span class="et2_label emailadmin_header">Step 1: IMAP - incoming mail</span></td></tr><tr><td style="width: 120px;"><span class="et2_label"><a href="ident_email">E-Mail-Adresse</a></span></td><td><span><input id="emailadmin-wizard_ident_email" name="ident_email" required="required" size="32" maxlength="128"><a class="et2_url email" href="mailto:sysop@sbtest-et2.egroupware.de"></a></span></td></tr><tr class="emailadmin_manual"><td style="width: 120px;"><label class="et2_label" for="acc_imap_username">Benutzername</label></td><td><input size="32" placeholder="if different from EMail address" class="et2_textbox" id="emailadmin-wizard_acc_imap_username" name="acc_imap_username" maxlength="128"></td></tr><tr><td style="width: 120px;"><label class="et2_label" for="acc_imap_password">Passwort</label></td><td><input type="password" size="32" class="et2_textbox" id="emailadmin-wizard_acc_imap_password" name="acc_imap_password" required="required" maxlength="128"></td></tr><tr class="emailadmin_manual"><td style="width: 120px;"><label class="et2_label" for="acc_imap_host">IMAP Server</label></td><td><input size="32" placeholder="Hostname or IP" class="et2_textbox" id="emailadmin-wizard_acc_imap_host" name="acc_imap_host" maxlength="128"></td></tr><tr class="emailadmin_manual"><td style="width: 120px;"><label class="et2_label" for="acc_imap_ssl">Sichere Verbindung</label></td><td><div class="et2_hbox et2_box_widget"><select class="et2_selectbox emailadmin_ssl" id="emailadmin-wizard_acc_imap_ssl" name="acc_imap_ssl"><option value="2">TLS</option><option value="3">SSL</option><option value="1">STARTTLS</option><option value="no">Nein</option></select><label class="et2_label">Port<input type="number" class="et2_textbox emailadmin_port" id="emailadmin-wizard_acc_imap_port" name="acc_imap_port" size="5"></label></div></td></tr><tr class="dialogFooterToolbar"><td style="width: 120px;" colspan="2"><div class="et2_hbox et2_box_widget"><button class="et2_button et2_button_text et2_button_with_image et2_clickable" id="emailadmin-wizard_button[continue]" style="background-image: url(&quot;https://sbtest-et2.egroupware.de/egw/pixelegg/images/continue.png&quot;);">Weiter</button><button class="et2_button et2_button_text et2_clickable" id="emailadmin-wizard_button[manual]">Manuelle Eingabe</button><button class="et2_button et2_button_text et2_button_with_image et2_clickable" id="emailadmin-wizard_button[cancel]" style="background-image: url(&quot;https://sbtest-et2.egroupware.de/egw/pixelegg/images/cancel.png&quot;);">Abbruch</button></div></td></tr><tr><td class="emailadmin_progress" style="width: 120px;" colspan="2"><img class="emailadmin_progress" src="https://sbtest-et2.egroupware.de/egw/emailadmin/templates/default/images/progress.gif" style="display: inline;"></td></tr><tr><td style="width: 120px;" colspan="2"><label class="et2_label" id="emailadmin-wizard_output"><span class="et2_textbox_ro"></span></label></td></tr></tbody></table></div></div>
</div>

File diff suppressed because one or more lines are too long

View File

@ -135,7 +135,7 @@ This descripes the structure of the less files.
/*###########################################
# #
# dialog-header #
# dialogHeader #
#############################################
# #
# #
@ -146,7 +146,7 @@ This descripes the structure of the less files.
# #
# #
#############################################
# dialog-operators #
# dialogOperators #
#############################################
# #
# buttons #

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -139,7 +139,7 @@
/*Listenausgabe*/
@color_even : @gray_0;
@color_odd : darken(@gray_0, 2%);
@color_odd : darken(@gray_0, 5%);
// aktiverte Zeilen in allen APP mit Listenausgabe
@ -186,7 +186,7 @@
// cal Heute // in Sidebar
.background_table_cal_head { background-color : @egw_color_1_e;}
.background_table_cal_head { background-color : @egw_color_1_a;}
@color_progress : @egw_color_1_e;
@ -194,9 +194,7 @@
// Schriften
.basefontfamily{
font-family: Verdana, Helvetica, Sans-Serif;
/* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/
// font-size: 16px;
font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif;
}
@ -426,7 +424,7 @@
/*Icon Buttons ################## */
@mass_xxs : 8px;
@mass_xs : 12px;
@mass_s : 16px;
@mass_sm : 20px;
@ -449,6 +447,7 @@
.dimension_width_height_sm{width: @mass_sm; height: @mass_sm;}
.dimension_width_height_s{width: @mass_s; height: @mass_s;}
.dimension_width_height_xs{width: @mass_xs; height: @mass_xs;}
.dimension_width_height_xxs{width: @mass_xxs; height: @mass_xxs;}
/* only Buttons ################## */
@ -467,9 +466,7 @@
.dimension_height_sm{ height: @mass_sm;}
.dimension_height_s{ height: @mass_s;}
.dimension_height_xs{ height: @mass_xs;}
.dimension_height_xxs{ height: @mass_xxs;}
// Rahmen für Schaltflächen

View File

@ -327,111 +327,51 @@ hr {
/* ##################################################################################
* Nextmatch widget
*
* SEARCH FIELD | SEARCH BUTTON ###### FILTER ##### EXPORT IMG ### FAVORITES ### COUNT
*
* ##################################################################################*/
//
// SEARCH FIELD | SEARCH BUTTON ###### FILTER ##### EXPORT IMG ### FAVORITES ### COUNT
// AREA AROUND CONTENT
.et2_nextmatch {
.background_color_10_gray;
}
// complete nextmatch....Background color!
.et2_nextmatch .nextmatch_header {
border: none;
background-image: none;
background-color: @gray_20;
margin-bottom: 3px;
margin: 0;
// margin-right: 3px;
}
// ALL images
.et2_nextmatch > img {.dimension_width_height_s;}
// area width left and right boxes
.ui-helper-clearfix{ background-color: gray_20;}
.ui-helper-clearfix{ background-color: @gray_20;}
// count
.nextmatch_header .header_count {
position: relative;
top: 3px;
height: 22px;
.dimension_height_m;
border: 1px solid #E0E0E0;
float: right;
margin: 6px 11px 0;
padding: 0 20px;
text-align: center;
.fontsize_normal;
.border_normal;
.rounded (3px);
color: @gray_100;
// count number
span {
.fontsize_normal;
top: 4px;
position: relative;
}
}
/*################################################################
*
* Filters
* Search Field
*
################################################################*/
.nextmatch_header > .filters {
width: 100%;
margin-bottom: 4px;
padding: 0 5px 0 0;
background-color: @gray_30;
border: none !important;
border-color: @gray_100;
background-image: none !important;
min-height: 37px;
.border_radius (3px, 3px, 0px, 0px);
select {margin-top: 10px;}
.et2_label {
padding: 0.2em;
select {
/*.Complete_Button_select;*/
margin-left: 2px;
margin-right: 1px;
margin-top: 8px;
max-width: 14% !important;
&:hover{
.Complete_Button_select_hover;
}
&:after {}
/*Dialog - Addressbook - View */
#infolog-index_cat_id,
#infolog-index_filter {width: 50% !important;}
}
}
}
// Select -> Option
.nextmatch_header > .filters > select > option {.fontsize_normal;}
// ####################################################
// Search Field
//
//
.nextmatch_header > .search{
padding: 0 0 0 3px;
padding: 0 0 0 0px;
margin-right: 3px;
margin-left: 15px;
width: 200px;
z-index: 100;
white-space: nowrap;
/*.background_color_search;*/
.border_radius_button_righttop;
/*.border_radius_button_righttop;*/
input {
/*.background_color_search;*/
@ -440,6 +380,7 @@ hr {
.fontsize_normal;
color: @gray_100;
padding: 3px;
width: 150px;
}
input::-webkit-input-placeholder {
@ -503,8 +444,60 @@ hr {
}
// Input Field
/*################################################################
*
* Filters
*
################################################################*/
.nextmatch_header > .filters {
/*width: 83%;*/
z-index: 7;
margin-bottom: 4px;
top: 0px; // fix for stylite template
padding: 0 5px 0 0;
/*background-color: @gray_30;*/
background: transparent;
border: none !important;
/*border-color: @gray_100;*/
background-image: none !important;
min-height: 37px;
margin-left: 224px; // fix for stylite
margin-right: 119px; // fix for stylite
/* .border_radius (3px, 3px, 0px, 0px);*/
select {margin-top: 10px;}
.et2_label {
padding: 0.2em;
select {
/*.Complete_Button_select;*/
margin-left: 2px;
margin-right: 1px;
margin-top: 8px;
width: 20%;
max-width: 20% !important; // fix for stylite template
&:hover{
.Complete_Button_select_hover;
}
&:after {}
/*Dialog - Addressbook - View */
#infolog-index_cat_id,
#infolog-index_filter {width: 50% !important;}
}
}
}
// Select -> Option
.nextmatch_header > .filters > select > option {.fontsize_normal;}
// Input Field
.nextmatch_header > .filters input {
margin-right: 2ex;
width: 15%;
@ -514,6 +507,13 @@ hr {
}
/*################################################################
*
* Export Button
*
################################################################*/
.nextmatch_header .et2_button_icon {}
// Export Button
@ -533,22 +533,50 @@ hr {
.et2_nextmatch .nextmatch_header {
border: none;
background-image: none;
background-color: @gray_20;
margin-bottom: 3px;
margin: 0;
// margin-right: 3px;
}
.et2_nextmatch .nextmatch_header > .filters {
/*.et2_nextmatch .nextmatch_header > .filters {
border: 1px solid @gray_10;
background-color: @gray_20;
background-image: url(../images/header_overlay.png);
background-position: center;
background-repeat: repeat-x;
margin-bottom: 3px;
}*/
/*################################################################
*
* count
*
################################################################*/
.nextmatch_header .header_count {
position: relative;
top: 1px;
height: 22px;
.dimension_height_m;
border: 1px solid #E0E0E0;
float: right;
margin: 6px 11px 0;
padding: 0 20px;
text-align: center;
.fontsize_normal;
.border_normal;
.rounded (3px);
color: @gray_100;
// count number
span {
.fontsize_normal;
top: 4px;
position: relative;
}
}
/*################################################################
*
@ -592,11 +620,10 @@ button#admin-categories-index_add {
################################################################*/
.nextmatch_header div[id$=favorite_wrapper] {
/* margin-top: 6px;
vertical-align: middle;*/
/*.box_shadow_standard_light;*/
.border_radius_button_normal;
.background_color_25_gray;
z-index: 200;
}
/**
@ -679,13 +706,13 @@ button#admin-categories-index_add {
li.ui-menu-item {
margin-left: 0px;
min-height: 16px;
padding: 5px 0px;
padding: 3px 0px;
// gelb
&:hover{
.color_100_gray;
background-color: @egw_color_1_e;
padding: 0.5em 0;
padding: 3px 0;
}

View File

@ -47,7 +47,7 @@ option:checked {background-color: @egw_color_1_e;}
.ui-widget button {
.basefontfamily;
// font-family: Lucida Grande,Lucida Sans,Arial,sans-serif;
font-size: 1em;
.fontsize_m;
}
.ui-widget-content {
/*.bordered (@color-hint,@color-hint,@color-hint,@color-hint);*/
@ -232,9 +232,22 @@ span.ui-icon-close {margin-top: 0px; top: 5px;}
.ui-menu-item {
padding: 0px;
a {line-height: 26px; padding: 2px 5px;}
a {
line-height: 24px;
margin: 0px;
padding: 2px 5px;
input {padding: 0;}
img {padding: 0;}
}
a.ui-state-focus {
margin: 0px !important;
line-height: 24px;
padding: 2px 5px;
border: none;
}
}
}

View File

@ -49,7 +49,7 @@
line-height: 1;
}
ol, ul {
list-style: none;
/*list-style: none;*/
}
blockquote, q {
quotes: none;
@ -129,7 +129,6 @@ body{
body,
textarea {
.basefontfamily;
}
#egw_fw_basecontainer {
@ -152,12 +151,9 @@ input {
.basefontfamily;
&:hover{.Complete_Button_input_hover;}
&:focus{.Complete_Button_input_focus;}*/
}
select {
/*.Complete_Button_select;*/
padding:3px;
margin: 0;
.rounded (3px);
@ -293,6 +289,12 @@ div.selectbox-wrapper {
}
.sbHolder{
.Complete_Button_select;
// background-color: #2d2d2d;

View File

@ -185,8 +185,6 @@ table.dialog-main-view {width: 100%;}
input.et2_textbox {
font-size: 1.3em;
width: 550px;
margin-right: 20px;
}
@ -281,6 +279,8 @@ tr.dialogHeader4{
.dialogFooterToolbar{
background-color: @color_button_panel_bg_color;
margin: 10px 0 0 0;
padding: 3px;
td {padding: 0px 5px;}

View File

@ -308,7 +308,8 @@
// Button Print
#egw_fw_print {
background-image: url(../images/print.png);
display: none;
/* background-image: url(../images/print.png);
background-size: 16px 16px;
background-position: center center;
background-repeat: no-repeat;
@ -328,7 +329,7 @@
z-index: 200;
&:hover {.box_shadow_standard_light_hover;}
&:active {.Complete_Button_active;}
&:focus {.box_shadow_standard_light_inset;}
&:focus {.box_shadow_standard_light_inset;}*/
}
@ -443,7 +444,7 @@
float: right;
padding: 0.5em;
position: fixed;
right: 80px;
right: 45px;
top: 5px;
background-image: url(../images/add.png);
@ -496,7 +497,7 @@
.box_shadow_standard_light;
padding: 5px;
top: 6px;
right: 115px;
right: 88px;
z-index: 200;
&:hover {.box_shadow_standard_light_hover;}
&:active {.Complete_Button_active;}
@ -915,9 +916,7 @@
.dimension_height_s;
vertical-align: middle;
}
select#calendar_filter{
margin-top: 4px;
}
// Favoriten anlegen und löschen
.sidebox-favorites{} // ist in etemplate2.less definiert

View File

@ -253,6 +253,12 @@ table.egwGridView_grid{
margin-right: 30px;
}
span.high {color: red;}
span.urgent {color: red; background-color: @egw_color_1_e;}
span.low {color: @gray_80;}
table.customfields{
tbody{