fix resource to have new NM look

This commit is contained in:
Ralf Becker 2016-03-08 15:49:30 +00:00
parent 42831bc18c
commit 45d4076798
4 changed files with 26 additions and 122 deletions

View File

@ -105,11 +105,8 @@ class resources_ui
$content = array();
$content['msg'] = $msg ? $msg : $_GET['msg'];
$content['nm']['header_row'] = 'resources.show.nm_right';
$content['nm']['get_rows'] = 'resources.resources_bo.get_rows';
$content['nm']['no_filter'] = False;
$content['nm']['filter_label'] = lang('Category');
$content['nm']['filter2_label'] = 'Display';
$content['nm']['filter_no_lang'] = true;
$content['nm']['no_cat'] = true;
$content['nm']['bottom_too'] = true;

View File

@ -2,9 +2,6 @@
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ -->
<overlay>
<template id="resources.show.nm_right" template="" lang="" group="0" version="1.9.002">
<buttononly label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=resources.resources_ui.edit'),'','dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false; return false;"/>
</template>
<template id="resources.show.rows" template="" lang="" group="0" version="1.9.003">
<grid width="100%">
<columns>
@ -78,46 +75,33 @@
</rows>
</grid>
</template>
<template id="resources.show.add" template="" lang="" group="0" version="1.9.002">
<buttononly statustext="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=resources.resources_ui.edit'),'','dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false; return false;"/>
</template>
<template id="resources.show" template="" lang="" group="0" version="1.9.003">
<grid width="100%">
<columns>
<column width="100%"/>
</columns>
<rows>
<row disabled="!@msg">
<description align="center" id="msg" span="all" class="message"/>
</row>
<row>
<nextmatch id="nm" no_lang="1" template="resources.show.rows"/>
</row>
<row>
<box id="delete_popup" class="action_popup prompt">
<vbox class="prompt">
<description value="Delete" class="promptheader"/>
<description value="Delete accessories of selected resources too?"/>
<hbox>
<button label="Yes - Delete accessories too" id="delete" onclick="nm_submit_popup(this); return false;"/>
<button label="No - Make them resources" id="delete_promote" onclick="nm_popup_action.id = 'delete_promote'; nm_submit_popup(this); return false;"/>
<buttononly label="Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
</hbox>
</vbox>
</box>
</row>
<row>
<box id="restore_popup" class="action_popup prompt">
<vbox class="prompt">
<description value="Un-delete" class="promptheader"/>
<description value="Un-delete accessories of selected resources too?"/>
<hbox>
<button label="Yes - Un-delete accessories too" id="restore_accessories" onclick="nm_popup_action.id = 'restore_accessories';nm_submit_popup(this); return false;"/>
<button label="No - Leave them" id="restore" onclick="nm_popup_action.id = 'restore'; nm_submit_popup(this); return false;"/>
<buttononly label="Cancel" onclick="nm_hide_popup(this,'restore_popup');"/>
</hbox>
</vbox>
</box>
</row>
</rows>
</grid>
<nextmatch id="nm" no_lang="1" template="resources.show.rows" header_left="resources.show.add"/>
<box id="delete_popup" class="action_popup prompt">
<vbox class="prompt">
<description value="Delete" class="promptheader"/>
<description value="Delete accessories of selected resources too?"/>
<hbox>
<button label="Yes - Delete accessories too" id="delete" onclick="nm_submit_popup(this); return false;"/>
<button label="No - Make them resources" id="delete_promote" onclick="nm_popup_action.id = 'delete_promote'; nm_submit_popup(this); return false;"/>
<buttononly label="Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
</hbox>
</vbox>
</box>
<box id="restore_popup" class="action_popup prompt">
<vbox class="prompt">
<description value="Un-delete" class="promptheader"/>
<description value="Un-delete accessories of selected resources too?"/>
<hbox>
<button label="Yes - Un-delete accessories too" id="restore_accessories" onclick="nm_popup_action.id = 'restore_accessories';nm_submit_popup(this); return false;"/>
<button label="No - Leave them" id="restore" onclick="nm_popup_action.id = 'restore'; nm_submit_popup(this); return false;"/>
<buttononly label="Cancel" onclick="nm_hide_popup(this,'restore_popup');"/>
</hbox>
</vbox>
</box>
<styles>
.image16 img {
max-width: 16px;

View File

@ -14,54 +14,6 @@
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 {
font-size: 1.15em !important;
}
#resources-show_favorite_wrapper {
top: -4px;
margin-right: 10px;
}
button#resources-show_add {
height: 24px;
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;
background-color: #0c5da5;
}
button#resources-show_add:before {
content: "";
font-size: 2em;
color: #0c5da5;
line-height: 0.6em;
padding-left: 0.1em;
padding-right: 100em;
}
button#resources-show_add:active {
background-color: #1aa200;
}
button#resources-show_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#resources-show_add:active {
background-color: #1aa200 !important;
}
#resources-edit_res_id:before {
content: "#";
}

View File

@ -22,35 +22,6 @@
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 {font-size: 1.15em !important;}
//**********************************
// main
#resources-show_favorite_wrapper {
top: -4px;
margin-right: 10px;
}
// hinzufügen
button#resources-show_add{
.Complete_Button_add_only_plus;
background-color: @egw_color_2_a;
&:hover {.Complete_Button_add_only_plus_hover;}
&:active {background-color: @color_positive_action_active !important;}
}
// main
// Dialog Resources bearbeiten und alle weiteren
//
#resources-edit_res_id:before {content:"#"}