WIP aligning nextmatch header and styling it as toolbar

This commit is contained in:
Ralf Becker 2016-02-16 17:18:02 +00:00
parent 521c0f04e8
commit 60d41a7a48
16 changed files with 77 additions and 994 deletions

View File

@ -175,142 +175,11 @@ input.et2_radiobox {
/**
* Give space to both contact view & infolog list
*/
#addressbook-index {
/*height: 99%;*/
}
#addressbook-edit {
height: auto;
min-height: 390px;
overflow: auto;
}
#addressbook-index {
/*#############################################################*/
}
#addressbook-index div.et2_hbox_left {
padding: 0px 17px 0 13px;
}
#addressbook-index div.et2_hbox_left select#addressbook-index_org_view {
/*.box_shadow_standard_light;*/
width: auto;
margin: 5px 0em 5px 0px;
padding: 3px;
outline: none;
display: inline-block;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
cursor: pointer;
height: 24px;
margin-top: 0;
margin-left: 2px;
-webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
}
#addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
}
#addressbook-index div.header_row_right div[id$=favorite_wrapper] {
margin-top: 0px;
top: 6px;
}
#addressbook-index div.et2_hbox_right {
padding: 0px 11px 0px 0px;
width: auto;
margin-right: 0em;
margin-top: -5px;
}
#addressbook-index div.et2_hbox_right select.et2_selectbox {
/*.box_shadow_standard_light;*/
width: auto;
margin: 5px 0em 5px 0px;
padding: 3px;
outline: none;
display: inline-block;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
cursor: pointer;
height: 24px;
margin-left: 5px;
}
#addressbook-index div.et2_hbox_right select.et2_selectbox:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
}
#addressbook-index div.et2_hbox_right select.et2_selectbox:focus {
outline: 0;
border-width: 1px;
border-style: solid;
border-color: #b4b4b4;
-webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
}
#addressbook-index div.et2_hbox_right button#addressbook-index_add,
#addressbook-index div.et2_hbox_right button#addressbook-index_search {
width: 32px;
/*border: 1px solid #0C5DA5;*/
margin: 6px 2px;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
padding: -0.5em;
background-color: #e6e6e6 !important;
background-size: 16px 16px;
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 10px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 10px;
border-radius: 3px;
border-top-left-radius: 10px;
height: 24px;
}
#addressbook-index div.et2_hbox_right button#addressbook-index_add:before,
#addressbook-index div.et2_hbox_right button#addressbook-index_search:before {
content: "";
font-size: 2em;
color: #0c5da5;
line-height: 0.6em;
padding-left: 0.1em;
padding-right: 100em;
}
#addressbook-index div.et2_hbox_right button#addressbook-index_add:active,
#addressbook-index div.et2_hbox_right button#addressbook-index_search:active {
background-color: #1aa200;
}
#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover,
#addressbook-index div.et2_hbox_right button#addressbook-index_search:hover {
background-color: #189800 !important;
color: #ffc200;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 10px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 10px;
border-radius: 3px;
border-top-left-radius: 10px;
}
#addressbook-index div.et2_hbox_right button#addressbook-index_add:active,
#addressbook-index div.et2_hbox_right button#addressbook-index_search:active {
background-color: #1aa200 !important;
}
#addressbook-index div.et2_hbox_right button#addressbook-index_add {
margin-right: 0px;
}
#addressbook-index div.filters select#infolog-index_cat_id {
width: 10%;
margin-left: 1em;
}
#addressbook-index div.filters select#infolog-index_filter {
width: 10%;
}
#addressbook-index div.filters select#infolog-index_filter2 {
width: 10%;
}
/*##################################################################*/
/*Infolog*/
.et2_container[id^="infolog-index-addressbook"] {

View File

@ -91,11 +91,6 @@ div#addressbook_view_sidebox{
* Give space to both contact view & infolog list
*/
#addressbook-index {
/*height: 99%;*/
}
#addressbook-edit {
height: auto;
min-height: 390px;
@ -104,119 +99,6 @@ div#addressbook_view_sidebox{
#addressbook-index{
// min-height: 700px;
// height: auto !important;
// ###########################
// linke Box
// ##########################
div.et2_hbox_left{
padding: 0px 17px 0 13px;
// Org View
select#addressbook-index_org_view{
.Complete_Button_select;
.dimension_height_m;
margin-top: 0;
margin-left: 2px;
.box_shadow_none;
&:hover{
.Complete_Button_select_hover;
}
}
} // linke Box
// ###########################
// rechte Box
// ###########################
// filter
div.header_row_right div[id$=favorite_wrapper] {margin-top: 0px; top: 6px;}
div.et2_hbox_right {
padding: 0px 11px 0px 0px;
width: auto;
margin-right: 0em;
margin-top: -5px;
// Typ
select.et2_selectbox{
.Complete_Button_select;
.dimension_height_m;
margin-left: 5px;
&:hover{.Complete_Button_select_hover;}
&:focus{.Complete_Button_select_focus;}
}
// hinzufügen
button#addressbook-index_add,button#addressbook-index_search{
.Complete_Button_add_only_plus;
.dimension_height_m;
&:hover {.Complete_Button_add_only_plus_hover;}
&:active {background-color: @color_positive_action_active !important;}
}
button#addressbook-index_add {
margin-right: 0px;
}
} // rechte Box
div.filters {
// 1 Filter
select#infolog-index_cat_id {width: 10%; margin-left: 1em;}
// 2 Filter
select#infolog-index_filter {width: 10%;}
// 3 Filter
select#infolog-index_filter2 {width: 10%;}
// Suchfeld
input#infolog-index_search {
}
// Suchen Button
button.et2_button {}
}
// Filter
.filters{
// #addressbook-index_cat_id{width: 7%;}
// #addressbook-index_filter{width:7%;}
// #addressbook-index_filter2{width: 10%;}
}// Filter
/*#############################################################*/
} // iframe
/*##################################################################*/
/*Infolog*/

