Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-06-01 00:30:54 +0400
committerrandx <dmitriy.zaporozhets@gmail.com>2012-06-01 00:31:17 +0400
commita719bfc9313545bbba5ae2479790b8902d98bb3e (patch)
treed0ffb1ad1a5518fa1cf0ca7611892d53f5281d10
parentbcfdacf0d438b0b4b78b603593119eb6b964aa8a (diff)
Graph: navigation with keyboard
-rw-r--r--app/assets/javascripts/graph.js9
-rw-r--r--app/assets/stylesheets/common.scss36
-rw-r--r--app/views/projects/graph.html.haml8
-rw-r--r--vendor/assets/javascripts/branch-graph.js8
4 files changed, 43 insertions, 18 deletions
diff --git a/app/assets/javascripts/graph.js b/app/assets/javascripts/graph.js
new file mode 100644
index 00000000000..163aa13e03b
--- /dev/null
+++ b/app/assets/javascripts/graph.js
@@ -0,0 +1,9 @@
+function initGraphNav() {
+ $("body").keydown(function(e) {
+ if(e.keyCode == 37) { // left
+ $(".graph svg").animate({ left: "+=400" });
+ } else if(e.keyCode == 39) { // right
+ $(".graph svg").animate({ left: "-=400" });
+ }
+ });
+}
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1397ed77983..79a5366e483 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -413,18 +413,6 @@ a.project-update.titled {
top:0;
}
}
-/**
- * Project graph
- */
-#holder {
- cursor: move;
- height: 70%;
- overflow: hidden;
- background:white;
- border: 1px solid $style_color;
-}
-
-
input.git_clone_url {
width:325px;
@@ -889,3 +877,27 @@ li.note {
@extend .primary;
}
}
+
+.graph_holder {
+ border: 1px solid #aaa;
+ padding:1px;
+
+
+ h4 {
+ padding:0 10px;
+ border-bottom: 1px solid #bbb;
+ background:#eee;
+ background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
+ background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
+ background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
+ background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
+ }
+
+ .graph {
+ background: #f1f1f1;
+ cursor: move;
+ height: 70%;
+ overflow: hidden;
+ }
+
+}
diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml
index 799b4e4e369..804ad9df6f3 100644
--- a/app/views/projects/graph.html.haml
+++ b/app/views/projects/graph.html.haml
@@ -1,10 +1,14 @@
-%h3 Network Graph
+%h3 Project Network Graph
%br
-#holder.graph
+.graph_holder
+ %h4
+ %small You can move around the graph by using arrow keys.
+ #holder.graph
:javascript
var chunk1={commits:#{@commits_json}};
var days=#{@days_json};
initGraph();
$(function(){
branchGraph($("#holder")[0]);
+ initGraphNav();
});
diff --git a/vendor/assets/javascripts/branch-graph.js b/vendor/assets/javascripts/branch-graph.js
index 3276886e77d..ad6ceae17c8 100644
--- a/vendor/assets/javascripts/branch-graph.js
+++ b/vendor/assets/javascripts/branch-graph.js
@@ -37,17 +37,17 @@ function branchGraph(holder) {
r = Raphael("holder", cw, ch),
top = r.set();
var cuday = 0, cumonth = "";
- r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#FFF"});
- r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#f1f1f1"});
+ r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#222"});
+ r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#444"});
for (mm = 0; mm < days.length; mm++) {
if(days[mm] != null){
if(cuday != days[mm][0]){
- r.text(10 + mm * 20, 40, days[mm][0]).attr({font: "14px Fontin-Sans, Arial", fill: "#444"});
+ r.text(10 + mm * 20, 40, days[mm][0]).attr({font: "14px Fontin-Sans, Arial", fill: "#DDD"});
cuday = days[mm][0]
}
if(cumonth != days[mm][1]){
- r.text(10 + mm * 20, 15, days[mm][1]).attr({font: "14px Fontin-Sans, Arial", fill: "#474D57"});
+ r.text(10 + mm * 20, 15, days[mm][1]).attr({font: "14px Fontin-Sans, Arial", fill: "#EEE"});
cumonth = days[mm][1]
}