Skip to content

Commit

Permalink
Merge pull request jdorn#90 from jdorn/chart_improvements
Browse files Browse the repository at this point in the history
Chart and Report List improvements
  • Loading branch information
jdorn committed Sep 16, 2013
2 parents 2d1f331 + bf85798 commit 79492f0
Show file tree
Hide file tree
Showing 7 changed files with 6,772 additions and 5 deletions.
8 changes: 6 additions & 2 deletions classes/headers/ChartHeader.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ChartHeader extends HeaderBase {
),
'type'=>array(
'type'=>'enum',
'values'=>array('LineChart','GeoChart','AnnotatedTimeLine','BarChart','ColumnChart'),
'values'=>array('LineChart','GeoChart','AnnotatedTimeLine','BarChart','ColumnChart','Timeline'),
'default'=>'LineChart'
),
'title'=>array(
Expand Down Expand Up @@ -73,7 +73,11 @@ class ChartHeader extends HeaderBase {
'omit-columns'=>array(
'type'=>'array',
'default'=>array()
)
),
'options'=>array(
'type'=>'object',
'default'=>array()
)
);

public static function init($params, &$report) {
Expand Down
71 changes: 70 additions & 1 deletion public/css/report_list.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,73 @@
}
#report_list {
padding-bottom: 400px;
}
}


/*
* Side navigation
*/

/* All levels of nav */
.bs-sidebar .nav > li > a {
display: block;
color: #716b7a;
padding: 5px 20px;
}
.bs-sidebar .nav > li > a:hover,
.bs-sidebar .nav > li > a:focus {
text-decoration: none;
background-color: #e5e3e9;
border-right: 1px solid #dbd8e0;
}
.bs-sidebar .nav > .active > a,
.bs-sidebar .nav > .active:hover > a,
.bs-sidebar .nav > .active:focus > a {
font-weight: bold;
color: #563d7c;
background-color: transparent;
border-right: 1px solid #563d7c;
}

.bs-sidebar .nav .nav .nav {
display: none;
margin-bottom: 8px;
}

.bs-sidebar .nav .nav > li > a {
padding-top: 3px;
padding-bottom: 3px;
padding-left: 30px;
font-size: 90%;
}

/* Show and affix the side nav when space allows it */
@media screen and (min-width: 992px) {
.bs-sidebar .nav > .active > ul {
display: block;
}
/* Widen the fixed sidebar */
.bs-sidebar.affix,
.bs-sidebar.affix-bottom {
width: 213px;
}
.bs-sidebar.affix {
position: fixed; /* Undo the static from mobile first approach */
top: 80px;
}
.bs-sidebar.affix-bottom {
position: absolute; /* Undo the static from mobile first approach */
}
.bs-sidebar.affix-bottom .bs-sidenav,
.bs-sidebar.affix .bs-sidenav {
margin-top: 0;
margin-bottom: 0;
}
}
@media screen and (min-width: 1200px) {
/* Widen the fixed sidebar again */
.bs-sidebar.affix-bottom,
.bs-sidebar.affix {
width: 263px;
}
}
227 changes: 227 additions & 0 deletions public/css/timeline.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
body div.chart_color_10 {
background-color: red;
color: #1A1A1A;
border-color: darkred;
}
body div.chart_color_2 {
background-color: green;
color: white;
border-color: darkgreen;
}
body div.chart_color_3 {
background-color: orange;
color: #1A1A1A;
border-color: darkorange;
}
body div.chart_color_4 {
background-color: mediumpurple;
color: #1A1A1A;
border-color: purple;
}
body div.chart_color_5 {
background-color: lightblue;
color: #1A1A1A;
border-color: cornflowerblue;
}
body div.chart_color_6 {
background-color: #ffff00;
color: #1A1A1A;
border-color: yellow;
}
body div.chart_color_7 {
background-color: violet;
color: #1A1A1A;
border-color: darkviolet;
}
body div.chart_color_8 {
background-color: darkgreen;
color: white;
border-color: green;
}
body div.chart_color_9 {
background-color: darkred;
color: white;
border-color: red;
}