View File

@ -3,7 +3,7 @@
<!-- $Id$ -->
<overlay>
<template id="admin.index.add" template="" lang="" group="0" version="1.9.001">
<buttononly label="Add" id="add" onclick='app.admin.account({id:"add"})'/>
<buttononly statustext="Add" id="add" onclick='app.admin.account({id:"add"})'/>
</template>
<template id="admin.index.rows" template="" lang="" group="0" version="1.9.001">
<grid width="100%">

View File

@ -2285,6 +2285,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
// Search
this.search_box = jQuery(document.createElement("div"))
.addClass('search')
.prependTo(egwIsMobile()?this.nextmatch.div:this.row_div);
// searchbox widget
this.et2_searchbox = et2_createWidget('searchbox', {id:"search",onchange:function(){

View File

@ -443,7 +443,7 @@ var et2_searchbox = et2_textbox.extend(
this.button = et2_createWidget('button',{image:"search","background_image":"1"},this);
this.button.onclick= function(){
self._show_hide(true);
self.search.input.focus()
self.search.input.focus();
};
this.div.prepend(this.button.getDOMNode());

View File

@ -1110,9 +1110,6 @@ div.message.floating {
font-size: 150%;
text-align: center;
}
.nextmatch_header .search {
padding-left: 1ex;
}
.nextmatch_header_row > select,.nextmatch_header_row > label > select {
max-width: 14%;
margin-right: 2ex;
@ -1580,13 +1577,13 @@ div.ms-sel-ctn .ms-sel-item {
margin: 0 !important;
padding: 0 !important;
}
.et2_toolbar .et2_toolbar_actionlist button.et2_button_with_image {
.et2_toolbar .et2_toolbar_actionlist button.et2_button_with_image, .nextmatch_header_row button.et2_button {
width: 24px;
background-position: center;
background-size: 16px 16px;
border-radius: 3px;
padding-left: 0;
background-color: #f0f0f0;
background-color: #fafafa;
}
.et2_toolbar .et2_toolbar_actionlist button.et2_button_with_image.et2_toolbar_hasCaption {
width:auto;
@ -1598,12 +1595,18 @@ div.ms-sel-ctn .ms-sel-item {
width:auto;
padding-left: 3px;
}
.et2_toolbar button {
margin:1px;
margin-right: 3px;
.et2_toolbar button, .nextmatch_header_row button {
margin: 1px 4px 1px 0;
height: 24px;
}
.et2_toolbar button.toolbar_toggled {
.et2_toolbar select, .nextmatch_header_row select {
height: 24px;
margin: 1px 4px 1px 0;
background-color: #fafafa;
border: 1px solid silver;
border-radius: 3px;
}
.et2_toolbar button.toolbar_toggled, .et2_searchbox button.et2_button.toolbar_toggled {
background-color: white;
box-shadow: inset 1px 1px 1px 1px gray !important;
}
@ -2231,22 +2234,12 @@ td.avatar {
.et2_searchbox {
position: relative;
padding: 0 0 0 0px;
z-index: 100;
z-index: 500;
white-space: nowrap;
}
.et2_searchbox button.et2_button {
height:24px;
background-image: url(images/search.png);
width:35px;
background-repeat: no-repeat;
}
.et2_searchbox button.et2_button.searched {
background-color: white;
box-shadow: inset 1px 1px 1px 1px gray !important;
}
.et2_searchbox input {
position: absolute;
top: 5px;
/* top: 1px; */
height: 18px;
width: 100%;
}
@ -2255,11 +2248,11 @@ td.avatar {
background-position: -95px -126px;
position: absolute;
float: right;
right: 5px;
top: 6px;
right: 3px;
top: 3px;
}
.et2_searchbox .flex {
width:200px;
width: 150px;
position: absolute;
display: inline-block;
}

View File

@ -151,13 +151,6 @@
<row disabled="!@css">
<html id="css" span="all"/>
</row>
<row>
<description align="center" id="msg" no_lang="1" span="all" class="message"/>
</row>
<row disabled="1">
<template id="dates"/>
<template id="header_right"/>
</row>
<row>
<nextmatch id="nm" template="infolog.index.rows" header_left="infolog.index.add" header_right="infolog.index.dates" span="all"/>
</row>

View File

@ -177,96 +177,6 @@ div#infolog-index_infolog-index-dates {
right: 12px;
top: 41px;
}
/* #############################################################################
// iframe
// Rahmen + padding**/
/*############################################
# # #
# # #
# # #
# # #
# # #
# # #
# # #
# # iframge #
# # #
# # #
# # #
# # #
# # #
# # #
##############################################
*/
/*
.egw_fw_content_browser_div{
}*/
#infolog-index {
/*height: auto !important;*/
/* Minimum width for first column */
}
#infolog-index table.et2_grid {
border-top: 0px;
}
#infolog-index .gridCont_0_div_col_0 {
min-width: 45px;
}
#infolog-index #infolog-index_nm {
/*min-height: 900px;*/
/*ID Infolog*/
}
#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix,
#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset {
height: 0px;
}
#infolog-index #infolog-index_nm .nextmatch_header span.header_count {
top: 0px;
}
#infolog-index #infolog-index_nm .nextmatch_header div.filters select#infolog-index_cat_id {
/*width: 10%;*/
margin-left: 1em;
}
#infolog-index #infolog-index_nm .nextmatch_header div.filters select#infolog-index_filter {
max-width: 19%;
}
#infolog-index #infolog-index_nm .nextmatch_header div.filters select#infolog-index_filter2 {
/*width: 10%;*/
}
#infolog-index #infolog-index_nm .nextmatch_header div.filters input#infolog-index_search {
/* .Complete_Button_input;
&:hover{
.Complete_Button_input_hover;
}
&:focus{
.Complete_Button_input_focus;
}*/
}
#infolog-index #infolog-index_nm #infolog-index_favorite_wrapper {
position: relative;
top: 5px;
}
#infolog-index #infolog-index_nm table.egwGridView_outer thead tr th.optcol .selectcols {
margin-top: 1.5%;
}
#infolog-index #infolog-index_nm .frame {
/* min-height: 100%;
height: 60em;*/
}
#infolog-index #infolog-index_nm .egwGridView_scrollarea {
/*height: auto;*/
}
#infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid img {
height: 16px;
}
#infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid ul.et2_link_string li.et2_link {
font-weight: normal;
}
#infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid .infolog_fixedHeight {
height: 16px;
}
#infolog-index #infolog-index_nm span.infolog_infoId {
background-color: inherit;
}
/*###########################################
# #
# dialogHeader #

View File

@ -17,169 +17,6 @@
@import (reference) "../../../pixelegg/less/def_mobile.less";
@import (less) "../default/app.css";
/* #############################################################################
// iframe
// Rahmen + padding**/
/*############################################
# # #
# # #
# # #
# # #
# # #
# # #
# # #
# # iframge #
# # #
# # #
# # #
# # #
# # #
# # #
##############################################
*/
/*
.egw_fw_content_browser_div{
}*/
#infolog-index {
/*height: auto !important;*/
table.et2_grid {border-top: 0px;}
/* Minimum width for first column */
.gridCont_0_div_col_0 {
min-width: 45px;
}
#infolog-index_nm{
/*min-height: 900px;*/
// Header
.nextmatch_header{
div.ui-helper-clearfix,
div.ui-helper-reset{
height: 0px;
}
// Anzahl
span.header_count{top: 0px;}
div.filters {
// 1 Filter
select#infolog-index_cat_id {
/*width: 10%;*/
margin-left: 1em;}
// 2 Filter
select#infolog-index_filter {
max-width: 19%;
}
// 3 Filter
select#infolog-index_filter2 {
/*width: 10%;*/
}
// Suchfeld
input#infolog-index_search {
/* .Complete_Button_input;
&:hover{
.Complete_Button_input_hover;
}
&:focus{
.Complete_Button_input_focus;
}*/
}
// Suchen Button
button.et2_button {}
}
table{}
} //nextmatch_header
// ################################################################
// right Box with add item
// FILTER
#infolog-index_favorite_wrapper{
position: relative;
top: 5px;
}
// ##################################
// Listendarstellung
.egwGridView_outer {}
table.egwGridView_outer thead tr th.optcol .selectcols{
margin-top: 1.5%;
}
.frame {
/* min-height: 100%;
height: 60em;*/
}
.egwGridView_scrollarea{
/*height: auto;*/
// overflow: auto;
table.egwGridView_grid {
img{height: 16px;}
span.et2_link {}
ul.et2_link_string {
li.et2_link {font-weight: normal;}
}
//Date fixed height
.infolog_fixedHeight{.dimension_height_s;}
}
}
/*ID Infolog*/
span.infolog_infoId {background-color: inherit;}
} // #infolog-index_nm
} // iframe
// #############################################################################
// Dialog infolog

