summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-07 14:41:01 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-07 14:41:01 +0200
commite43fb935d3242d82907be992c6a2c80f832ed1d0 (patch)
tree484d8d65ed70a00f5341cd08c35afac8bda57dbf /app/assets
parent0b00ea6998b3acf3804fe61e9d6900999e33ab53 (diff)
downloadgitlab-ci-e43fb935d3242d82907be992c6a2c80f832ed1d0.tar.gz
Use build id for url. Use trace_html for rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/build.coffee8
-rw-r--r--app/assets/stylesheets/sections/builds.scss9
2 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/build.coffee b/app/assets/javascripts/build.coffee
index 6c86fee..b21b34d 100644
--- a/app/assets/javascripts/build.coffee
+++ b/app/assets/javascripts/build.coffee
@@ -1,10 +1,10 @@
class Build
@interval: null
- constructor: (build_url, build_status, loader_html) ->
+ constructor: (build_url, build_status) ->
clearInterval(Build.interval)
- if build_status = "running" || build_status == "pending"
+ if build_status == "running" || build_status == "pending"
#
# Bind autoscroll button to follow build output
#
@@ -28,8 +28,8 @@ class Build
dataType: "json"
success: (build) =>
if build.status == "running"
- $('#build-trace').text build.trace
- $('#build-trace').append loader_html
+ $('#build-trace code').html build.trace_html
+ $('#build-trace code').append '<i class="icon-refresh icon-spin"/>'
@checkAutoscroll()
else
Turbolinks.visit build_url
diff --git a/app/assets/stylesheets/sections/builds.scss b/app/assets/stylesheets/sections/builds.scss
index f9b17dd..2e61902 100644
--- a/app/assets/stylesheets/sections/builds.scss
+++ b/app/assets/stylesheets/sections/builds.scss
@@ -1,6 +1,6 @@
pre.trace {
- background: #000;
- color:#fff;
+ background: #111111;
+ color: #fff;
font-family: $monospace_font;
white-space: pre;
white-space: pre-wrap; /* css-3 */
@@ -11,6 +11,11 @@ pre.trace {
overflow: auto;
overflow-y: hidden;
font-size: 12px;
+
+ .icon-refresh {
+ font-size: 24px;
+ margin-left: 20px;
+ }
}
.autoscroll-container {