div.timeline-frame {
border: 1px solid #BEBEBE;
overflow: hidden;
}

div.timeline-axis {
border-color: #BEBEBE;
border-width: 1px;
border-top-style: solid;
}
div.timeline-axis-grid {
border-left-style: solid;
border-width: 1px;
}
div.timeline-axis-grid-minor {
border-color: #e5e5e5;
}
div.timeline-axis-grid-major {
border-color: #bfbfbf;
}
div.timeline-axis-text {
color: #4D4D4D;
padding: 3px;
white-space: nowrap;
}

div.timeline-axis-text-minor {
}

div.timeline-axis-text-major {
}

div.timeline-event {
color: #1A1A1A;
border-color: #97B0F8;
background-color: #D5DDF6;
display: inline-block;
}

div.timeline-event-selected {
border-color: #FFC200;
background-color: #FFF785;
z-index: 999;
}

div.timeline-event-cluster {
/* TODO: use another color or pattern? */
background: #97B0F8 url('img/cluster_bg.png');
color: white;
}
div.timeline-event-cluster div.timeline-event-dot {
border-color: #D5DDF6;
}

div.timeline-event-box {
text-align: center;
border-style: solid;
border-width: 1px;
border-radius: 5px;
-moz-border-radius: 5px; /* For Firefox 3.6 and older */
}

div.timeline-event-dot {
border-style: solid;
border-width: 5px;
border-radius: 5px;
-moz-border-radius: 5px; /* For Firefox 3.6 and older */
}

div.timeline-event-range {
border-style: solid;
border-width: 1px;
border-radius: 2px;
-moz-border-radius: 2px; /* For Firefox 3.6 and older */
}

div.timeline-event-range-drag-left {
cursor: w-resize;
z-index: 1000;
}

div.timeline-event-range-drag-right {
cursor: e-resize;
z-index: 1000;
}

div.timeline-event-line {
border-left-width: 1px;
border-left-style: solid;
}

div.timeline-event-content {
margin: 5px;
white-space: nowrap;
overflow: hidden;
}

div.timeline-groups-axis {
border-color: #BEBEBE;
border-width: 1px;
}

div.timeline-groups-axis-onleft {
border-style: none solid none none;
}

div.timeline-groups-axis-onright {
border-style: none none none solid;
}

div.timeline-groups-text {
color: #4D4D4D;
padding-left: 10px;
padding-right: 10px;
}

div.timeline-currenttime {
background-color: #FF7F6E;
width: 2px;
}

div.timeline-customtime {
background-color: #6E94FF;
width: 2px;
cursor: move;
}

div.timeline-navigation {
font-family: arial;
font-size: 20px;
font-weight: bold;
color: gray;

border: 1px solid #BEBEBE;
background-color: #F5F5F5;
border-radius: 2px;
-moz-border-radius: 2px; /* For Firefox 3.6 and older */
}

div.timeline-navigation-new, div.timeline-navigation-delete,
div.timeline-navigation-zoom-in, div.timeline-navigation-zoom-out,
div.timeline-navigation-move-left, div.timeline-navigation-move-right {
cursor: pointer;
padding: 10px 10px;
float: left;
text-decoration: none;
border-color: #BEBEBE; /* border is used for the separator between new and navigation buttons */

width: 16px;
height: 16px;
}

div.timeline-navigation-new {
background: url('img/16/new.png') no-repeat center;
}

div.timeline-navigation-new-line {
border-right: solid 1px;
}

div.timeline-navigation-delete {
padding: 0px;
padding-left: 5px;
background: url('img/16/delete.png') no-repeat center;
}

div.timeline-navigation-zoom-in {
background: url('img/16/zoomin.png') no-repeat center;
}

div.timeline-navigation-zoom-out {
background: url('img/16/zoomout.png') no-repeat center;
}

div.timeline-navigation-move-left {
background: url('img/16/moveleft.png') no-repeat center;
}

div.timeline-navigation-move-right {
background: url('img/16/moveright.png') no-repeat center;
}
Loading

0 comments on commit 79492f0

Please sign in to comment.