extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pixelegg changes from Thursday

Browse Source
This commit is contained in:
Ralf Becker 2013-12-12 20:27:35 +00:00
parent ffcc62e274
commit 1c7887ca6a
13 changed files with 1159 additions and 756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,7 @@
</template>
<template id="addressbook.edit.links" template="" lang="" group="0" version="1.9.001">
<grid width="100%" height="286" overflow="auto">
<grid width="100%" overflow="auto">
<columns>
<column/>
</columns>
@ -565,7 +565,7 @@
<grid>
<columns>
<column width="20"/>
<column width="120"/>
<column width="90"/>
<column/>
<column/>
</columns>
@ -608,7 +608,7 @@
<grid>
<columns>
<column width="20"/>
<column width="120"/>
<column width="90"/>
<column/>
</columns>
<rows>
@ -653,4 +653,4 @@
</rows>
</grid>
</template>
</overlay>
</overlay>

6
addressbook/templates/default/index.cat_add.xet
View File

@ -18,9 +18,9 @@
</row>
<row>
<hbox span="all">
<button label="add" id="cat_add"/>
<button label="delete" id="cat_delete"/>
<button label="cancel" id="cat_cancel" onclick="window.close();"/>
<button label="add" id="cat_add"/ image="add" background_image="1">
<button label="delete" id="cat_delete" image="delete" background_image="1"/>
<button label="cancel" id="cat_cancel" onclick="window.close();" image="cancel" background_image="1"/>
</hbox>
</row>
</rows>

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

File diff suppressed because it is too large Load Diff

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

@ -1,5 +1,7 @@
/**
* EGroupware: CSS with less preprocessor
* ADDRESSBOOK
*
* Please do NOT change app.css directly, instead change app.less and compile it!
*
@ -13,6 +15,11 @@
@import (reference) "../../../pixelegg/less/def_buttons.less";
@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
@import (less) "../default/app.css";
@media all {
/* #############################################################################
// iframe
// Rahmen + padding**/
@ -47,6 +54,7 @@
#addressbook-edit {
height: auto;
min-height: 390px;
overflow: auto;
}
@ -60,7 +68,7 @@ div#addressbook-index{
// ##########################
div.et2_hbox_left{
padding: 1em;
padding: 4px 0px;
// Org View
select#addressbook-index_org_view{
.Complete_Button_select;
@ -173,14 +181,15 @@ div#addressbook-index{
.et2_container[id^="infolog-index-addressbook"] {
height: auto;
min-height: 250px;
/*height: auto;*/
padding: 1em;
/*min-height: 250px;*/
/*ADD*/
/* div.et2_hbox,
div.et2_box_widget*/
.et2_hbox_right[id*="_infolog-index-header_right"]{
.Complete_Button_add;
height: auto;
/*height: auto;*/
.color-0-gray; // white
font-size: 0.9em;
@ -298,6 +307,7 @@ td.addressbook_edit_right_td {
.egw_fw_ui_tab_content #addressbook-edit .et2_tabs {
max-height: 25em;
height: 296px;
}
/* popup window */
@ -485,16 +495,16 @@ div#addressbook-search{
.fixedHeight, .telNumbers {
height: auto;
}
.telNumbers {
white-space: nowrap;
}
td.telNumbers{
input {width: 90%; }
table.et2_grid td.telNumbers{
width: 155px;
input { width: 140px !important; }
}
// Radio Box
input.et2_radiobox {};
}
@ -517,19 +527,48 @@ div#addressbook-search{
.background-color-15-gray;
.border_radius_button_normal;
legend { text-transform: uppercase;}
a.et2_url:after {
content: "\221E";
font-size: 1.5em;
}
a.et2_url {margin-left: -40px;}
a.et2_url.url {background-size: 15px 15px; background-image: none;}
table.et2_grid {margin-left: -7px;}
td {
input {width: 90%;}
input {width: 82%;}
// image after Link
a.et2_url {
margin-left: 5px;
&:hover {.Complete_Button_Icon_hover;}
}
/* a.et2_url:after {
content: "\221E";
font-size: 1.2em;
}*/
a.et2_url.url {
.Complete_Button_Icon_normal;
background-size: 16px 16px;
background-image: url('images/url.png');
}
a.et2_url.email {
.Complete_Button_Icon_normal;
background-size: 16px 16px;
background-image: url('images/email.png');
}
}
}
fieldset.emailGroup * img {display: none !important; width: 20px;} // Bilder ausblenden
@ -618,15 +657,56 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
tbody{
display: table-header-group;
vertical-align: top;
}
tr:first {
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;}
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;}
}
@ -643,6 +723,9 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
display: table-header-group;
vertical-align: top;
}
}
/*################## Tab 7 Extra ###############################*/
/*seems to be ok*/
@ -713,7 +796,7 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
button.button_more {
.Complete_Button_text_icon_before;
background-image:url('../images/bearbeiten.png');
background-image:url('../images/edit.png');
}
@ -855,5 +938,23 @@ table.uploadphoto {width: 360px !important; background-color: @gray-20 !importan
} // Ende Media all
// Ende Addressbuch
/*#################################### Media Queries #####################################################*/
@media only screen and (min-width: 980px) and (max-width: 1279px) {
.nextmatch_header > .filters select { margin: 0px;}
}
@media only screen and (min-width: 760px) and (max-width: 979px) {
}
@media only screen and (min-width: 320px) and (max-width: 759px) {
}
//

