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

cleaning up template and css

Browse Source
This commit is contained in:
Ralf Becker 2015-02-04 10:30:59 +00:00
parent 2554c30da7
commit c1abc8e603
5 changed files with 50 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -312,12 +312,15 @@ class addressbook_ui extends addressbook_bo
if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0]; if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0];
if (count($this->content_types) > 1) if (count($this->content_types) > 1)
{ {
$content['nm']['header_right'] = 'addressbook.index.right_addplus';
foreach($this->content_types as $tid => $data) foreach($this->content_types as $tid => $data)
{ {
$sel_options['tid'][$tid] = $data['name']; $sel_options['tid'][$tid] = $data['name'];
} }
} }
else
{
$this->tmpl->disableElement('col_filter[tid]');
}
// get the availible org-views plus the label of the contacts view of one org // get the availible org-views plus the label of the contacts view of one org
$sel_options['org_view'] = $this->org_views; $sel_options['org_view'] = $this->org_views;
if (isset($org_view)) $content['nm']['org_view'] = $org_view; if (isset($org_view)) $content['nm']['org_view'] = $org_view;
@ -924,7 +927,7 @@ window.egw_LAB.wait(function() {
$list['list_name'] = $new_name; $list['list_name'] = $new_name;
$new_id = $this->add_list(array('list_id' => (int)$list_id), $list['list_owner'],array(),$list); $new_id = $this->add_list(array('list_id' => (int)$list_id), $list['list_owner'],array(),$list);
egw_json_response::get()->apply('egw.message', array( egw_json_response::get()->apply('egw.message', array(
$new_id == $list_id ? lang('Distribution list renamed') : lang('List created'), $new_id == $list_id ? lang('Distribution list renamed') : lang('List created'),
'success' 'success'
@ -1043,7 +1046,7 @@ window.egw_LAB.wait(function() {
egw_session::appsession($session_name,'addressbook',$query); egw_session::appsession($session_name,'addressbook',$query);
} }
return false; return false;
case 'document': case 'document':
if (!$document) $document = $this->prefs['default_document']; if (!$document) $document = $this->prefs['default_document'];
$document_merge = new addressbook_merge(); $document_merge = new addressbook_merge();
@ -1745,7 +1748,7 @@ window.egw_LAB.wait(function() {
{ {
$icon = common::image('addressbook',$this->content_types[$tid]['name']); $icon = common::image('addressbook',$this->content_types[$tid]['name']);
} }
// Legacy - from when icons could be anywhere // Legacy - from when icons could be anywhere
if ($tid != 'n' && $this->content_types[$tid]['options']['icon']) if ($tid != 'n' && $this->content_types[$tid]['options']['icon'])
{ {

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

@ -89,8 +89,9 @@ input.et2_radiobox {
width: 100%; width: 100%;
height: auto; height: auto;
} }
#addressbook-index_org_view { #addressbook-index_org_view, #addressbook-index_addressbook-index-right_add > div.et2_box_widget {
margin: 5px; top: 0;
padding-top: 0;
} }
#addressbook-edit_room { #addressbook-edit_room {
float:right; float:right;

27
addressbook/templates/default/index.xet
View File

@ -8,29 +8,12 @@
</template> </template>
<template id="addressbook.index.right_add" template="" lang="" group="0" version="1.7.001"> <template id="addressbook.index.right_add" template="" lang="" group="0" version="1.7.001">
<hbox> <hbox>
<buttononly label="Advanced search" id="search" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/> <menulist>
<buttononly statustext="Add a new contact" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/> <menupopup align="right" label="Type" id="col_filter[tid]" options="All"/>
</menulist>
<buttononly align="right" label="Advanced search" image="advanced-search" background_image="1" id="search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'850','440','_blank','addressbook',null,true); return false;"/>
<buttononly align="right" statustext="Add a new contact" label="Add" id="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
</hbox> </hbox>
<styles>.rightPadAdd { width: 30px; }</styles>
</template>
<template id="addressbook.index.right_addplus" template="" lang="" group="0" version="1.9.001">
<grid>
<columns>
<column/>
<column/>
<column/>
</columns>
<rows>
<row>
<menulist>
<menupopup align="right" label="Type" id="col_filter[tid]" options="All"/>
</menulist>
<buttononly align="right" label="Advanced search" id="search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'850','440','_blank','addressbook',null,true); return false;"/>
<buttononly align="right" statustext="Add a new contact" label="Add" id="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
</row>
</rows>
</grid>
<styles>.rightPadAdd { width: 30px; }</styles>
</template> </template>
<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005"> <template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
<grid width="100%"> <grid width="100%">

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

@ -107,8 +107,10 @@ input.et2_radiobox {
width: 100%; width: 100%;
height: auto; height: auto;
} }
#addressbook-index_org_view { #addressbook-index_org_view,
margin: 5px; #addressbook-index_addressbook-index-right_add > div.et2_box_widget {
top: 0;
padding-top: 0;
} }
#addressbook-edit_room { #addressbook-edit_room {
float: right; float: right;
@ -171,13 +173,13 @@ input.et2_radiobox {
min-height: 390px; min-height: 390px;
overflow: auto; overflow: auto;
} }
div#addressbook-index { #addressbook-index {
/*#############################################################*/ /*#############################################################*/
} }
div#addressbook-index div.et2_hbox_left { #addressbook-index div.et2_hbox_left {
padding: 0px 17px 0 13px; padding: 0px 17px 0 13px;
} }
div#addressbook-index div.et2_hbox_left select#addressbook-index_org_view { #addressbook-index div.et2_hbox_left select#addressbook-index_org_view {
/*.box_shadow_standard_light;*/ /*.box_shadow_standard_light;*/
width: auto; width: auto;
margin: 5px 0em 5px 0px; margin: 5px 0em 5px 0px;
@ -195,22 +197,22 @@ input.et2_radiobox {
-moz-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); box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
} }
div#addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover { #addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-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); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
} }
div#addressbook-index div.header_row_right div[id$=favorite_wrapper] { #addressbook-index div.header_row_right div[id$=favorite_wrapper] {
margin-top: 0px; margin-top: 0px;
top: 6px; top: 6px;
} }
div#addressbook-index div.et2_hbox_right { #addressbook-index div.et2_hbox_right {
padding: 0px 11px 0px 0px; padding: 0px 11px 0px 0px;
width: auto; width: auto;
margin-right: 0em; margin-right: 0em;
margin-top: -5px; margin-top: -5px;
} }
div#addressbook-index div.et2_hbox_right select.et2_selectbox { #addressbook-index div.et2_hbox_right select.et2_selectbox {
/*.box_shadow_standard_light;*/ /*.box_shadow_standard_light;*/
width: auto; width: auto;
margin: 5px 0em 5px 0px; margin: 5px 0em 5px 0px;
@ -224,12 +226,12 @@ input.et2_radiobox {
height: 24px; height: 24px;
margin-left: 5px; margin-left: 5px;
} }
div#addressbook-index div.et2_hbox_right select.et2_selectbox:hover { #addressbook-index div.et2_hbox_right select.et2_selectbox:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-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); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
} }
div#addressbook-index div.et2_hbox_right select.et2_selectbox:focus { #addressbook-index div.et2_hbox_right select.et2_selectbox:focus {
outline: 0; outline: 0;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
@ -238,7 +240,8 @@ input.et2_radiobox {
-moz-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); box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
} }
div#addressbook-index div.et2_hbox_right button#addressbook-index_search { #addressbook-index div.et2_hbox_right button#addressbook-index_add,
#addressbook-index div.et2_hbox_right button#addressbook-index_search {
width: 32px; width: 32px;
/*border: 1px solid #0C5DA5;*/ /*border: 1px solid #0C5DA5;*/
margin: 6px 2px; margin: 6px 2px;
@ -253,13 +256,9 @@ input.et2_radiobox {
border-radius: 3px; border-radius: 3px;
border-top-left-radius: 10px; border-top-left-radius: 10px;
height: 24px; height: 24px;
margin-right: 0px;
background-image: url('../../../pixelegg/images/advanced-search.png') !important;
background-repeat: no-repeat;
padding-left: 0px;
font-size: 0px;
} }
div#addressbook-index div.et2_hbox_right button#addressbook-index_search:before { #addressbook-index div.et2_hbox_right button#addressbook-index_add:before,
#addressbook-index div.et2_hbox_right button#addressbook-index_search:before {
content: ""; content: "";
font-size: 2em; font-size: 2em;
color: #0c5da5; color: #0c5da5;
@ -267,60 +266,12 @@ input.et2_radiobox {
padding-left: 0.1em; padding-left: 0.1em;
padding-right: 100em; padding-right: 100em;
} }
div#addressbook-index div.et2_hbox_right button#addressbook-index_search:active { #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; background-color: #1aa200;
} }
div#addressbook-index div.et2_hbox_right button#addressbook-index_search:hover { #addressbook-index div.et2_hbox_right button#addressbook-index_add:hover,
background-color: #189800 !important; #addressbook-index div.et2_hbox_right button#addressbook-index_search:hover {
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;
background-image: url('../../../pixelegg/images/advanced-search.png');
/*.Complete_Button_text_icon_before_hover;*/
/*.dimension_height_m;*/
}
div#addressbook-index div.et2_hbox_right button#addressbook-index_search:focus {
background-color: #1aa200 !important;
background-image: url('../../../pixelegg/images/advanced-search.png');
/* .Complete_Button_text_icon_before_active;
.dimension_height_m;*/
}
div#addressbook-index div.et2_hbox_right button#addressbook-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;
margin-right: 0px;
}
div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before {
content: "";
font-size: 2em;
color: #0c5da5;
line-height: 0.6em;
padding-left: 0.1em;
padding-right: 100em;
}
div#addressbook-index div.et2_hbox_right button#addressbook-index_add:active {
background-color: #1aa200;
}
div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover {
background-color: #189800 !important; background-color: #189800 !important;
color: #ffc200; color: #ffc200;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@ -333,20 +284,24 @@ input.et2_radiobox {
border-radius: 3px; border-radius: 3px;
border-top-left-radius: 10px; border-top-left-radius: 10px;
} }
div#addressbook-index div.et2_hbox_right button#addressbook-index_add:active { #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; background-color: #1aa200 !important;
} }
div#addressbook-index div.filters select#infolog-index_cat_id { #addressbook-index div.et2_hbox_right button#addressbook-index_add {
margin-right: 0px;
}
#addressbook-index div.filters select#infolog-index_cat_id {
width: 10%; width: 10%;
margin-left: 1em; margin-left: 1em;
} }
div#addressbook-index div.filters select#infolog-index_filter { #addressbook-index div.filters select#infolog-index_filter {
width: 10%; width: 10%;
} }
div#addressbook-index div.filters select#infolog-index_filter2 { #addressbook-index div.filters select#infolog-index_filter2 {
width: 10%; width: 10%;
} }
div#addressbook-index table.egwGridView_outer { #addressbook-index table.egwGridView_outer {
width: 99%; width: 99%;
} }
/*##################################################################*/ /*##################################################################*/

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

