diff --git a/pixelegg/content-element-library/addressbook_dialog_edit.html b/pixelegg/content-element-library/addressbook_dialog_edit.html index e0d15cc9e3..61d9366de8 100755 --- a/pixelegg/content-element-library/addressbook_dialog_edit.html +++ b/pixelegg/content-element-library/addressbook_dialog_edit.html @@ -45,7 +45,7 @@ Author: Stefan Reinhardt (c) pixelegg
ADDRESSBOOK DIALOG EDIT
-
GeneralPrivatDetailsVerknüpfungenVerteilerlistenExtraExtra PrivatHistory
Name
Organisation
Region
Adressbuch
Edit Phonenumbers -
BeschreibungNummerbevorzugt
Phone Numbers
Telefax
Email & Internet
diff --git a/pixelegg/content-element-library/addressbook_dialog_new.html b/pixelegg/content-element-library/addressbook_dialog_new.html index f026ecd45a..0f25f5838b 100755 --- a/pixelegg/content-element-library/addressbook_dialog_new.html +++ b/pixelegg/content-element-library/addressbook_dialog_new.html @@ -44,7 +44,7 @@ Author: Stefan Reinhardt (c) pixelegg
ADDRESSBOOK DIALOG NEW
-
GeneralPrivatDetailsVerknüpfungenExtraExtra Privat
Name
Organisation
Region
Adressbuch
Edit Phonenumbers -
BeschreibungNummerbevorzugt
Phone Numbers
Telefax
Email & Internet
diff --git a/pixelegg/content-element-library/addressbook_display.html b/pixelegg/content-element-library/addressbook_display.html index 7de5478932..1cafc88df1 100755 --- a/pixelegg/content-element-library/addressbook_display.html +++ b/pixelegg/content-element-library/addressbook_display.html @@ -46,7 +46,7 @@ Author: Stefan Reinhardt (c) pixelegg
-
GeneralPrivatDetailsVerknüpfungenVerteilerlistenExtraExtra PrivatHistory
Name
Organisation
Region
Adressbuch
  • Gruppe pixelegg_Bestandskunden
    • +
  • Gruppe Interessante_Unternehmen
    • 1249
    • #22
    • Reinhardt, Stefan
    $row_cont[type_label]
    Hornbach Baumarkt AGSchinke, MichaelTrainingMultimedia - eLearningeLearning Designer
    • DEUTSCHLAND
      • Bornheim76878
      Hornbachstrasse
      06348602640
      michael.schinke@hornbach.com
    • Gruppe Interessante_Unternehmen
      • 866
      • Reinhardt, Stefan
      • Reinhardt, Stefan
      Benutzerkonten
      Renner, Antonia
        antoniaR@addressdoctor.com
      • Benutzerkonten
        • 2159
        • admin, admin
        • admin, admin
        diff --git a/pixelegg/content-element-library/cal_edit_new.html b/pixelegg/content-element-library/cal_edit_new.html index 0b8a8e8332..5c8730bc1e 100755 --- a/pixelegg/content-element-library/cal_edit_new.html +++ b/pixelegg/content-element-library/cal_edit_new.html @@ -48,7 +48,7 @@ Author: Stefan Reinhardt (c) pixelegg
        CALENDAR EDIT NEW DAY
        -
        Titel
        GeneralBeschreibungTeilnehmerWiederholungVerknüpfungenAlarmeHistorie
        +-> an Produktion übergeben">Sales-C-AUFTRAG ♦
        • Optionen
        Besitzer
        • pxe, pxe
        Actions...
        diff --git a/pixelegg/content-element-library/infolog_dialog_edit.html b/pixelegg/content-element-library/infolog_dialog_edit.html index 9c29fcc1bc..1ebc41456d 100755 --- a/pixelegg/content-element-library/infolog_dialog_edit.html +++ b/pixelegg/content-element-library/infolog_dialog_edit.html @@ -45,7 +45,7 @@ Author: Stefan Reinhardt (c) pixelegg
        INFOLOG EDIT - PopUp Dialog
        -
        Elterneintrag
        BeschreibungVerknüpfungenDelegationProjektmanagerHistorie
        Besitzer
        • Reinhardt, Stefan
        		zuletzt geändert
        • Reinhardt, Stefan
        +-> an Produktion übergeben">Sales-C-AUFTRAG ♦        		Elterneintrag
        BeschreibungVerknüpfungenDelegationProjektmanagerHistorie
        Besitzer
        • Reinhardt, Stefan
        		zuletzt geändert
        • Reinhardt, Stefan
        diff --git a/pixelegg/content-element-library/infolog_dialog_import_export.html b/pixelegg/content-element-library/infolog_dialog_import_export.html index c6d3f5abee..0e364fc046 100755 --- a/pixelegg/content-element-library/infolog_dialog_import_export.html +++ b/pixelegg/content-element-library/infolog_dialog_import_export.html @@ -77,7 +77,7 @@ Verkauf Angebote ">Sales-B-ANGEBOT ♦
        Priority
        Owner
          Modifier
            Status
            Date completedcreationLast changedStart dateDue dateResponsible
              pricelist
              +-> an Produktion übergeben">Sales-C-AUFTRAG ♦
              Priority
              Owner
                Modifier
                  Status
                  Date completedcreationLast changedStart dateDue dateResponsible
                    pricelist
                    diff --git a/pixelegg/content-element-library/infolog_dialog_new.html b/pixelegg/content-element-library/infolog_dialog_new.html index 1710835fd2..44b3a4eee4 100755 --- a/pixelegg/content-element-library/infolog_dialog_new.html +++ b/pixelegg/content-element-library/infolog_dialog_new.html @@ -49,7 +49,7 @@ Author: Stefan Reinhardt (c) pixelegg
                    -
                    Elterneintrag
                    BeschreibungVerknüpfungenDelegationProjektmanagerHistorie
                    Besitzer
                    • Reinhardt, Melanie
                    		zuletzt geändert
                    • Reinhardt, Stefan
                    +-> an Produktion übergeben">Sales-C-AUFTRAG ♦                    		Elterneintrag
                    BeschreibungVerknüpfungenDelegationProjektmanagerHistorie
                    Besitzer
                    • Reinhardt, Melanie
                    		zuletzt geändert
                    • Reinhardt, Stefan
                    diff --git a/pixelegg/content-element-library/mail_dialog_new_account.html b/pixelegg/content-element-library/mail_dialog_new_account.html index 910561348f..f1f0830252 100755 --- a/pixelegg/content-element-library/mail_dialog_new_account.html +++ b/pixelegg/content-element-library/mail_dialog_new_account.html @@ -51,7 +51,7 @@ Author: Stefan Reinhardt (c) pixelegg
                    -
                    Step 1: IMAP - incoming mail
                    E-Mail-Adresse
                    +
                    Step 1: IMAP - incoming mail
                    E-Mail-Adresse
                    diff --git a/pixelegg/content-element-library/res_dialog_add.html b/pixelegg/content-element-library/res_dialog_add.html index 9609b3d391..d7c60d164a 100755 --- a/pixelegg/content-element-library/res_dialog_add.html +++ b/pixelegg/content-element-library/res_dialog_add.html @@ -51,7 +51,7 @@ Author: Stefan Reinhardt (c) pixelegg
                    -
                    GenerellBeschreibungBildVerknüpfungenHistory
                    KurzbeschreibungKurzbeschreibung der Ressource
                    LagerortWo findet man diese Ressource?
                    Informationen zur LagerungInformationen zur Lagerung
                    StückzahlStückzahl der Ressource
                    NutzbarStückzahl der nutzbaren Ressourcen
                    buchbarIst diese Ressource buchbar?
                    Zubehör von
                    +
                    GenerellBeschreibungBildVerknüpfungenHistory
                    KurzbeschreibungKurzbeschreibung der Ressource
                    LagerortWo findet man diese Ressource?
                    Informationen zur LagerungInformationen zur Lagerung
                    StückzahlStückzahl der Ressource
                    NutzbarStückzahl der nutzbaren Ressourcen
                    buchbarIst diese Ressource buchbar?
                    Zubehör von
                    diff --git a/pixelegg/description.txt b/pixelegg/description.txt index dd987c15b7..bbb354b99a 100755 --- a/pixelegg/description.txt +++ b/pixelegg/description.txt @@ -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 # diff --git a/pixelegg/images/bgDialog.png b/pixelegg/images/bgDialog.png new file mode 100644 index 0000000000..53ba7c7744 Binary files /dev/null and b/pixelegg/images/bgDialog.png differ diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index 8764811376..281fc684c1 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -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 diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 6ee5601615..9eda26ed15 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -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,23 +533,51 @@ 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; + } } + + + /*################################################################ * * Kategorien @@ -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; } diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less index 64a7af9343..10f6c31271 100755 --- a/pixelegg/less/jquery-ui.less +++ b/pixelegg/less/jquery-ui.less @@ -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; + } } } diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index 78fd45858c..f3838dbdbf 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -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; diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index bacb059c9f..9015effba0 100755 --- a/pixelegg/less/layout_dialog.less +++ b/pixelegg/less/layout_dialog.less @@ -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;} diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 24f1ac59c5..18001e46ed 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -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 diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index 4e2ea0645d..4762a4e2bc 100755 --- a/pixelegg/less/layout_table.less +++ b/pixelegg/less/layout_table.less @@ -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{