incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [32/39] git commit: [#6545] add CSS for daterange picker, graph
Date Tue, 10 Sep 2013 15:55:28 GMT
[#6545] add CSS for daterange picker, graph


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c1685f61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c1685f61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c1685f61

Branch: refs/heads/db/6545
Commit: c1685f6104359e92c1edf04bf2657dbe3834e00f
Parents: 2356145
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Sep 6 19:58:15 2013 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Tue Sep 10 14:35:48 2013 +0000

----------------------------------------------------------------------
 Allura/allura/nf/allura/css/site_style.css      |  77 +++++++++++++-
 .../public/nf/css/forge/ui.daterangepicker.css  | 103 +++++++++++++++++++
 Allura/allura/public/nf/js/stats.js             |  13 +--
 .../templates/discussionforums/stats_graph.html |   1 +
 rat-excludes.txt                                |   1 +
 5 files changed, 184 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c1685f61/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 662b4f6..b85f54d 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -1905,7 +1905,6 @@ nav .ico {
   -ms-border-radius: 4px;
   -khtml-border-radius: 4px;
   border-radius: 4px;
-  z-index: 1;
   position: relative;
   width: 785px;
 }
@@ -2607,6 +2606,82 @@ div.attachment_thumb .file_type span {
   overflow: auto;
 }
 
+/* Stats Graph */
+
+#stats_date_picker {
+  text-align: right;
+  width: 340px;
+  display: inline;
+  float: left;
+  overflow: hidden;
+  *zoom: 1;
+  margin: 0 10px;
+}
+#stats_date_picker input {
+  width: 228px !important;
+}
+
+#stats-viz-container {
+  width: 700px;
+  display: inline;
+  float: left;
+  overflow: hidden;
+  *zoom: 1;
+  margin: 0 10px;
+  overflow: hidden;
+}
+
+#stats-viz {
+  height: 400px;
+}
+#stats-viz td {
+  border-width: 0;
+}
+
+#stats-viz .xaxis {
+  text-align: center;
+} 
+#stats-viz .yaxis {
+  -webkit-transform: rotate(270deg);  -moz-transform: rotate(270deg);
+  -ms-transform: rotate(270deg);
+  -o-transform: rotate(270deg);
+  transform: rotate(270deg);
+  max-width: 1em;
+}
+  
+#project_stats_holder {
+  width: 600px;
+  height: 350px;
+} 
+#project_stats_holder div.legend table {
+  width: auto;
+}
+#project_stats_holder .tickLabel {
+  margin-left: -4px;
+}
+#project_stats_holder .tooltip {
+  background: #3f3f3f;
+  border: 1px solid #222;
+  opacity: .8;
+  z-index: 1000;
+  padding: 5px 10px;
+  color: #fff;
+}
+#project_stats_holder .base, #project_stats_holder #content_base {
+  margin: 0;
+  background: none;
+  border-width: 0;
+}
+
+.chart-tooltip {
+  position: absolute;
+  display: none;
+  background: white;
+  border: 1px solid black;
+  border-radius: 0.5em;
+  padding: 0 0.3em;
+}
+
 /* Messages */
 .error, .notice, .success, .ok, .info {
   padding: .8em;

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c1685f61/Allura/allura/public/nf/css/forge/ui.daterangepicker.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/forge/ui.daterangepicker.css b/Allura/allura/public/nf/css/forge/ui.daterangepicker.css
new file mode 100644
index 0000000..6c71e83
--- /dev/null
+++ b/Allura/allura/public/nf/css/forge/ui.daterangepicker.css
@@ -0,0 +1,103 @@
+/*styles for jquery ui daterangepicker plugin */
+
+.ui-daterangepickercontain {
+	position: absolute;
+	z-index: 999;
+}
+.ui-daterangepickercontain .ui-daterangepicker {
+	float: left;
+	padding: 5px !important;
+	width: auto;
+	display: inline;
+	background-image: none !important;
+	clear: left;
+}
+.ui-daterangepicker ul, .ui-daterangepicker .ranges, .ui-daterangepicker .range-start, .ui-daterangepicker
.range-end {
+	float: left;
+	padding: 0;
+	margin: 0;
+}
+.ui-daterangepicker .ranges {
+	width: auto;
+	position: relative;
+	padding: 5px 5px 40px 0;
+	margin-left: 10px;
+}
+.ui-daterangepicker .range-start, .ui-daterangepicker .range-end {
+	margin-left: 5px;
+}
+.ui-daterangepicker button.btnDone {
+	margin: 0 5px 5px 0;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	clear: both;
+	cursor: pointer;
+	font-size: 1.1em;
+}
+.ui-daterangepicker ul {
+	width: 17.6em;
+	background: none;
+	border: 0;
+}
+.ui-daterangepicker li {
+	list-style: none;
+	padding: 1px;
+	cursor: pointer;
+	margin: 1px 0;
+}
+.ui-daterangepicker li.ui-state-hover, .ui-daterangepicker li.ui-state-active {
+	padding: 0;
+}
+.ui-daterangepicker li.preset_0 {
+	margin-top: 1.5em !important;
+}
+.ui-daterangepicker .ui-widget-content a {
+	text-decoration: none !important;
+}
+.ui-daterangepicker li a {
+	font-weight: normal;
+	margin: .3em .5em;
+	display: block;
+}
+.ui-daterangepicker li span {
+	float: right;
+	margin: .3em .2em;
+}
+.ui-daterangepicker .title-start, .ui-daterangepicker .title-end {
+	display: block;
+	margin: 0 0 .2em;
+	font-size: 1em;
+	padding: 0 4px 2px;
+}
+.ui-daterangepicker .ui-datepicker-inline {
+	font-size: 1em;
+}
+.ui-daterangepicker-arrows {
+	padding: 2px;
+	width: 204px;
+	position: relative;
+}
+.ui-daterangepicker-arrows input.ui-rangepicker-input {
+	width: 158px;
+	margin: 0 2px 0 20px;
+	padding: 2px;
+	height: 1.1em;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev, .ui-daterangepicker-arrows .ui-daterangepicker-next
{
+	position: absolute;
+	top: 2px; 
+	padding: 1px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev {
+	left: 2px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-next {
+	right: 2px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev:hover, 
+.ui-daterangepicker-arrows .ui-daterangepicker-next:hover,
+.ui-daterangepicker-arrows .ui-daterangepicker-prev:focus, 
+.ui-daterangepicker-arrows .ui-daterangepicker-next:focus {
+	padding: 0;
+}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c1685f61/Allura/allura/public/nf/js/stats.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/stats.js b/Allura/allura/public/nf/js/stats.js
index 72e12dc..efbf938 100644
--- a/Allura/allura/public/nf/js/stats.js
+++ b/Allura/allura/public/nf/js/stats.js
@@ -100,25 +100,18 @@ function chartProjectStats(url, params, series, checkEmpty, tooltipFormat){
         if (previousPoint !== item.dataIndex) {
           previousPoint = item.dataIndex;
 
-          $("#tooltip").remove();
+          $(".chart-tooltip").remove();
           var x = item.datapoint[0].toFixed(0),
           y = item.datapoint[1].toFixed(0);
 
-          $('<div id="tooltip" class="tooltip">' + tooltipFormat(x,y,item) + '</div>').css(
{
-            position: 'absolute',
-            display: 'none',
+          $('<div class="chart-tooltip">' + tooltipFormat(x,y,item) + '</div>').css(
{
             top: item.pageY - 5,
             left: item.pageX + 5,
-            zIndex: 1,
-            background: 'white',
-            border: '1px solid black',
-            borderRadius: '0.5em',
-            padding: '0 0.3em',
           }).appendTo("body").fadeIn(200);
         }
       }
       else {
-        $("#tooltip").remove();
+        $(".chart-tooltip").remove();
         previousPoint = null;
       }
   });

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c1685f61/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html
index a6587b3..e05506b 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html
@@ -54,6 +54,7 @@
 
 {% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{{g.forge_static('css/smoothness/jquery-ui-1.8.4.custom.css')}}"/>
+<link rel="stylesheet" type="text/css" href="{{g.forge_static('css/forge/ui.daterangepicker.css')}}"/>
 {% endblock %}
 
 {% block extra_js %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c1685f61/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index d62c09f..30ded2a 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -22,6 +22,7 @@ Allura/allura/lib/widgets/resources/js/jquery.textarea.js
 Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
 Allura/allura/public/nf/css/blueprint/
 Allura/allura/public/nf/css/forge/accordion.css
+Allura/allura/public/nf/css/forge/ui.daterangepicker.css
 Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
 Allura/allura/public/nf/images/beta_sf.psd
 Allura/allura/public/nf/js/jquery-base.js


Mime
View raw message