Update Slaprunner Layout

slapos/runner/fileBrowser.py

@@ -212,7 +212,7 @@ class FileBrowser(object):
       return '{result: \'1\'}'
     raise NameError('NOT ALLOWED OPERATION : File or directory already exist')
 
-  def readFile(self, dir, filename, truncate=0):
+  def readFile(self, dir, filename, truncate=False):
     """Read file dir/filename and return content"""
     realfile = realpath(self.config, os.path.join(urllib.unquote(dir),
                         urllib.unquote(filename)))
@@ -220,7 +220,7 @@ class FileBrowser(object):
       raise NameError('Could not load directory %s: Permission denied' % dir)
     if not isText(realfile):
       return "FILE ERROR: Cannot display binary file, please open a text file only!"
-    if truncate == 0:
+    if not truncate:
       return open(realfile, 'r').read()
     else:
-      tail(open(realfile, 'r'), 0)
+      return tail(open(realfile, 'r'), 0)

slapos/runner/static/css/styles.css

@@ -166,14 +166,14 @@ overflow-y: scroll;
 
 .wmenu ul li a{
     display:block;
-    height: 18px;
+    height: 20px;
     Color:#000;
     /*background: url(../images/sep.png) right center no-repeat;*/
     border-right: 1px solid #c2c2c2;
     /*font-weight:bold;*/
     font-size:15px;
     text-decoration:none;
-    padding:8px 10px 8px 10px;
+    padding:7px 10px 7px 10px;
 }
 .wmenu ul li:last-child a {border: none}
 
@@ -514,6 +514,7 @@ h2.hight:hover{
 .log_btn{border: 1px solid #678dad; border-top:none; height: 22px; width: 654px; margin: 0 40px 10px 40px;
     padding:4px 10px 4px 10px; font-size: 16px; color: #4c6172;}
 .log p{white-space: pre-wrap; width:100%}
+.log p.info{white-space: pre-wrap; width:98%; font-size: 15px; margin: 5px; color:red;}
 
 .waitting{
     margin-left: 10px;
@@ -699,7 +700,7 @@ div.sep{display:block; height:7px;}
 .popup td.top img { display: block; }
 .popup td#bottomright { background-image: url(../images/bubble-1.png); }
 .popup-contents {background: #fff; color: #666666;}
-.popup a{display: block; font-weight:bold;  color: #4DA0C6; padding-left: 5px;}
+.popup a{display: block; font-weight:bold;  color: #4DA0C6; padding-left: 5px; padding-bottom: 5px;}
 .popup a:hover{color: #666666;}
 .popup ul{margin:0; margin-bottom:10px; padding:0; list-style:none;}
 .popup li{border-bottom: 1px dashed #666666; padding:0;}

slapos/runner/static/js/scripts/inspectInstance.js

@@ -212,6 +212,9 @@ $(document).ready(function () {
             url: $SCRIPT_ROOT + '/getParameterXml/xml',
             success: function (data) {
                 if (data.code === 1) {
+                    $("#loadxml").unbind('click');
+                    $.colorbox.remove();
+                    $("#inline_instance").empty();
                     $("#inline_instance").html(content);
                     setupEditor(true);
                     $("a#inlineInstance").colorbox(

slapos/runner/templates/instanceInspect.html

@@ -62,7 +62,7 @@
           </h2>
           <div class="clear"></div><br/>
           <div id="bcontent{{item[0]}}">
-            <table cellpadding="0" cellspacing="0" width="577">
+            <table cellpadding="0" cellspacing="0" width="100%">
             <tr>
                <th>Parameter Name</th><th>Parameter Value</th>
             </tr>
@@ -143,6 +143,5 @@
 
 </div>
 </div>
-{{instance}}
 {% endblock %}
 

slapos/runner/templates/layout.html

@@ -124,6 +124,7 @@
             <li><a href="{{ url_for('configRepo')}}" >Clone your repository</a></li>
             <li><a href="{{ url_for('openProject', method='open')}}">Open Software Release</a></li>
             <li><a href="{{ url_for('openProject', method='new')}}">Create Software Release</a></li>
+            <li style="heigth:1px"></li>
           </ul>
       </div>
     </body>

slapos/runner/templates/updateSoftwareProfile.html

@@ -23,10 +23,8 @@
     </dl>
 </form>
 <div id="tooltip-editOption" style="display:none">
-  <span class="list">MD5 SUM for the current file</span>
+  <span class="list">Current profile options</span>
     <a id='getmd5' href="#">Get or Update md5sum</a>
-    <div class="sep"></div>
-    <span class="list">Curent software release</span>
     <a href="{{ url_for('editCurrentProject')}}">Edit software release files</a>
     <div class="sep"></div>
     <span class="list">Add Project to Develop</span>