View File

@ -573,19 +573,19 @@
* ##################################################################################*/
div.header_row_right div[id$=favorite_wrapper] {
margin-top: 0px;
top: 6px;
}
.et2_nextmatch {
background-color: transparent;
}
.et2_nextmatch .nextmatch_header {
padding: 5px;
padding: 0;
border: none;
background-image: none;
background-color: transparent;
}
.et2_nextmatch .nextmatch_header_row {
padding-bottom: 6px;
width: 100%;
}
.et2_nextmatch > img {
width: 16px;
@ -696,94 +696,6 @@
/*######################################################*/
/*################################################################
*
* Search Field
*
################################################################*/
.nextmatch_header_row > .search {
padding: 0 0 0 0px;
margin-right: 15px;
margin-left: 15px;
width: 200px;
z-index: 100;
white-space: nowrap;
/*.background_color_search;*/
/*.border_radius_button_righttop;*/
}
.nextmatch_header_row > .search input {
/*.background_color_search;*/
/*background-color: @gray_0;*/
font-size: 11px;
color: #000000;
padding: 3px;
width: 150px;
border-color: #696969;
border-right: none;
}
.nextmatch_header_row > .search input::-webkit-input-placeholder {
/* WebKit browsers */
color: #696969;
}
.nextmatch_header_row > .search input:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: #696969;
}
.nextmatch_header_row > .search input::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: #696969;
}
.nextmatch_header_row > .search input:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: #696969;
}
.nextmatch_header_row > .search button.et2_button {
border: 1px solid rgba(0, 0, 0, 0.15);
border-color: #b4b4b4;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
width: 45px;
-webkit-border-radius: 3px;
-webkit-border-top-right-radius: 20px;
-moz-border-radius: 3px;
-moz-border-radius-topright: 20px;
border-radius: 3px;
border-top-right-radius: 20px;
/*cursor: pointer; 14022014 entfernt*/
padding: 0px;
margin: 8px 10px;
margin-left: 0px;
background-image: url("../images/search.png");
background-position: center 0;
background-size: contain;
background-repeat: no-repeat;
text-indent: 110%;
white-space: nowrap;
overflow: hidden;
}
.nextmatch_header_row > .search button.et2_button:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
background-color: #679fd2 !important;
/*hide arrow*/
color: #679fd2 !important;
}
.nextmatch_header_row > .search button.et2_button:active {
/*.background_verlauf_diagonal_gray;*/
background-color: #1aa200 !important;
}
.nextmatch_header_row > .search button.et2_button:focus {
outline: 0;
border-width: 1px;
border-style: solid;
border-color: #b4b4b4;
-webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
/*background-color: @color_positive_action_active !important;*/
}
/*################################################################
*
* Filters
*
################################################################*/
@ -920,13 +832,12 @@
################################################################*/
.nextmatch_header .header_count {
position: relative;
top: 1px;
top: 0;
height: 22px;
height: 24px;
border: 1px solid #E0E0E0;
float: right;
margin: 6px 5px 0 10px;
padding: 0 20px;
padding: 0 10px;
text-align: center;
font-size: 11px;
border: 1px solid rgba(0, 0, 0, 0.15);
@ -4233,7 +4144,7 @@ td.message span.message {
text-decoration: none;
height: 32px;
/*font-size: 1.1em;*/
font-size: 12.1px;
font-size: 12.100000000000001px;
line-height: 1.5em;
}
#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@ -4257,7 +4168,7 @@ td.message span.message {
}
#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
padding-right: 20px;
font-size: 12.1px;
font-size: 12.100000000000001px;
content: " ";
background-image: url(../images/topmenu_items/home.png);
background-repeat: no-repeat;
@ -4655,7 +4566,7 @@ td.message span.message {
padding-left: 3em;
color: #999999;
/*font-size: 12px;*/
font-size: 12.1px;
font-size: 12.100000000000001px;
line-height: 17px;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@ -4826,7 +4737,7 @@ td.message span.message {
margin: 5px 0px 3px 5px;
padding: 0px 0px 0px 15px;
line-height: 1em;
font-size: 12.1px;
font-size: 12.100000000000001px;
background-image: url(../images/arrow_left.png);
background-repeat: no-repeat;
background-position: left center;
@ -5818,7 +5729,7 @@ table.egwGridView_outer thead {
}
table.egwGridView_outer thead tr th {
background-position: -200px;
font-weight: bold;
font-weight: normal;
padding: 3px 0 3px 4px;
border-color: #b4b4b4;
border-left: 0px solid transparent;
@ -5827,8 +5738,7 @@ table.egwGridView_outer thead tr th {
border-bottom: 0px solid transparent;
vertical-align: middle;
overflow: auto;
border-radius: 3px;
border-top-right-radius: 23px;
border-radius: 5px;
}
table.egwGridView_outer thead tr th:hover {
background-color: #bfbfbf;
@ -5864,7 +5774,7 @@ table.egwGridView_outer thead tr th.optcol {
background-color: #ffffff;
}
table.egwGridView_outer thead tr th.optcol:hover {
background-color: #189800;
cursor: pointer;
}
table.egwGridView_outer thead tr th.optcol span.selectcols {
height: 9px;
@ -5875,9 +5785,6 @@ table.egwGridView_outer thead tr th.optcol span.selectcols {
background-size: 10px 10px;
display: inline-block;
}
table.egwGridView_outer thead tr th.optcol span.selectcols:hover {
background-color: #189800;
}
table.egwGridView_outer > tbody > tr {
/*Elements inside td*/
}

View File

@ -515,7 +515,7 @@ hr {
div.header_row_right{
//favoriten
div[id$=favorite_wrapper]{margin-top: 0px; top: 6px;}
div[id$=favorite_wrapper]{margin-top: 0px;}
}
@ -527,17 +527,17 @@ div.header_row_right{
// complete nextmatch....Background color!
.et2_nextmatch .nextmatch_header {
padding: 5px;
padding: 0;
border: none;
background-image: none;
background-color: transparent;
}
// complete nextmatch....Background color!
.et2_nextmatch .nextmatch_header_row {
.et2_nextmatch .nextmatch_header_row
{
padding-bottom: 6px;
width: 100%;
}
@ -627,96 +627,6 @@ div.header_row_right{
/*################################################################
*
* Search Field
*
################################################################*/
.nextmatch_header_row > .search{
padding: 0 0 0 0px;
margin-right: 15px;
margin-left: 15px;
width: 200px;
z-index: 100;
white-space: nowrap;
/*.background_color_search;*/
/*.border_radius_button_righttop;*/
input {
/*.background_color_search;*/
/*background-color: @gray_0;*/
.fontsize_normal;
color: @gray_100;
padding: 3px;
width: 150px;
border-color:@gray_60;
border-right: none;
}
input::-webkit-input-placeholder {
/* WebKit browsers */
color: @gray_60;
}
input:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: @gray_60;
}
input::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: @gray_60;
}
input:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: @gray_60;
}
// SEARCH BUTTON
button.et2_button {
.border_normal;
border-color: @gray_30;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
width: 45px;
.border_radius_button_righttop;
/*cursor: pointer; 14022014 entfernt*/
padding: 0px;
margin: 8px 10px;
margin-left: 0px;
background-image: url("../images/search.png");
background-position: center 0;
background-size: contain;
background-repeat: no-repeat;
text-indent: 110%;
white-space: nowrap;
overflow: hidden;
&:hover{
.box_shadow_standard_light_hover;
background-color: @egw_color_2_e !important;
/*hide arrow*/
color: @egw_color_2_e !important;
}
&:active {
/*.background_verlauf_diagonal_gray;*/
background-color: @color_positive_action_active !important;
}
&:focus {
.Complete_Button_input_focus;
/*background-color: @color_positive_action_active !important;*/
}
}
}
/*################################################################
*
* Filters
@ -831,13 +741,12 @@ div.header_row_right{
.nextmatch_header .header_count {
position: relative;
top: 1px;
top: 0;
height: 22px;
.dimension_height_m;
border: 1px solid #E0E0E0;
float: right;
margin: 6px 5px 0 10px;
padding: 0 20px;
padding: 0 10px;
text-align: center;
.fontsize_normal;

View File

@ -83,7 +83,7 @@ table.egwGridView_outer{
background-position: -200px;
font-weight: bold;
font-weight: normal;
padding: 3px 0 3px 4px;
border-color: @gray_30;
border-left: 0px solid transparent;
@ -93,8 +93,7 @@ table.egwGridView_outer{
vertical-align: middle;
overflow: auto;
border-radius:3px;
border-top-right-radius: 23px;
border-radius:5px;
&:hover {
.background_color_25_gray;
@ -129,7 +128,7 @@ table.egwGridView_outer{
vertical-align: bottom;
.background_color_0_gray;
&:hover{
background-color: @color_hint;
cursor: pointer;
}
span.selectcols {
@ -140,13 +139,6 @@ table.egwGridView_outer{
background-repeat: no-repeat;
background-size: 10px 10px;
display: inline-block;
&:hover{
background-color: @color_hint;
}
}
}
}

View File

@ -864,8 +864,6 @@ class timesheet_ui extends timesheet_bo
'options-filter2' => array('No details','Details'),
'order' => 'ts_start',// IO name of the column to sort after (optional for the sortheaders)
'sort' => 'DESC',// IO direction of the sort: 'ASC' or 'DESC'
'header_left' => 'timesheet.index.dates',
'header_row' => 'timesheet.index.add',
'filter_onchange' => "app.timesheet.filter_change();",
'filter2_onchange' => "app.timesheet.filter2_change();",
'filter2' => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],

View File

@ -11,7 +11,7 @@
</hbox>
</template>
<template id="timesheet.index.add" template="" lang="" group="0" version="1.7.001">
<buttononly label="Add" id="add" onclick="egw.open('timesheet');"/>
<buttononly statustext="Add" id="add" onclick="egw.open('timesheet');"/>
</template>
<template id="timesheet.index.rows" template="" lang="" group="0" version="1.9.001">
<grid width="100%">
@ -96,6 +96,6 @@
</grid>
</template>
<template id="timesheet.index" template="" lang="" group="0" version="1.9.001">
<nextmatch id="nm" options="timesheet.index.rows" header_left="timesheet.index.dates"/>
<nextmatch id="nm" options="timesheet.index.rows" header_left="timesheet.index.add" header_right="timesheet.index.dates"/>
</template>
</overlay>

View File

@ -43,116 +43,6 @@ tr.dialogOperators td,
display: inline-block;
float: left;
}
#timesheet-index {
/*Details Bold*/
}
#timesheet-index div.et2_dropdown {
top: 0px;
}
#timesheet-index .nextmatch_header div.ui-helper-clearfix,
#timesheet-index .nextmatch_header div.ui-helper-reset {
height: 0px;
}
#timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right,
#timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right {
padding: 0 0em;
margin-right: 0em;
}
#timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget,
#timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget {
color: #FFF;
text-shadow: none;
height: 24px;
/* height: auto;*/
background-image: none;
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 10px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 10px;
border-radius: 3px;
border-top-left-radius: 10px;
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
height: 35px;
}
#timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:before,
#timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget:before {
content: "+";
font-size: 1.5em;
color: #ffc200;
line-height: 1.1em;
}
#timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget .infolog_headertext,
#timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget .infolog_headertext {
color: #FFF !important;
}
#timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:hover,
#timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add {
width: 32px;
/*border: 1px solid #0C5DA5;*/
margin: 6px 2px;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
padding: -0.5em;
background-color: #e6e6e6 !important;
background-size: 16px 16px;
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 10px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 10px;
border-radius: 3px;
border-top-left-radius: 10px;
height: 24px;
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:before {
content: "";
font-size: 2em;
color: #0c5da5;
line-height: 0.6em;
padding-left: 0.1em;
padding-right: 100em;
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:active {
background-color: #1aa200;
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:hover {
background-color: #189800 !important;
color: #ffc200;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 10px;
-moz-border-radius: 3px;
-moz-border-radius-topleft: 10px;
border-radius: 3px;
border-top-left-radius: 10px;
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:active {
background-color: #1aa200 !important;
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button[id*="timesheet-index_favorite"] img {
height: 16px;
width: 16px;
}
#timesheet-index .nextmatch_header span.header_count {
margin: 3px 4px 0 6px;
}
#timesheet-index div#timesheet-index_favorite_wrapper {
top: -5px;
right: 6px;
}
#timesheet-index table.egwGridView_outer tbody td .et2_link {
font-weight: bold;
}
#timesheet-index span.timesheet_titleDetails {
font-weight: bold;
}
/*###########################################
# #
# dialogHeader #

View File

@ -17,104 +17,6 @@
@import (reference) "../../../pixelegg/less/def_mobile.less";
@import (less) "../default/app.css";
// iframe
#timesheet-index {
// Favoriten
div.et2_dropdown {
top: 0px;
}
.nextmatch_header{
div.ui-helper-clearfix,
div.ui-helper-reset{
height: 0px;
// rechte Box mit add
div.et2_hbox_right{
padding: 0 0em;
margin-right: 0em;
div.et2_box_widget{
.Complete_Button_add;
// .Complete_Button_text;
.border_radius_button_lefttop;
.box_shadow_standard_light;
height: 35px;
.infolog_headertext{color: #FFF !important;}
&:hover {.box_shadow_standard_light_hover;}
}
}
}
// rechte Box
#timesheet-index_timesheet-index-add{
button#timesheet-index_add{
.Complete_Button_add_only_plus;
.dimension_height_m;
&:hover {.Complete_Button_add_only_plus_hover;}
&:active {background-color: @color_positive_action_active !important;}
}
// Filter
div.filters{
// 1. Filter
#timesheet-index_filter{}
// 2. Filter
#timesheet-index_filter2{}
// Suchfeld
#timesheet-index_search{}
// Suchen Button
button{}
} // Ende Filter
table{}
button[id*="timesheet-index_favorite"]{
img {
height: 16px;
width: 16px;
}
}
} //nextmatch_header
// Anzahl / positionieren
span.header_count{
margin: 3px 4px 0 6px;
}
}
// Filter position
div#timesheet-index_favorite_wrapper{top: -5px; right: 6px;}
// Titel: in Bold
table.egwGridView_outer tbody td .et2_link {font-weight: bold;}
/*Details Bold*/
span.timesheet_titleDetails {font-weight: bold;}
// iframe
}
/*###########################################
# #
# dialogHeader #