BIN
addressbook/templates/pixelegg/images/url.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

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

@ -48,6 +48,10 @@ img.sideboxstar:hover {
height: 16px;
width: 16px;
}
.calendar_calEventBodySmall img {
height: 16px;
width: 16px;
}
/* calender view*/
/*defind in layout_raster.less , because frame*/
span#start {

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

@ -59,7 +59,9 @@ img.sideboxstar {
// Images
.calendar_calDayColHeader img {height: 16px; width: 16px;}
.calendar_calDayColHeader img {height: 16px; width: 16px;}
.calendar_calEventBodySmall img {height: 16px; width: 16px;}

2
etemplate/templates/default/nextmatch_widget.xet
View File

@ -31,7 +31,7 @@
<menupopup align="center" statustext="@filter2_help" label="@filter2_label" id="filter2" onchange="@filter2_onchange"/>
</menulist>
<textbox align="right" blur="Search" statustext="a pattern to be searched for" id="search" onchange="1" size="12" validator=",search"/>
<button statustext="to start the search" label="&gt;" id="start_search"/>
<button statustext="to start the search" label="&gt;" id="start_search stefan"/>
<menulist class="nm_num_rows">
<menupopup statustext="How many entries should the list show" id="num_rows" no_lang="1" onchange="1"/>
</menulist>

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

@ -1,5 +1,7 @@
/**
* EGroupware: CSS with less preprocessor
* FILEMANAGER
*
* Please do NOT change app.css directly, instead change app.less and compile it!
*
@ -9,12 +11,143 @@
* @package filemanager
* @version $Id$
*/
/**
* EGroupware - CSS Styles used by filemanager app
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package etemplate
* @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de>
* @version $Id$
*/
/**
* CSS for new eTemplate filemanager UI
*/
.mimeHuge img {
width: 64px;
height: 64px;
}
.fileName input {
font-weight: bold;
width: 100%;
}
.comment textarea {
width: 100%;
height: 35px;
}
.previewImage img {
max-width: 430px;
max-height: 275px;
border: 1px solid black;
}
.pathSelection {
font-weight: bold;
}
.pathSelection a {
font-weight: bold;
font-size: 120%;
}
.pathSelectionContainer {
width: 640px;
overflow: auto;
}
/**
* Get path input to take all remaining width
*/
#filemanager-index_filemanager-index-header_left {
width: 100%;
}
div.filemanager_navigation {
position: relative;
width: 100%;
}
div.filemanager_navigation > * {
vertical-align: middle;
}
#filemanager-index_buttons {
float: right;
}
#filemanager-index_buttons > * {
vertical-align: middle;
padding-left: 3px;
}
div.filemanager_navigation > label {
position: absolute;
left: 50px;
right: 560px;
padding-top: 3px;
font-size: 140%;
}
div.filemanager_navigation > label > input {
width: 100%;
}
/**
* Select file dialog
*/
.selectPath {
font-weight: bold;
width: 98%;
}
.selectPathContainer {
width: 470px;
overflow: auto;
}
.selectName input {
width: 100%;
}
.selectMime select {
width: 100%;
}
.displayNone input,
input.displayNone {
display: none;
}
.selectFiles td div {
border-style: groove;
}
.selectFiles div {
max-height: 400px;
overflow: auto;
}
/*/*****************************************************************
// sidebar
*/
/*//******************************************************************
// iframe*/
div.filemanager_navigation {
position: relative;
width: 100%;
}
div.filemanager_navigation img {
width: 24px;
height: 24px;
}
div.filemanager_navigation > label {
float: left;
/*position: absolute;*/
left: 55px;
right: 625px;
/*padding-top: 3px;*/
font-size: 140%;
top: -9px;
}
/*Buttons / Tarp / FileUpload*/
#filemanager-index_buttons {
float: right;
left: 0px;
right: 30%;
position: relative;
top: -26px;
}
#filemanager-index_buttons > * {
padding-left: 3px;
vertical-align: middle;
margin-right: 0.2em;
}
div.filemanager_navigation > label > input {
width: 100%;
}
#filemanager-index .et2_file {
background-color: #0b5fa4 !important;
color: #FFF;
@ -34,6 +167,7 @@
content: "+";
font-size: 1.5em;
color: #ffc200;
line-height: 1.1em;
}
#filemanager-index .et2_file:before {
font-size: 1em;
@ -60,10 +194,31 @@
}
/*// Dialog filemanager
// #####################################################*/
#filemanager-select {
padding: 0px 8px 0 0;
}
#filemanager-select .dialog-header .et2_button_icon {
margin: 4px 4px 0 4px;
border-top: solid 1px #ffffff;
border-left: solid 1px #ffffff;
border-right: solid 1px #ffffff;
border-bottom: solid 1px #ffffff;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
background-color: #ffffff;
height: auto;
width: 24px;
}
#filemanager-select .dialog-header .selectPathContainer {
overflow: auto;
width: 470px;
margin-top: 0px;
height: 32px;
}
#filemanager-select .dialog-header .selectPathContainer input {
height: 20px;
}
#filemanager-select #filemanager-select_apps {
background-color: #d9d9d9;
}
@ -72,6 +227,16 @@
width: 24px;
padding: 10px;
}
#filemanager-select #filemanager-select_dir {
#filemanager-select table#filemanager-select_dir {
border: 1px solid rgba(0, 0, 0, 0.15);
}
#filemanager-select table#filemanager-select_dir tr:nth-child(even) {
background: #e6e6e6;
}
#filemanager-select table#filemanager-select_dir tr:nth-child(odd) {
background: #cdcdcd;
}
#filemanager-select .vfsMimeIcon {
width: 16px;
height: 16px;
}

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

