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

move [+ Add] button to left of NM header

Browse Source
This commit is contained in:
Ralf Becker 2016-03-09 10:14:48 +00:00
parent 0493ca041c
commit c0e3684806
11 changed files with 24 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/templates/default/admin.types.xet
View File

@ -3,10 +3,7 @@
<!-- $Id$ -->
<overlay>
<template id="addressbook.admin.types" template="" lang="" group="0" version="">
<vbox>
<template id="admin.customfields.types" content="content_types"/>
<button label="Save" id="save"/>
</vbox>
<styles>.header{
font-weight: bold;
}</styles>

3
admin/inc/class.admin_ui.inc.php
View File

@ -48,7 +48,6 @@ class admin_ui
'get_rows' => 'admin_ui::get_users',
'no_cat' => true,
'no_filter2' => true,
'filter_label' => 'Group',
'filter_no_lang' => true,
'lettersearch' => true,
'order' => 'account_lid',
@ -59,7 +58,7 @@ class admin_ui
);
//$content['msg'] = 'Hi Ralf ;-)';
$sel_options['tree'] = $this->tree_data();
$sel_options['filter'] = array('' => lang('All'));
$sel_options['filter'] = array('' => lang('All groups'));
foreach(self::$accounts->search(array(
'type' => 'groups',
'start' => false,

1
admin/lang/egw_de.lang
View File

@ -81,6 +81,7 @@ after how many unsuccessful attempts to login, an ip should be blocked (default
aliases admin de E-Mail-Alias
all applications admin de Alle Anwendungen
all categories admin de Alle Kategorien
all groups admin de Alle Gruppen
all records and account information will be lost! admin de Alle Datensätze und Kontoinformationen sind dann verloren!
all users admin de Alle Benutzer
allow anonymous access to this app admin de Anonymen Zugriff auf diese Anwendung zulassen

1
admin/lang/egw_en.lang
View File

@ -81,6 +81,7 @@ after how many unsuccessful attempts to login, an ip should be blocked (default
aliases admin en Aliases
all applications admin en All applications
all categories admin en All categories
all groups admin en All groups
all records and account information will be lost! admin en All records and account information will be lost!
all users admin en All users
allow anonymous access to this app admin en Allow anonymous access to this app

20
admin/templates/default/categories.index.xet
View File

@ -2,11 +2,6 @@
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ -->
<overlay>
<template id="admin.categories.index.right" template="" lang="" group="0" version="1.9.001">
<hbox>
<buttononly align="right" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
</hbox>
</template>
<template id="admin.categories.index.rows" template="" lang="" group="0" version="1.9.002">
<grid width="100%">
<columns>
@ -60,18 +55,11 @@
</rows>
</grid>
</template>
<template id="admin.categories.index.add" template="" lang="" group="0" version="1.9.001">
<buttononly lable="Add" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
</template>
<template id="admin.categories.index" template="" lang="" group="0" version="1.9.001">
<grid width="100%">
<columns>
<column/>
<column disabled="!@nm[selectcols]=/legacy_actions/"/>
</columns>
<rows>
<row>
<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_row="admin.categories.index.right"/>
</row>
</rows>
</grid>
<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_left="admin.categories.index.add"/>
<box class="action_popup prompt" id="owner_popup">
<vbox>
<description value="Change owner" class="promptheader"/>

21
admin/templates/default/customfields.xet
View File

@ -26,9 +26,6 @@
</rows>
</grid>
</template>
<template id="admin.customfields.header_add" template="" lang="" group="0" version="1.9.001">
<buttononly label="Add" id="add" onclick="egw.open_link('admin.customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]')+'&amp;use_private='+widget.getArrayMgr('content').getRoot().getEntry('use_private'),false,'450x380');"/>
</template>
<template id="admin.customfields.fields" template="" lang="" group="0" version="1.9.001">
<grid readonly="true">
<columns>
@ -85,19 +82,11 @@
</rows>
</grid>
</template>
<template id="admin.customfields.add" template="" lang="" group="0" version="1.9.001">
<buttononly label="Add" id="add" onclick="egw.open_link('admin.customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]')+'&amp;use_private='+widget.getArrayMgr('content').getRoot().getEntry('use_private'),false,'450x380');"/>
</template>
<template id="admin.customfields" template="" lang="" group="0" version="1.9.001">
<grid>
<columns>
<column/>
</columns>
<rows>
<row>
<template id="@type_template" span="all"/>
</row>
<row>
<nextmatch id="nm" template="admin.customfields.fields" header_row="admin.customfields.header_add" span="all"/>
</row>
</rows>
</grid>
<template id="@type_template"/>
<nextmatch id="nm" template="admin.customfields.fields" header_left="admin.customfields.add"/>
</template>
</overlay>

2
admin/templates/default/index.xet
View File

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

3
admin/templates/pixelegg/app.css
View File

@ -131,9 +131,6 @@ td.admin_userAgent span {
iframe#admin-index_iframe #admin-categories-index {
padding: 10px;
}
iframe#admin-index_iframe #admin-categories-index #admin-categories-index_add {
margin-top: -2px;
}
iframe#admin-index_iframe table.egwGridView_grid tr td {
color: #000;
}

5
admin/templates/pixelegg/app.less
View File

@ -60,11 +60,6 @@ iframe#admin-index_iframe{
background-color: transparent;
#admin-categories-index{
#admin-categories-index_add {
margin-top: -2px;
}
padding: 10px;
table.et2_grid {

64
pixelegg/css/pixelegg.css
View File

@ -715,64 +715,14 @@
* Kategorien
*
################################################################*/
div#admin-categories-index {
/*div#admin-categories-index{
padding: 0px;
}
div#admin-categories-index div.ui-helper-clearfix {
height: 0px;
}
div#admin-categories-index div.et2_hbox_right {
margin-right: 0;
padding: 0;
}
/*ADD Button*/
button#admin-categories-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: -2px 2px;
}
button#admin-categories-index_add:before {
content: "";
font-size: 2em;
color: #0c5da5;
line-height: 0.6em;
padding-left: 0.1em;
padding-right: 100em;
}
button#admin-categories-index_add:active {
background-color: #1aa200;
}
button#admin-categories-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;
}
button#admin-categories-index_add:active {
background-color: #1aa200 !important;
}
#admin-categories-index_filter {
top: 8px;
}
// save space above nextmatch
// set height to zero
div.ui-helper-clearfix { height: 0px;}
}*/
/*################################################################
*
* Favorites

22
pixelegg/less/etemplate2.less
View File

@ -641,32 +641,14 @@ div.header_row_right{
div#admin-categories-index{
/*div#admin-categories-index{
padding: 0px;
// save space above nextmatch
// set height to zero
div.ui-helper-clearfix { height: 0px;}
// move add button
div.et2_hbox_right {
margin-right: 0;
padding: 0;
}
}
/*ADD Button*/
button#admin-categories-index_add {
.Complete_Button_add_only_plus;
.dimension_height_m;
margin: -2px 2px;
&:hover {.Complete_Button_add_only_plus_hover;}
&:active {background-color: @color_positive_action_active !important;}
}
#admin-categories-index_filter {top: 8px;}
}*/
/*################################################################
*