Improve webrunner design

slapos/runner/static/css/jqueryTabs.css

@@ -2,7 +2,7 @@
     background: #D5D5D5;
     padding:3px;
     /*position:relative;*/
-    width:930px;
+    width:972px;
     font-size: 14px;
     border-radius: 4px 4px 0 0;
 }

slapos/runner/static/css/styles.css

-*{margin: 0px;padding: 0px;}
 ol, ul {list-style: none outside none;}
 blockquote, q {quotes: none;}
 blockquote:before, blockquote:after, q:before, q:after {content: none;}
@@ -8,7 +7,7 @@ img{border:0}
 /*YAHOO RESET FONT*/
 html{color:#000;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,select,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,button,caption,cite,code,dfn,em,input,optgroup,option,select,strong,textarea,th,var{font:inherit}del,ins{text-decoration:none}li{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:''}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:baseline}sub{vertical-align:baseline}legend{color:#000}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}select,input,textarea,button{font:99% arial,helvetica,clean,sans-serif}table{font-size:inherit;font:100%}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
 body{
-  background: #8DABB4;/* #A2BDC5;*/
+  background: #6A93A0;/*#8DABB4;/* #A2BDC5;*/
   height:100%;
 }
 
@@ -61,7 +60,7 @@ body {
 #page
 {
 	margin: 10px auto;
-	width: 1014px;
+	width: 1032px;
 }
 
 #logo{
@@ -69,9 +68,9 @@ body {
 }
 
 #header{
-    height: 73px;
+    height: 78px;
     padding-top: 10px;
-    width: 1014px;
+    width: 1032px;
     background: url(../images/head.png) no-repeat;
 }
 
@@ -111,7 +110,7 @@ body {
     height: 22px;
     text-align: center;
     color: #4c6172;
-    text-shadow: 0 1px 1px #F1F1F1;
+    text-shadow: 0 1px 1px #DBDBDB;
     overflow: hidden;
 }
 #header .line{
@@ -126,7 +125,7 @@ body {
 }
 
 #wmenu{
-  margin: 1px 11px 1px 10px;
+  margin: 1px 7px 1px 10px;
 }
 
 #wmenu ul{
@@ -140,8 +139,8 @@ body {
 #main
 {
     background: url(../images/main_bg_all.png) repeat-y;
-    padding-left: 24px;
-    padding-right: 24px;
+    padding-left: 17px;
+    padding-right: 17px;
     min-height: 400px;
 }
 
@@ -155,17 +154,15 @@ body {
 }
 
 .main_head{
-    height: 14px;
+    height: 10px;
     background: url(../images/main_top.png) no-repeat;
-    width: 966px;
+    width: 998px;
 }
 
 .content{
     background: url(../images/content.png) repeat-y;
-    width: 936px;
-    padding: 15px;
-    padding-top:1px;
-    padding-bottom:2px;
+    width: 978px;
+    padding: 0 10px;
     min-height: 400px;
 }
 
@@ -193,21 +190,21 @@ body {
 }
 
 .main_foot{
-    height: 15px;
+    height: 10px;
     background: url(../images/main_bottom.png) no-repeat;
-    width: 966px;
+    width: 998px;
 }
 
 #footer{
-    height: 35px;
-    width: 934px;
+    height: 33px;
+    width: 952px;
     background: url(../images/footer_bg.png) no-repeat;
     padding-left: 40px;
     padding-right: 40px;
-    padding-top: 4px;
+    padding-top: 7px;
     text-align: center;
     color: #4c6172;
-    text-shadow: 0px 1px 1px #fff;
+    text-shadow: 0px 1px 1px #DBDBDB;
 }
 .dsblebutton{color:#9C9C9C; padding: 5px 10px;display: inline;background: #eee;
         font-weight: bold; border:1px solid #000; margin-top:10px;}
@@ -386,7 +383,7 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 }
 
 .file_tree {
-    width: 923px;
+    /*width: 923px;*/
     height: 250px;
     border: solid 1px #678dad;
     background: #fff;
@@ -402,7 +399,7 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 }
 
 .file_tree_short{
-    width: 238px;
+    width: 252px;
     height: 429px;
     border: solid 1px #678dad;
     background: #fff;
@@ -419,12 +416,11 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 }
 #code{
     float: right;
-    width: 692px;
+    width: 720px;
 }
 #details_head{margin-bottom: 10px;}
 
 #contentInfo{
-    width: 882px;
     border: solid 1px #678dad;
     background: #fff;
     overflow: auto;
@@ -441,7 +437,7 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 .log_content{
     border: solid 1px #519ADA;
     padding: 2px;
-    width: 719px;
+    width: 761px;
     float: left;
 }
 
@@ -457,7 +453,6 @@ padding: 10px;height: 80px;padding-bottom:15px;}
     border: none;
     background: #f6f7f8;
     color: #000;
-    width: 715px;
     padding: 2px;
     height: 450px;
     resize: both;