Binary file not shown.

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

@ -254,4 +254,14 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
input#infolog-edit_info_subject {
width: 98% !important;
}
/*#############################################*/
/*Tabs */
/*Beschreibung*/
/*Verknüpfung*/
/*Delegation*/
/*Projektmanager*/
#infolog-edit_infolog-edit-project .et2_link_entry.no_app input.ui-autocomplete-input {
width: auto;
}
/*Historie*/
/**/

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

@ -309,5 +309,24 @@ input#infolog-edit_info_subject {width: 98% !important;}
/*#############################################*/
/*Tabs */
/*Beschreibung*/
/*Verknüpfung*/
/*Delegation*/
/*Projektmanager*/
#infolog-edit_infolog-edit-project{
.et2_link_entry.no_app input.ui-autocomplete-input {
width: auto;
}
}
/*Historie*/
/**/// Ende der APP INfolo

6
preferences/templates/default/settings.xet
View File

@ -36,8 +36,8 @@
<template id="preferences.settings.tab1" content="tab1"/>
</tabpanels>
</tabbox>
<button label="Save" id="button[save]"/>
<button label="Apply" id="button[apply]"/>
<button label="Cancel" id="button[cancel]"/>
<button label="Save" id="button[save]" image="save" background_image="1"/>
<button label="Apply" id="button[apply]" image="apply" background_image="1"/>
<button label="Cancel" id="button[cancel]" image="cancel" background_image="1"/>
</template>
</overlay>