Skip to content

Commit

Permalink
Remove theme configuration logic. There is now only one visualiser st…
Browse files Browse the repository at this point in the history
…yle.
  • Loading branch information
Stephen Pascoe authored and Stephen Pascoe committed Aug 20, 2015
1 parent 83c33ff commit 621e1f6
Showing 7 changed files with 20 additions and 563 deletions.
5 changes: 0 additions & 5 deletions doc/configuration.rst
Original file line number Diff line number Diff line change
@@ -467,11 +467,6 @@ worker-disconnect-delay
scheduler before removing it and marking all of its running tasks as
failed. Defaults to 60.

visualizer-theme
Selects the theme of the visualizer application. The root URL
``http://<host>:<port>/`` will redirect to the theme's URL according
to this option. Possible values are ``default`` or ``retro``.


[spark]
-------
3 changes: 0 additions & 3 deletions luigi/scheduler.py
Original file line number Diff line number Diff line change
@@ -99,9 +99,6 @@ class scheduler(Config):

record_task_history = parameter.BoolParameter(default=False)

# visualizer_theme selects between default and retro themes
visualizer_theme = parameter.Parameter(default='default', config_path=dict(section='scheduler', name='visualizer-theme'))

prune_on_get_work = parameter.BoolParameter(default=False)


9 changes: 1 addition & 8 deletions luigi/server.py
Original file line number Diff line number Diff line change
@@ -214,14 +214,7 @@ def get(self, path):
class RootPathHandler(BaseTaskHistoryHandler):

def get(self):
visualizer_theme = self._scheduler._config.visualizer_theme

if visualizer_theme == "default":
self.redirect("/static/visualiser/theme/default/index.html")
elif visualizer_theme == "retro":
self.redirect(("/static/visualiser/theme/retro/index.html"))
else:
self.redirect("/static/visualiser/theme/default/index.html")
self.redirect("/static/visualiser/index.html")


def app(scheduler):
Original file line number Diff line number Diff line change
@@ -2,24 +2,24 @@
<html lang="en">
<head>
<title>Luigi Task Visualiser</title>
<script src="../../lib/jquery-1.10.0.min.js"></script>
<link href="../../lib/bootstrap3/css/bootstrap.min.css" rel="stylesheet">
<link href="../../lib/bootstrap3/css/bootstrap-theme.min.css" rel="stylesheet">
<script src="../../lib/bootstrap3/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="../../css/tipsy.css">
<link href="../../lib/AdminLTE/css/AdminLTE.min.css" rel="stylesheet"/>
<link href="../../css/font-awesome.min.css" rel="stylesheet"/>
<link href="../../lib/AdminLTE/css/skin-green.min.css" rel="stylesheet"/>
<link href="../../lib/datatables/css/jquery.dataTables.min.css" rel="stylesheet"/>
<script src="../../lib/d3/d3.min.js" charset="utf-8"></script>
<script src="../../lib/d3/dagre-d3.js"></script>
<script src="../../lib/mustache.js"></script>
<script src="../../js/luigi.js"></script>
<script src="../../js/graph.js"></script>
<script src="visualiserApp.js"></script>
<script src="../../js/tipsy.js"></script>
<script src="../../lib/AdminLTE/js/AdminLTE-app.min.js"></script>
<script src="../../lib/datatables/js/jquery.dataTables.min.js"></script>
<script src="lib/jquery-1.10.0.min.js"></script>
<link href="lib/bootstrap3/css/bootstrap.min.css" rel="stylesheet">
<link href="lib/bootstrap3/css/bootstrap-theme.min.css" rel="stylesheet">
<script src="lib/bootstrap3/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="css/tipsy.css">
<link href="lib/AdminLTE/css/AdminLTE.min.css" rel="stylesheet"/>
<link href="css/font-awesome.min.css" rel="stylesheet"/>
<link href="lib/AdminLTE/css/skin-green.min.css" rel="stylesheet"/>
<link href="lib/datatables/css/jquery.dataTables.min.css" rel="stylesheet"/>
<script src="lib/d3/d3.min.js" charset="utf-8"></script>
<script src="lib/d3/dagre-d3.js"></script>
<script src="lib/mustache.js"></script>
<script src="js/luigi.js"></script>
<script src="js/graph.js"></script>
<script src="js/visualiserApp.js"></script>
<script src="js/tipsy.js"></script>
<script src="lib/AdminLTE/js/AdminLTE-app.min.js"></script>
<script src="lib/datatables/js/jquery.dataTables.min.js"></script>

<meta name="viewport" content="width=device-width, initial-scale=1.0">

@@ -480,7 +480,7 @@ <h5>Dependency Graph</h5>


<script>
visualiserApp(new LuigiAPI("../../../../api"));
visualiserApp(new LuigiAPI("../../api"));
</script>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -278,8 +278,6 @@ function visualiserApp(luigi) {
switchTab("workerList");
} else if (hash) {
var taskId = hash.substr(1);
// TODO : Used in SVG visualiser. Do we need it?
//$("#graphContainer").hide();
$("#searchError").empty();
$("#searchError").removeClass();
if (taskId != "g") {
203 changes: 0 additions & 203 deletions luigi/static/visualiser/theme/retro/index.html

This file was deleted.

Loading

0 comments on commit 621e1f6

Please sign in to comment.