Author: ralfbecker
New Revision: 55260
URL: http://svn.stylite.de/viewvc/egroupware?rev=55260&view=rev
Log:
work in progress tracker styling for desktop
Removed:
trunk/tracker/templates/default/index.left_multiqueue.xet
Modified:
trunk/tracker/inc/class.tracker_ui.inc.php
trunk/tracker/templates/default/index.xet
trunk/tracker/templates/pixelegg/app.css
trunk/tracker/templates/pixelegg/app.less
— trunk/tracker/inc/class.tracker_ui.inc.php (original)
+++ trunk/tracker/inc/class.tracker_ui.inc.php Fri Mar 4 16:55:13 2016
@@ -882,8 +882,6 @@
$trackers = array();
}
-
if ($query['col_filter']['multi_queue']) unset($query['col_filter']['multi_queue']);
-
//echo "<p align=right>uitracker::get_rows() order='$query[order]', sort='$query[sort]', search='$query[search]', start=$query[start], num_rows=$query[num_rows], col_filter=".print_r($query['col_filter'],true)."</p>\n";
$total = parent::get_rows($query,$rows,$readonlys,$this->allow_voting||$this->allow_bounties); // true = count votes and/or bounties
$prio_labels = $prio_tracker = $prio_cat = null;
@@ -1029,10 +1027,13 @@
$query_in[‘options-selectcols’][‘bounties’] = false;
}
-
if ($tracker && $rows['col_filter']['tr_tracker'] && count($rows['col_filter']['tr_tracker']) == 1)
-
{
-
$rows['no_tr_tracker'] = true;
-
}
}
/**
@@ -1178,31 +1179,12 @@
{
$tracker=$state[‘col_filter’][‘tr_tracker’];
}
-
$multi_queue = $this->prefs['multi_queue'];
}
else
{
$only_tracker = $content['only_tracker']; unset($content['only_tracker']);
$tracker = $content['nm']['col_filter']['tr_tracker'];
$this->called_by = $content['called_by']; unset($content['called_by']);
-
-
// Multiple queues at once
-
list($multi_queue_filter) = @each($content['nm']['col_filter']['multi_queue']);
-
$multi_queue = $multi_queue_filter == 'true' ? true : ($multi_queue_filter == 'false' ? false : $this->prefs['multi_queue']);
-
if($multi_queue != $this->prefs['multi_queue'])
-
{
-
// Store in preferences
-
$this->prefs['multi_queue'] = $multi_queue;
-
$GLOBALS['egw']->preferences->add('tracker','multi_queue',$multi_queue);
-
// save prefs, but do NOT invalid the cache (unnecessary)
-
$GLOBALS['egw']->preferences->save_repository(false,'user',false);
-
if(!$multi_queue)
-
{
-
// Only select 1 queue when going from multi to single
-
if (!is_array($tracker)) $tracker = explode(',', $tracker);
-
$tracker = $content['nm']['col_filter']['tr_tracker'] = $tracker[0];
-
}
-
}
if (is_array($content) && isset($content['nm']['rows']['document'])) // handle insert in default document button like an action
{
@@ -1311,10 +1293,10 @@
‘cat_is_select’ => ‘no_lang’,
‘filter’ => 0, // all
’options-filter’ => $date_filters,
-
//'filter2_label' => lang('Version'),
'filter2_no_lang'=> true,
'order' => $this->allow_bounties ? 'bounties' : ($this->allow_voting ? 'votes' : 'tr_id'),// IO name of the column to sort after (optional for the sortheaders)
'sort' => 'DESC',// IO direction of the sort: 'ASC' or 'DESC'
@@ -1322,9 +1304,7 @@
‘col_filter’ => array(
‘tr_status’ => ‘not-closed’, // default filter: not closed
),
-
'header_left' => $only_tracker ? null : 'tracker.index.left', // I template to show left of the range-value, left-aligned (optional)
'only_tracker' => $only_tracker,
-
'header_right' => 'tracker.index.right', // I template to show right of the range-value, left-aligned (optional)
'default_cols' => '!esc_id,legacy_actions,tr_summary_tr_description,tr_resolution,tr_completion,tr_sum_timesheets,votes,bounties',
'row_id' => 'tr_id',
'row_modified' => 'tr_modified'
@@ -1332,6 +1312,7 @@
// use the state of the last session stored in the user prefs
if (!$this->called_by && ($state = @unserialize($GLOBALS[‘egw_info’][‘user’][‘preferences’][‘tracker’][‘index_state’])))
{
@@ -1403,9 +1384,6 @@
}
$content['nm']['actions'] = $this->get_actions($tracker, $content['cat_id']);
-
$content['nm']['multi_queue'] = $multi_queue;
-
// Turn on multi-queue widget
-
$content['nm']['header_left'] = $content['nm']['multi_queue'] ? 'tracker.index.left_multiqueue' : 'tracker.index.left';
// disable filemanager icon, if user has no access to it
$readonlys['filemanager/navbar'] = !isset($GLOBALS['egw_info']['user']['apps']['filemanager']);
— trunk/tracker/templates/default/index.xet (original)
+++ trunk/tracker/templates/default/index.xet Fri Mar 4 16:55:13 2016
@@ -2,17 +2,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -133,6 +122,12 @@
+
+
+
+
+
+
@@ -143,16 +138,8 @@
-
-
-
-
-
-
-
-
-
+
— trunk/tracker/templates/pixelegg/app.css (original)
+++ trunk/tracker/templates/pixelegg/app.css Fri Mar 4 16:55:13 2016
@@ -72,7 +72,7 @@
}
.normal,
.normal_done {
- color: #000000;
}
.high {
color: #cc0000;
@@ -137,47 +137,84 @@
.tracker_assign {
width: 100% !important;
}
-button#tracker-index_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#tracker-index_add:before {
- content: “”;
- font-size: 2em;
- color: #0c5da5;
- line-height: 0.6em;
- padding-left: 0.1em;
- padding-right: 100em;
-}
-button#tracker-index_add:active {
- background-color: #1aa200;
-}
-button#tracker-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#tracker-index_add:active {
- background-color: #1aa200 !important;
-}
+/* tablets and smartphones */
+@media only screen and (max-device-width: 1024px) {
-
#tracker-index table.egwGridView_outer tbody td {
- padding-top: 0;
- padding-bottom: 0;
- }
-
#tracker-index table.egwGridView_outer tbody label[id^=‘tracker-index’][id$=‘tr_modified]’] > time {
- float: none;
- }
-
#tracker-index table.egwGridView_outer tbody label[id^=‘tracker-index’][id$=‘tr_created]’] > time {
- float: left;
- font-weight: normal;
- }
-
#tracker-index table.egwGridView_outer tbody label[id^=‘tracker-index’][id$=‘tr_startdate]’] {
- float: left;
- font-size: 9pt;
- }
-
#tracker-index table.egwGridView_outer tbody label[id^=‘tracker-index’][id$=‘tr_startdate]’] time {
- padding-left: 5px;
- font-size: 9pt;
- }
-
#tracker-index table.egwGridView_outer tbody label[id^=‘tracker-index’][id$=‘tr_duedate]’] > * {
- float: right;
- font-size: 9pt;
- }
-
#tracker-index table.egwGridView_outer tbody label[id^=‘tracker-index’][id$=‘tr_duedate]’] > * time {
- padding-left: 5px;
- font-size: 9pt;
- }
-
#tracker-index table.egwGridView_outer tbody span[id^=‘tracker-index’][id$=‘cat_id]’] {
- float: right;
- }
-
#tracker-index table.egwGridView_outer tbody span[id^=‘tracker-index’][id$=‘tr_description]’] {
- height: 28px;
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
- }
-
#tracker-index table.egwGridView_outer tbody span[id^=‘tracker-index’][id$=‘prio_label]’] {
- font-weight: normal;
- padding-top: 5px;
- }
-
#tracker-index table.egwGridView_outer tbody span[id^=‘tracker-index’][id$=‘prio_label]’]::first-letter {
- font-weight: normal;
- }
-
#tracker-index table.egwGridView_outer tbody ul[id^=‘tracker-index’][id$=‘tr_assigned]’] {
- height: 42px;
- overflow: hidden;
- }
-
#tracker-index table.egwGridView_outer tbody ul[id^=‘tracker-index’][id$=‘tr_assigned]’] li {
- overflow: hidden;
- width: 90px;
- white-space: nowrap;
- text-overflow: ellipsis;
- font-size: 9pt;
- }
-
#tracker-index table.egwGridView_outer tbody span[id^=‘tracker-index’][id$=‘tr_id]’]::before {
- content: ‘#’;
- }
-
#tracker-index table.egwGridView_outer tbody .tracker1Col span,
-
#tracker-index table.egwGridView_outer tbody .tracker1Col time,
-
#tracker-index table.egwGridView_outer tbody .tracker1Col label {
- font-size: 9pt;
- padding-bottom: 5px;
- }
-
#tracker-index table.egwGridView_outer tbody .tracker2Col {
- font-size: 9pt;
- }
-
#tracker-index table.egwGridView_outer tbody span[id^=‘tracker-index’][id$=‘tr_description]’] {
- font-size: 9pt;
- padding-bottom: 12px;
- }
-
#tracker-index table.egwGridView_outer tbody span[id^=‘tracker-index’][id$=‘tr_summary]’] {
- font-weight: bold;
- }
-
#tracker-index table.egwGridView_outer tbody .tracker2Col,
-
#tracker-index table.egwGridView_outer tbody .tracker1Col,
-
#tracker-index table.egwGridView_outer tbody .tracker3Col {
- padding-top: 5px;
- }
+}
— trunk/tracker/templates/pixelegg/app.less (original)
+++ trunk/tracker/templates/pixelegg/app.less Fri Mar 4 16:55:13 2016
@@ -30,16 +30,6 @@
label.tracker_trIdEdit:before { content: “#”; }
.tracker_assign { width:100% !important;}
-// hinzufügen
-
button#tracker-index_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 Tracker bearbeiten und alle weiteren
-// #####################################################
+// #####################################################
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