@@ -723,9 +718,9 @@ div.sep{display:block; height:7px;}
 .show{background:#D5D5D5 url(../images/arrow_up.png) 97% 50% no-repeat; cursor: pointer;}
 .hide{background:#D5D5D5 url(../images/arrow_down.png) 97% 50% no-repeat; cursor: pointer;}
 
-.menu-box-left{float:left; width: 135px; font-size:14px; background: #e4e4e4; padding:5px 0 5px 5px; margin-top:10px;
+.menu-box-left{float:left; width: 162px; font-size:14px; background: #e4e4e4; padding:5px 0 5px 5px; margin-top:10px;
     font-size:14px; border-radius: 4px 0 0 4px;}
-.menu-box-right{background: #e4e4e4; padding: 5px; float:right; width: 745px; margin-left: -5px;
+.menu-box-right{background: #e4e4e4; padding: 5px; float:right; width: 760px; margin-left: -5px;
     margin-top:10px; box-shadow: 1px 1px 1px #888888;}
 .menu-box-left ul{margin:0px; list-style:none;}
 .menu-box-left li{padding: 2px; padding-left:10px; padding-right:10px; text-shadow: 0px 1px #fff;border-bottom:1px solid #fff;}

slapos/runner/static/js/scripts/process.js

@@ -253,7 +253,7 @@ function runProcess(urlfor, data) {
     }
 }
 
-setInterval('GetStateRegularly()', 5000);
+//setInterval('GetStateRegularly()', 5000);
 function GetStateRegularly() {
     getRunningState();
 }

slapos/runner/static/js/scripts/softwareFolder.js

@@ -1037,7 +1037,7 @@ $(document).ready(function () {
       $("#plist li").each(function (index) {
           var elt = $(this).find("input:checkbox");
           if (elt.is(":checked")) {
-              developList[i] = workdir + "/" + elt.val();
+              developList[i] = "workspace" + "/" + elt.val();
               i += 1;
               elt.attr("checked", false);
           }

slapos/runner/templates/account.html

@@ -2,12 +2,11 @@
 {% block title %}Update your account{% endblock %}
 {% block head %}
   {{ super() }}
-  <script src="{{ url_for('static', filename='js/scripts/account.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/account.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/jqueryTabs.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jqueryTabs.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jqueryTabs.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
-<h2>Web runner parameters</h2><br/>
 <div id="tabContainer">
   <ul>
     <li><a href="#tab1" class="active">Your personal information</a></li>

slapos/runner/templates/editFile.html

@@ -2,10 +2,10 @@
 {% block title %}Edit {{filename}}{% endblock %}
 {% block head %}
   {{ super() }}
-    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/theme-crimson_editor.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/mode-buildout.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/editor.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/theme-crimson_editor.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/mode-buildout.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/editor.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 <form method=post class=add-entry>

slapos/runner/templates/instanceInspect.html

@@ -3,17 +3,16 @@
 {% block head %}
   {{ super() }}
   <link href="{{ url_for('static', filename='css/jqueryTabs.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jqueryTabs.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jqueryTabs.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/inspectInstance.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/inspectInstance.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/gsFileManager.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 <input type='hidden' name='root' id='root' value='{%if file_path != "" %}{{file_path}}{%endif%}' />
 <input type="hidden" name="partition_amount" id="partitionAmount" value="{{ partition_amount }}" />
-<h2>Instance inspection</h2><br/>
 <div id="tabContainer">
     <ul>
       <li><a href="#tab1" class="active">Process</a></li>

slapos/runner/templates/layout.html

@@ -15,18 +15,18 @@
     <link href="{{ url_for('static', filename='css/superfish.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
     <link href="{{ url_for('static', filename='css/jquery-ui-1.10.3.custom.min.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
 
-    <script src="{{ url_for('static', filename='js/jquery/jquery-1.10.2.min.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/jquery/jquery-ui-1.10.3.custom.min.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/jquery/jquery.form.js') }}" type="text/javascript" charset="utf-8"></script>
-  	<script src="{{ url_for('static', filename='js/jquery/popupBox.js') }}" type="text/javascript" charset="utf-8"></script>
-  	<script src="{{ url_for('static', filename='js/jquery/jqueryToolTip.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/jquery/superfish.min.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/jquery/hoverIntent.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/jquery/jquery-1.10.2.min.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/jquery/jquery-ui-1.10.3.custom.min.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/jquery/jquery.form.js') }}" type="application/javascript" charset="utf-8"></script>
+  	<script src="{{ url_for('static', filename='js/jquery/popupBox.js') }}" type="application/javascript" charset="utf-8"></script>
+  	<script src="{{ url_for('static', filename='js/jquery/jqueryToolTip.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/jquery/superfish.min.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/jquery/hoverIntent.js') }}" type="application/javascript" charset="utf-8"></script>
     <script type=text/javascript>
       $SCRIPT_ROOT = {{ request.script_root|tojson|safe }};
     </script>
-  	<script src="{{ url_for('static', filename='js/scripts/cookies.js') }}" type="text/javascript" charset="utf-8"></script>
-  	<script src="{{ url_for('static', filename='js/scripts/common.js') }}" type="text/javascript" charset="utf-8"></script>
+  	<script src="{{ url_for('static', filename='js/scripts/cookies.js') }}" type="application/javascript" charset="utf-8"></script>
+  	<script src="{{ url_for('static', filename='js/scripts/common.js') }}" type="application/javascript" charset="utf-8"></script>
     <script type="text/javascript">
     	$(document).ready(function() {
         setInput();
@@ -34,10 +34,10 @@
     	});
     </script>
     {% if request.path != '/login' %}
-    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/ext-modelist.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/ext-language_tools.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/scripts/process.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/ext-modelist.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/ext-language_tools.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/scripts/process.js') }}" type="application/javascript" charset="utf-8"></script>
     <script type="text/javascript">
   		$(document).ready(function() {
     		if($("input#fmsg").val() != ""){

slapos/runner/templates/login.html

 {% extends "layout.html" %}
 {% block head %}
   {{ super() }}
-  <script src="{{ url_for('static', filename='js/scripts/login.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/login.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 <form method="POST" action="">

slapos/runner/templates/manageRepository.html

@@ -5,11 +5,11 @@
   <link href="{{ url_for('static', filename='css/gsFileManager.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
   <link href="{{ url_for('static', filename='css/jqueryTabs.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
   <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/cloneRepo.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/repo.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/jquery/jqueryTabs.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/cloneRepo.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/repo.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jqueryTabs.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 <div id="tabContainer">

slapos/runner/templates/projectFolder.html

@@ -3,8 +3,8 @@
 {% block head %}
   {{ super() }}
   <link href="{{ url_for('static', filename='css/ui.fancytree.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/project.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/project.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 

slapos/runner/templates/runResult.html

@@ -2,11 +2,11 @@
 {% block title %}Webrunner software Inspection{% endblock %}
 {% block head %}
   {{ super() }}
-  <script src="{{ url_for('static', filename='js/scripts/inspectSoftware.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/inspectSoftware.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/gsFileManager.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="application/javascript" charset="utf-8"></script>
 
 {% endblock %}
 {% block body %}

slapos/runner/templates/shell.html

 {% extends "layout.html" %}
+{% block title %}Terminal{% endblock %}
 {% block body %}
 <iframe id="shellinabox" src="/shellinabox"></iframe>
 {% endblock %}

slapos/runner/templates/softwareFolder.html

@@ -5,11 +5,11 @@
   <link href="{{ url_for('static', filename='css/ui.fancytree.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
   <link href="{{ url_for('static', filename='css/jquery.contextMenu.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
   <link href="{{ url_for('static', filename='css/editor.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.contextMenu-custom.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.contextMenu-custom.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/softwareFolder.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/softwareFolder.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 <style>
@@ -69,6 +69,7 @@
   <div class="clear"></div>
 </div>
 <div id="file_info" class="file_info"><span id="info"></span></div>
+<div class='clear'></div>
 </form>
 
 

slapos/runner/templates/updateInstanceProfile.html

@@ -2,10 +2,10 @@
 {% block title %}Update instance profile{% endblock %}
 {% block head %}
   {{ super() }}
-    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/theme-crimson_editor.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/mode-buildout.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/editor.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/theme-crimson_editor.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/mode-buildout.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/editor.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 <form method=post class=add-entry>

slapos/runner/templates/updateSoftwareProfile.html

@@ -2,10 +2,10 @@
 {% block title %}Update software profile{% endblock %}
 {% block head %}
   {{ super() }}
-    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/theme-crimson_editor.js') }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ url_for('static', filename='js/ace/mode-buildout.js') }}" type="text/javascript" charset="utf-8"></script>
-  <script src="{{ url_for('static', filename='js/scripts/editor.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/ace.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/theme-crimson_editor.js') }}" type="application/javascript" charset="utf-8"></script>
+    <script src="{{ url_for('static', filename='js/ace/mode-buildout.js') }}" type="application/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/editor.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 <form method=post class=add-entry>

slapos/runner/templates/viewLog.html

@@ -2,11 +2,11 @@
 {% block title %}View log{% endblock %}
 {% block head %}
   {{ super() }}
-  <script src="{{ url_for('static', filename='js/scripts/viewlog.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/viewlog.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/ui.fancytree.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="application/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
 

slapos/runner/templates/workspace.html

@@ -2,11 +2,11 @@
 {% block title %}Browse webrunner workspace{% endblock %}
 {% block head %}
   {{ super() }}
-  <script src="{{ url_for('static', filename='js/scripts/workspace.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/scripts/workspace.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="application/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/gsFileManager.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ url_for('static', filename='js/jquery/gsFileManager.js') }}" type="application/javascript" charset="utf-8"></script>
 
 {% endblock %}
 {% block body %}