Author: ralfbecker
New Revision: 55308
URL: http://svn.stylite.de/viewvc/egroupware?rev=55308&view=rev
Log:
fix projectmanager NM bar to new look
Modified:
trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php
trunk/projectmanager/inc/class.projectmanager_pricelist_ui.inc.php
trunk/projectmanager/inc/class.projectmanager_ui.inc.php
trunk/projectmanager/lang/ (props changed)
trunk/projectmanager/lang/egw_de.lang
trunk/projectmanager/lang/egw_en.lang
trunk/projectmanager/templates/default/app.css
trunk/projectmanager/templates/default/elements.list.xet
trunk/projectmanager/templates/default/list.xet
trunk/projectmanager/templates/default/pricelist.list.xet
trunk/projectmanager/templates/pixelegg/app.css
trunk/projectmanager/templates/pixelegg/app.less
— trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php Tue Mar 8 16:08:40 2016
@@ -526,7 +526,7 @@
$sub_query = true;
}
unset($query[‘col_filter’][‘parent_id’]);
-
// cumulate eg. timesheets in also included infologs
$query['col_filter']['cumulate'] = !($query['filter2'] & 4);
$total = parent::get_rows($query,$rows,$readonlys,true);
@@ -564,7 +564,7 @@
}
// Don’t show sub triangle for first project (self)
$row[‘is_parent’] = ($row[‘pe_app’] == ‘projectmanager’) && ($sub_query ? true: $n );
@@ -908,7 +908,6 @@
‘get_rows’ => ‘projectmanager.projectmanager_elements_ui.get_rows’,
‘num_rows’ => 0, // No data when first sent
’filter’ => ‘used’,// I initial value for the filter
-
'filter_label' => lang('Filter'),// I label for filter (optional)
'options-filter' => $this->status_labels,
'filter_no_lang' => True,// I set no_lang for filter (=dont translate the options)
'options-filter2' => array(
@@ -919,7 +918,6 @@
4 => ‘Cumulated elements too’,
5 => ‘Details of cumulated’,
),
-
'header_row' => 'projectmanager.elements.list.add-new',
'col_filter' => array('pe_resources' => null), // default value, to suppress loop
'order' => 'pe_modified',// IO name of the column to sort after (optional for the sortheaders)
'sort' => 'DESC',// IO direction of the sort: 'ASC' or 'DESC'
@@ -930,7 +928,7 @@
‘is_parent’ => ‘is_parent’
);
// use the state of the last session stored in the user prefs
— trunk/projectmanager/inc/class.projectmanager_pricelist_ui.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_pricelist_ui.inc.php Tue Mar 8 16:08:40 2016
@@ -337,7 +337,6 @@
‘sort’ => ‘DESC’,// IO direction of the sort: ‘ASC’ or ‘DESC’
‘default_cols’ => ‘!legacy_actions’,
‘row_id’ => ‘pl_id’,
-
'header_row' => 'projectmanager.pricelist.add-new',
'dataStorePrefix' => 'pm_prices', // Default would be projectmanager, which would collide with project list
'num_rows' => 0, // No data when first sent
'placeholder_actions' => array(), // we have no "add" action currently
— trunk/projectmanager/inc/class.projectmanager_ui.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_ui.inc.php Tue Mar 8 16:08:40 2016
@@ -732,13 +732,11 @@
‘options-filter2’=> self::$status_labels,
‘filter2_no_lang’=> True,// I set no_lang for filter (=dont translate the options)
‘filter’ => ‘mains’,
-
'filter_label' => lang('Filter'),// I label for filter (optional)
-
'options-filter' => $this->filter_labels,
-
'options-filter' => array('' => lang('All projects'))+$this->filter_labels,
'filter_no_lang' => True,// I set no_lang for filter (=dont translate the options)
'order' => 'pm_modified',// IO name of the column to sort after (optional for the sortheaders)
'sort' => 'DESC',// IO direction of the sort: 'ASC' or 'DESC'
'default_cols' => '!role0,role1,role2,role3,role4,pm_used_time_pm_planned_time_pm_replanned_time,legacy_actions,cat_id',
-
'header_row' => 'projectmanager.list.right',
'row_id' => 'pm_id',
'favorites' => true,
'row_modified' => 'pm_modified',
Propchange: trunk/projectmanager/lang/
— svn:ignore (original)
+++ svn:ignore Tue Mar 8 16:08:40 2016
@@ -1,2 +1,38 @@
egw_de.lang.old
egw_en.lang.old
+egw_bg.lang.old
+egw_ca.lang.old
+egw_cs.lang.old
+egw_da.lang.old
+egw_el.lang.old
+egw_es-es.lang.old
+egw_et.lang.old
+egw_eu.lang.old
+egw_fa.lang.old
+egw_fi.lang.old
+egw_fr.lang.old
+egw_hi.lang.old
+egw_hr.lang.old
+egw_hu.lang.old
+egw_id.lang.old
+egw_it.lang.old
+egw_iw.lang.old
+egw_ja.lang.old
+egw_ko.lang.old
+egw_lo.lang.old
+egw_lt.lang.old
+egw_lv.lang.old
+egw_nl.lang.old
+egw_no.lang.old
+egw_pl.lang.old
+egw_pt-br.lang.old
+egw_pt.lang.old
+egw_ru.lang.old
+egw_sk.lang.old
+egw_sl.lang.old
+egw_sv.lang.old
+egw_tr.lang.old
+egw_uk.lang.old
+egw_vi.lang.old
+egw_zh-tw.lang.old
+egw_zh.lang.old
— trunk/projectmanager/lang/egw_de.lang (original)
+++ trunk/projectmanager/lang/egw_de.lang Tue Mar 8 16:08:40 2016
@@ -31,6 +31,7 @@
add timesheet only projectmanager de Nur Stundenzettel hinzufügen
addressbook elements of a project can be used to define individual serial letter recipients. available fields are projectmanager de Adressen, die einem Projekt zugewiesen sind, können als Empfänger eines individuellen Serienbriefs definiert werden
addressbook fields projectmanager de Felder der Adressverwaltung
+all projects projectmanager de Alle Projekte
all roles projectmanager de Rolle hinzufügen
all_roles projectmanager de Alle Rollen
allow users to change their working times projectmanager de Erlaube Benutzern ihre Arbeitszeiten zu ändern
— trunk/projectmanager/lang/egw_en.lang (original)
+++ trunk/projectmanager/lang/egw_en.lang Tue Mar 8 16:08:40 2016
@@ -31,6 +31,7 @@
add timesheet only projectmanager en Add timesheet only
addressbook elements of a project can be used to define individual serial letter recipients. available fields are projectmanager en Address book elements of a project can be used to define individual serial letter recipients. Available fields are
addressbook fields projectmanager en Address book fields
+all projects projectmanager en All projects
all roles projectmanager en All roles
all_roles projectmanager en All roles
allow users to change their working times projectmanager en Allow users to change their working times
— trunk/projectmanager/templates/default/app.css (original)
+++ trunk/projectmanager/templates/default/app.css Tue Mar 8 16:08:40 2016
@@ -1,3 +1,19 @@
+/* $Id$ /
+
+/*
-
- Let button in link_add look like regular [+] / add button, with app behind
- */
+button#projectmanager-elements-list_link_add_add {
- width: 24px;
- text-indent: 100px;
- overflow: hidden;
- padding: 0;
- background-position: 3px;
- float: left;
+}
+button#projectmanager-elements-list_link_add_add:hover {
- background-size: 16px 16px;
+}
#projectmanager-tree_target {
min-height: 35px;
@@ -15,11 +31,11 @@
margin-right:-13px;
}
-#projectmanager-list .et2_nextmatch .egwGridView_outer tr.subentry > td:first-child > div.innerContainer.level_1,
+#projectmanager-list .et2_nextmatch .egwGridView_outer tr.subentry > td:first-child > div.innerContainer.level_1
{
margin-right:-24px;
}
-#projectmanager-list .et2_nextmatch .egwGridView_outer tr.subentry > td:first-child > div.innerContainer.level_2,
+#projectmanager-list .et2_nextmatch .egwGridView_outer tr.subentry > td:first-child > div.innerContainer.level_2
{
margin-right:-35px;
}
— trunk/projectmanager/templates/default/elements.list.xet (original)
+++ trunk/projectmanager/templates/default/elements.list.xet Tue Mar 8 16:08:40 2016
@@ -170,41 +170,16 @@
-
<grid width="100%">
-
<columns>
-
<column/>
-
</columns>
-
<rows>
-
<row disabled="1">
-
<hbox>
-
<template id="add-new"/>
-
<template id="add"/>
-
</hbox>
-
</row>
-
<row disabled="!@msg">
-
<description align="center" id="msg" no_lang="1" class="message"/>
-
</row>
-
<row>
-
<nextmatch id="nm" options="projectmanager.elements.list.rows"/>
-
</row>
-
<row>
-
<box id="add_existing_popup" class="action_popup prompt">
-
<vbox>
-
<description value="Add / Remove link" class="promptheader"/>
-
<link-entry id="link" class="action_popup-content"/>
-
<hbox>
-
<button label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"/>
-
<buttononly label="Cancel" onclick="nm_hide_popup(this,'link_popup');"/>
-
</hbox>
-
</vbox>
-
</box>
-
<hbox align="right" disabled="!@nm[selectcols]=/legacy_actions/">
-
-
<buttononly statustext="Select action" label="Select action" id="legacy_actions" onclick="if (!egw_globalObjectManager.getObjectById('projectmanager.list.rows').executeActionImplementation(this, 'popup')) alert(egw::lang('You need to select some entries first!')); return false;;"/>
-
<button statustext="Check all" label="Check all" id="check_all" needed="1" onclick="egw_globalObjectManager.getObjectById('projectmanager.elements.list.rows').toggleAllSelected(); return false;" image="arrow_ltr" class="check_all_arrow"/>
-
</hbox>
-
</row>
-
</rows>
-
</grid>
-
<nextmatch id="nm" options="projectmanager.elements.list.rows" header_left="projectmanager.elements.list.add-new"/>
-
<box id="add_existing_popup" class="action_popup prompt">
-
<vbox>
-
<description value="Add / Remove link" class="promptheader"/>
-
<link-entry id="link" class="action_popup-content"/>
-
<hbox>
-
<button label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"/>
-
<buttononly label="Cancel" onclick="nm_hide_popup(this,'link_popup');"/>
-
</hbox>
-
</vbox>
-
</box>
— trunk/projectmanager/templates/default/list.xet (original)
+++ trunk/projectmanager/templates/default/list.xet Tue Mar 8 16:08:40 2016
@@ -2,9 +2,6 @@
-
-
-
@@ -124,41 +121,11 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- .check_all_arrow input { margin-right: 10px; }
- .pm_resources {max-height: 6em; overflow-y: auto;}
-
+
— trunk/projectmanager/templates/default/pricelist.list.xet (original)
+++ trunk/projectmanager/templates/default/pricelist.list.xet Tue Mar 8 16:08:40 2016
@@ -54,18 +54,9 @@
-
<button align="right" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=projectmanager.projectmanager_pricelist_ui.edit'),'_blank','dependent=yes,width=600,height=450,scrollbars=yes,status=yes'); return false;"/>
-
<button align="right" statustext="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=projectmanager.projectmanager_pricelist_ui.edit'),'_blank','dependent=yes,width=600,height=450,scrollbars=yes,status=yes'); return false;"/>
— trunk/projectmanager/templates/pixelegg/app.css (original)
+++ trunk/projectmanager/templates/pixelegg/app.css Tue Mar 8 16:08:40 2016
@@ -12,6 +12,20 @@
-
@package projectmanager
-
@version $Id$
/
+/ $Id$ /
+/*
-
- Let button in link_add look like regular [+] / add button
- */
+button#projectmanager-elements-list_link_add_add {
- width: 24px;
- text-indent: 100px;
- overflow: hidden;
- padding: 0;
- background-position: 3px;
+}
+button#projectmanager-elements-list_link_add_add:hover {
- background-size: 16px 16px;
+}
#projectmanager-tree_target {
min-height: 35px;
display: block;
@@ -142,54 +156,6 @@
/*List View */
.et2_grid td {
border: 0px;
-}
-/Button Add Project/
-button#projectmanager-list_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;
-}
-button#projectmanager-list_add:before {
- content: “”;
- font-size: 2em;
- color: #0c5da5;
- line-height: 0.6em;
- padding-left: 0.1em;
- padding-right: 100em;
-}
-button#projectmanager-list_add:active {
- background-color: #1aa200;
-}
-button#projectmanager-list_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#projectmanager-list_add:active {
- background-color: #1aa200 !important;
-}
-#projectmanager-list_favorite_wrapper div.et2_dropdown,
-#projectmanager-list_favorite {
- top: -6px;
}
#projectmanager-list_export {
position: relative;
@@ -222,50 +188,6 @@
#projectmanager-list_projectmanager-list-right button {
position: relative;
top: 4px;
-}
-#projectmanager-elements-list .nextmatch_header #projectmanager-elements-list_link_add button.et2_button {
- 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;
-}
-#projectmanager-elements-list .nextmatch_header #projectmanager-elements-list_link_add button.et2_button:before {
- content: “”;
- font-size: 2em;
- color: #0c5da5;
- line-height: 0.6em;
- padding-left: 0.1em;
- padding-right: 100em;
-}
-#projectmanager-elements-list .nextmatch_header #projectmanager-elements-list_link_add button.et2_button:active {
- background-color: #1aa200;
-}
-#projectmanager-elements-list .nextmatch_header #projectmanager-elements-list_link_add button.et2_button: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;
-}
-#projectmanager-elements-list .nextmatch_header #projectmanager-elements-list_link_add button.et2_button:active {
- background-color: #1aa200 !important;
}
/Ende iframe/
#projectmanager-edit #projectmanager-edit_tabs .et2_tabheader {
@@ -420,46 +342,10 @@
div#projectmanager-pricelist-list #projectmanager-pricelist-list_add:active {
background-color: #1aa200 !important;
}
-#projectmanager-elements-list_nm #projectmanager-elements-list_link_add button {
- color: #FFF;
- text-shadow: none;
- /* 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;
- height: 24px;
- margin-right: 0px;
-}
-#projectmanager-elements-list_nm #projectmanager-elements-list_link_add button:before {
- content: “+”;
- font-size: 1.5em;
- color: #ffc200;
- line-height: 1.1em;
-}
-#projectmanager-elements-list_nm #projectmanager-elements-list_link_add button: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;
-}
-#projectmanager-elements-list_nm #projectmanager-elements-list_link_add button:active {
- background-color: #1aa200 !important;
-}
/* tablets and smartphones */
@media only screen and (max-device-width: 1024px) {
#projectmanager-list table.egwGridView_outer tbody span[id^=“projectmanager-list”][id$=“pm_number]”] {
- font-size: 8pt;
- font-size: 9pt;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 80%;
@@ -480,7 +366,7 @@
text-align: left;
}
#projectmanager-list table.egwGridView_outer tbody .pmCol1 label.et2_label {
- font-size: 9pt;
padding-bottom: 5px;
}
#projectmanager-list table.egwGridView_outer tbody .pmCol1 label.et2_label span {
@@ -491,14 +377,14 @@
}
#projectmanager-list table.egwGridView_outer tbody .pmCol2 .startPlanned,
#projectmanager-list table.egwGridView_outer tbody .pmCol2 .endPlanned {
- font-size: 9pt;
font-style: italic;
}
#projectmanager-list table.egwGridView_outer tbody .pmCol2 .endPlanned {
float: right;
}
#projectmanager-list table.egwGridView_outer tbody .pmCol2 .planned time {
- font-size: 9pt;
float: none;
}
#projectmanager-elements-list_nm table.egwGridView_outer tbody .elementCol2 .et2_hbox > * {
@@ -526,7 +412,7 @@
padding-bottom: 0;
}
#projectmanager-elements-list_nm table.egwGridView_outer tbody .elementCol1 label.et2_label {
- font-size: 9pt;
padding-top: 3px;
}
#projectmanager-elements-list_nm table.egwGridView_outer tbody .elementCol1 label.et2_label span {
@@ -538,7 +424,7 @@
#projectmanager-elements-list_nm table.egwGridView_outer tbody label[id^=“projectmanager-elements-list”][id$=‘pe_planned_end]’],
#projectmanager-elements-list_nm table.egwGridView_outer tbody label[id^=“projectmanager-elements-list”][id$=‘pe_used_budget]’],
#projectmanager-elements-list_nm table.egwGridView_outer tbody label[id^=“projectmanager-elements-list”][id$=‘pe_planned_budget]’] {
- font-size: 9pt;
}
#projectmanager-elements-list_nm table.egwGridView_outer tbody label[id^=“projectmanager-elements-list”][id$=‘pe_planned_start]’] time,
#projectmanager-elements-list_nm table.egwGridView_outer tbody label[id^=“projectmanager-elements-list”][id$=‘pe_real_start]’] time,
— trunk/projectmanager/templates/pixelegg/app.less (original)
+++ trunk/projectmanager/templates/pixelegg/app.less Tue Mar 8 16:08:40 2016
@@ -58,22 +58,6 @@
.et2_grid td {border: 0px;}
-/Button Add Project/
-button#projectmanager-list_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
-#projectmanager-list_favorite_wrapper div.et2_dropdown,
-#projectmanager-list_favorite{
// Export
#projectmanager-list_export{
position: relative;
@@ -92,18 +76,6 @@
div.et2_hbox {top: -8px;}
button {position: relative; top: 4px;}
}
-#projectmanager-elements-list .nextmatch_header #projectmanager-elements-list_link_add button.et2_button{
-
.Complete_Button_add_only_plus;
-
.dimension_height_m;
-
margin-right: 0px;
-
-
&:hover {.Complete_Button_add_only_plus_hover;}
-
&:active {background-color: @color_positive_action_active !important;}
-
-
}
-
/Ende iframe/
@@ -244,31 +216,6 @@
}
-// Dialog Elementlist ###################################################
-//
-#projectmanager-elements-list_nm{
-}
/* tablets and smartphones */
@media only screen and (max-device-width:1024px) {
#projectmanager-list {
@@ -282,7 +229,7 @@
}
span[id^=“projectmanager-list”][id$=“pm_title]”]{
font-weight: bold;
@@ -337,7 +284,7 @@
.elementCat {
display: inline-block;
float: right;
@@ -360,7 +307,7 @@
}
}
}
-
label[id^="projectmanager-elements-list"][id$='pe_planned_start]'],
label[id^="projectmanager-elements-list"][id$='pe_real_start]'],
label[id^="projectmanager-elements-list"][id$='pe_real_end]'],
@@ -392,6 +339,6 @@
max-width:100%;
}
}
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://makebettercode.com/inteldaal-eval
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
