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

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Poirier <theeth@yahoo.com>2012-02-10 05:10:55 +0400
committerMartin Poirier <theeth@yahoo.com>2012-02-10 05:10:55 +0400
commit463a388e44420289110c2f39fd01863ccda0b5bb (patch)
tree4e1cd56c8fe8eef1b5cfc4ef78332bbc2b618f8c /netrender
parentf9f04ce37a22fad60de3821d0728c4b1a4346032 (diff)
netrender
New web ui work by Philippe Van Hecke: JQuery ui theme selector.
Diffstat (limited to 'netrender')
-rw-r--r--netrender/js/netrender.js8
-rw-r--r--netrender/newui.html1
2 files changed, 7 insertions, 2 deletions
diff --git a/netrender/js/netrender.js b/netrender/js/netrender.js
index 7e561f78..5dc61ef8 100644
--- a/netrender/js/netrender.js
+++ b/netrender/js/netrender.js
@@ -35,7 +35,7 @@ var maxItemsperTable = 10;
function setupPage() {
/*$.themes.init({themeBase: 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/', icons: '/html/css/images/themes.gif',previews: '/html/css/images/themes-preview.gif'});*/
- $('body').addClass("ui-widget-overlay");
+ $('body').addClass("ui-widget-content");
setupJobsPanel();
setupSlavesPanel();
setupConfigPanel();
@@ -217,6 +217,10 @@ function setupConfigPanel() {
$("#Interface").append('<a id="oldinterface" href="/">');
$("#oldinterface").html('Simple Interface');
$("#oldinterface").button();
+ $("#Interface").append('<div>Select the jquery theme you want to use</div>');
+ $("#Interface").append('<div id="switcher">');
+ $('#switcher').themeswitcher();
+
}
return "";
}
@@ -516,4 +520,4 @@ function showJob(id, name) {
$.getJSON("/html/job_" + id, null, retJobData);
-} \ No newline at end of file
+}
diff --git a/netrender/newui.html b/netrender/newui.html
index cdac2e01..286b213d 100644
--- a/netrender/newui.html
+++ b/netrender/newui.html
@@ -9,6 +9,7 @@
<script type="text/javascript" src="/html/js/netrender.js"></script>
<script type="text/javascript" src="/html/js/netrender-widget.js"></script>
<script type="text/javascript" src="/html/js/netrender-action.js"></script>
+ <script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
<script type="text/javascript">
// we will add our javascript code here
var doc=$(document).ready(function(){var page=setupPage();});