@ -103,7 +103,7 @@ div#addressbook_view_sidebox{
div#addressbook-index{ #addressbook-index{
// min-height: 700px; // min-height: 700px;
// height: auto !important; // height: auto !important;
@ -157,44 +157,19 @@ div#addressbook-index{
&:focus{.Complete_Button_select_focus;} &:focus{.Complete_Button_select_focus;}
} }
// erweiterte Suche
button#addressbook-index_search{
.Complete_Button_add_only_plus;
.dimension_height_m;
margin-right: 0px;
background-image:url('../../../pixelegg/images/advanced-search.png') !important;
background-repeat: no-repeat;
padding-left: 0px;
font-size: 0px;
&:hover{
.Complete_Button_add_only_plus_hover;
background-image:url('../../../pixelegg/images/advanced-search.png');
/*.Complete_Button_text_icon_before_hover;*/
/*.dimension_height_m;*/
}
&:focus{
background-color: @color_positive_action_active !important;
background-image:url('../../../pixelegg/images/advanced-search.png');
/* .Complete_Button_text_icon_before_active;
.dimension_height_m;*/
}
}
// hinzufügen // hinzufügen
button#addressbook-index_add{ button#addressbook-index_add,button#addressbook-index_search{
.Complete_Button_add_only_plus; .Complete_Button_add_only_plus;
.dimension_height_m; .dimension_height_m;
margin-right: 0px;
&:hover {.Complete_Button_add_only_plus_hover;} &:hover {.Complete_Button_add_only_plus_hover;}
&:active {background-color: @color_positive_action_active !important;} &:active {background-color: @color_positive_action_active !important;}
} }
button#addressbook-index_add {
margin-right: 0px;
}