[Branch,~linaro-validation/lava-scheduler/trunk] Rev 262: update to latest version of trunk

Message ID 20130917212324.28197.98971.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Fu Wei Fu Sept. 17, 2013, 9:23 p.m.
Merge authors:
  Antonio Terceiro (terceiro)
  Neil Williams (codehelp)
Related merge proposals:
  https://code.launchpad.net/~terceiro/lava-scheduler/new-theme/+merge/185143
  proposed by: Antonio Terceiro (terceiro)
  review: Approve - Antonio Terceiro (terceiro)
  https://code.launchpad.net/~codehelp/lava-scheduler/docs-location/+merge/184965
  proposed by: Neil Williams (codehelp)
  review: Approve - Antonio Terceiro (terceiro)
------------------------------------------------------------
revno: 262 [merge]
committer: Fu Wei <fu.wei@linaro.org>
branch nick: lmp
timestamp: Thu 2013-09-12 14:01:06 +0800
message:
  update to latest version of trunk
added:
  lava_scheduler_app/static/lava_scheduler_app/css/shThemeLAVA.css
modified:
  doc/installation.rst
  lava_scheduler_app/templates/lava_scheduler_app/job_definition.html
  lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html


--
lp:lava-scheduler
https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk

You are subscribed to branch lp:lava-scheduler.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription

Patch

=== modified file 'doc/installation.rst'
--- doc/installation.rst	2013-01-23 15:54:02 +0000
+++ doc/installation.rst	2013-09-11 15:55:32 +0000
@@ -2,5 +2,5 @@ 
 ^^^^^^^^^^^^
 
 The scheduler should be installed along with all other LAVA components and
-prerequisites by using the `lava-deployment-tool <http://lava-deployment-tool.readthedocs.org/en/latest/index.html>`_
-
+prerequisites by using the `lava-deployment-tool </static/docs/deployment-tool.html>`_
+documentation on any LAVA instance.

=== added file 'lava_scheduler_app/static/lava_scheduler_app/css/shThemeLAVA.css'
--- lava_scheduler_app/static/lava_scheduler_app/css/shThemeLAVA.css	1970-01-01 00:00:00 +0000
+++ lava_scheduler_app/static/lava_scheduler_app/css/shThemeLAVA.css	2013-09-11 19:21:44 +0000
@@ -0,0 +1,9 @@ 
+.syntaxhighlighter {
+  background-color: transparent !important;
+}
+.syntaxhighlighter .line.alt1 {
+  background-color: white !important;
+}
+.syntaxhighlighter .line.alt2 {
+  background-color: transparent !important;
+}

=== modified file 'lava_scheduler_app/templates/lava_scheduler_app/job_definition.html'
--- lava_scheduler_app/templates/lava_scheduler_app/job_definition.html	2013-08-16 08:47:46 +0000
+++ lava_scheduler_app/templates/lava_scheduler_app/job_definition.html	2013-09-11 19:21:44 +0000
@@ -7,6 +7,7 @@ 
 
 <link href="{{ STATIC_URL }}lava_scheduler_app/css/shCore.css" rel="stylesheet" type="text/css" />
 <link href="{{ STATIC_URL }}lava_scheduler_app/css/shThemeDefault.css" rel="stylesheet" type="text/css" />
+<link href="{{ STATIC_URL }}lava_scheduler_app/css/shThemeLAVA.css" rel="stylesheet" type="text/css" />
 {% endblock %}
 
 {% block content %}

=== modified file 'lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html'
--- lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html	2013-08-16 08:47:46 +0000
+++ lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html	2013-09-11 19:21:44 +0000
@@ -7,6 +7,7 @@ 
 
 <link href="{{ STATIC_URL }}lava_scheduler_app/css/shCore.css" rel="stylesheet" type="text/css" />
 <link href="{{ STATIC_URL }}lava_scheduler_app/css/shThemeDefault.css" rel="stylesheet" type="text/css" />
+<link href="{{ STATIC_URL }}lava_scheduler_app/css/shThemeLAVA.css" rel="stylesheet" type="text/css" />
 {% endblock %}
 
 {% block content %}