Merge branch 'slaprunner'

Conflicts:
	slapos/pubsub/notifier.py

setup.py

@@ -60,22 +60,22 @@ setup(name=name,
           'cloudmgr = slapos.cloudmgr.cloudmgr:main',
           'cloudstart = slapos.cloudmgr.start:main',
           'cloudstop = slapos.cloudmgr.stop:main',
-          'onetimeupload = slapos.onetimeupload:main',
+          'equeue = slapos.equeue:main',
+          'killpidfromfile = slapos.systool:killpidfromfile',
+          'lampconfigure = slapos.lamp:run [lampconfigure]',
           'onetimedownload = slapos.onetimedownload:main',
+          'onetimeupload = slapos.onetimeupload:main',
+          'pubsubnotifier = slapos.pubsub.notifier:main',
+          'pubsubserver = slapos.pubsub:main',
           'shacache = slapos.shacache:main',
           'slapbuilder = slapos.builder:main',
+          'slapcontainer = slapos.container:main',
           'slapmonitor = slapos.monitor:run_slapmonitor',
           'slapmonitor-xml = slapos.monitor:run_slapmonitor_xml',
           'slapreport = slapos.monitor:run_slapreport',
           'slaprunner = slapos.runner:run',
-          'killpidfromfile = slapos.systool:killpidfromfile',
-          'lampconfigure = slapos.lamp:run [lampconfigure]',
-          'equeue = slapos.equeue:main',
-          'pubsubserver = slapos.pubsub:main',
-          'pubsubnotifier = slapos.pubsub.notifier:main',
           'slaprunnertest = slapos.runner.runnertest:main',
           'zodbpack = slapos.zodbpack:run [zodbpack]',
-          'slapcontainer = slapos.container:main',
         ]
       },
     )

slapos/builder/__init__.py

@@ -191,7 +191,7 @@ def run(config):
                                               cert_file]))
       for (src, dst) in [(config.key_file, key_file_dest), (config.cert_file,
         cert_file_dest)]:
-        print "Coping %r to %r, and setting minimum privileges" % (src, dst)
+        print "Coping %r to %r, and setting minimal privileges" % (src, dst)
         if not dry_run:
           shutil.copy(src, dst)
           os.chmod(dst, 0600)

slapos/runner/__init__.py

-from optparse import OptionParser, Option
+# -*- coding: utf-8 -*-
+# vim: set et sts=2:
+# pylint: disable-msg=W0311,C0301,C0103,C0111,R0904,R0903
+
 import ConfigParser
+import datetime
 import logging
 import logging.handlers
+from optparse import OptionParser, Option
 import os
+import slapos.runner.process
 import sys
-import subprocess
-from datetime import timedelta
+from slapos.runner.utils import runInstanceWithLock
+
 
 class Parser(OptionParser):
   """
@@ -13,7 +19,7 @@ class Parser(OptionParser):
   """
   def __init__(self, usage=None, version=None):
     """
-    Initialize all options possibles.
+    Initialize all possible options.
     """
     OptionParser.__init__(self, usage=usage, version=version,
                           option_list=[
@@ -45,6 +51,13 @@ class Parser(OptionParser):
     return options, args[0]
 
 class Config:
+  def __init__(self):
+    self.configuration_file_path = None
+    self.console = None
+    self.log_file = None
+    self.logger = None
+    self.verbose = None
+
   def setConfig(self, option_dict, configuration_file_path):
     """
     Set options given by parameters.
@@ -100,9 +113,13 @@ def run():
     config = Config()
     config.setConfig(*Parser(usage=usage).check_args())
 
+    if os.getuid() == 0:
+        # avoid mistakes (mainly in development mode)
+        raise Exception('Do not run SlapRunner as root.')
+
     serve(config)
     return_code = 0
-  except SystemExit, err:
+  except SystemExit as err:
     # Catch exception raise by optparse
     return_code = err
 
@@ -121,11 +138,13 @@ def serve(config):
     instance_profile='instance.cfg',
     software_profile='software.cfg',
     SECRET_KEY=os.urandom(24),
-    PERMANENT_SESSION_LIFETIME=timedelta(days=31),
+    PERMANENT_SESSION_LIFETIME=datetime.timedelta(days=31),
   )
   if not os.path.exists(workdir):
     os.mkdir(workdir)
   if not os.path.exists(software_link):
     os.mkdir(software_link)
+  slapos.runner.process.setHandler()
+  runInstanceWithLock(app.config)
   app.run(host=config.runner_host, port=int(config.runner_port),
       debug=config.debug, threaded=True)

slapos/runner/decorators.py

+# -*- coding: utf-8 -*-
+# vim: set et sts=2:
+#pylint: disable-all
+
+import json
+
+from flask import Response
+
+
+def as_json(f):
+  def inner(*args, **kwargs):
+    return Response(json.dumps(f(*args, **kwargs)), mimetype='application/json')
+  return inner
+

slapos/runner/fileBrowser.py

 # -*- coding: utf-8 -*-
+# vim: set et sts=2:
+# pylint: disable-msg=W0311,C0301,C0103,C0111
 
-import os
-import urllib
-from flask import jsonify
-from werkzeug import secure_filename
-import shutil
 import datetime
-import hashlib
-from utils import realpath, tail, isText
+import md5
+import os
 import re
+import shutil
+import urllib
 import zipfile
 
-class fileBrowser(object):
+import werkzeug
+from slapos.runner.utils import realpath, tail, isText
+
+
+class FileBrowser(object):
   """This class contain all bases function for file browser"""
 
   def __init__(self, config):
     self.config = config
 
+  def _realdir(self, dir):
+    realdir = realpath(self.config, urllib.unquote(dir))
+    if not realdir:
+      raise NameError('Could not load directory %s: Permission denied' % dir)
+    return realdir
+
   def listDirs(self, dir, all=False):
     """List elements of directory 'dir' taken"""
-    html = ''
-    html += 'var gsdirs = new Array();'
-    html += 'var gsfiles = new Array();'
-    dir = urllib.unquote(str(dir))
+    html = 'var gsdirs = [], gsfiles = [];'
+
+    dir = urllib.unquote(dir)
+    # 'dir' is used below. XXX should not shadow a builtin name
     realdir = realpath(self.config, dir)
     if not realdir:
       raise NameError('Could not load directory %s: Permission denied' % dir)
@@ -31,11 +40,11 @@ class fileBrowser(object):
     for f in ldir:
       if f.startswith('.') and not all: #do not display this file/folder
         continue
-      ff = os.path.join(dir,f)
+      ff = os.path.join(dir, f)
       realfile = os.path.join(realdir, f)
       mdate = datetime.datetime.fromtimestamp(os.path.getmtime(realfile)
                     ).strftime("%Y-%d-%m %I:%M")
-      md5 = hashlib.md5(realfile).hexdigest()
+      md5sum = md5.md5(realfile).hexdigest()
       if not os.path.isdir(realfile):
         size = os.path.getsize(realfile)
         regex = re.compile("(^.*)\.(.*)", re.VERBOSE)
@@ -45,19 +54,17 @@ class fileBrowser(object):
         else:
           ext = str.lower(ext)
         html += 'gsfiles.push(new gsItem("1", "' + f + '", "' + \
-                  ff + '", "' + str(size) + '", "' + md5 + \
-                  '", "' + ext + '", "' + mdate + '"));';
+                  ff + '", "' + str(size) + '", "' + md5sum + \
+                  '", "' + ext + '", "' + mdate + '"));'
       else:
         html += 'gsdirs.push(new gsItem("2", "' + f + '", "' + \
-                  ff + '", "0", "' + md5 + '", "dir", "' + mdate + '"));';
+                  ff + '", "0", "' + md5sum + '", "dir", "' + mdate + '"));'
     return html
 
 
   def makeDirectory(self, dir, filename):
     """Create a directory"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     folder = os.path.join(realdir, filename)
     if not os.path.exists(folder):
       os.mkdir(folder, 0744)
@@ -65,23 +72,20 @@ class fileBrowser(object):
     else:
       return '{result: \'0\'}'
 
+
   def makeFile(self, dir, filename):
     """Create a file in a directory dir taken"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
-    file = os.path.join(realdir, filename)
-    if not os.path.exists(file):
-      open(file, 'w').write('')
+    realdir = self._realdir(dir)
+    fout = os.path.join(realdir, filename)
+    if not os.path.exists(fout):
+      open(fout, 'w')
       return 'var responce = {result: \'1\'}'
     else:
       return '{result: \'0\'}'
 
   def deleteItem(self, dir, files):
     """Delete a list of files or directories"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     lfiles = urllib.unquote(files).split(',,,')
     try:
       for file in lfiles:
@@ -89,22 +93,20 @@ class fileBrowser(object):
         if not os.path.exists(file):
           continue #silent skip file....
         details = file.split('/')
-        last = details[len(details) - 1]
+        last = details[-1]
         if last and last.startswith('.'):
           continue #cannot delete this file/directory, to prevent security
         if os.path.isdir(file):
           shutil.rmtree(file)
         else:
           os.unlink(file)
-    except Exception, e:
+    except Exception as e:
       return str(e)
     return '{result: \'1\'}'
 
   def copyItem(self, dir, files, del_source=False):
     """Copy a list of files or directory to dir"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     lfiles = urllib.unquote(files).split(',,,')
     try:
       for file in lfiles:
@@ -113,7 +115,7 @@ class fileBrowser(object):
           raise NameError('Could not load file or directory %s: Permission denied' % file)
         #prepare destination file
         details = realfile.split('/')
-        dest = os.path.join(realdir, details[len(details) - 1])
+        dest = os.path.join(realdir, details[-1])
         if os.path.exists(dest):
           raise NameError('NOT ALLOWED OPERATION : File or directory already exist')
         if os.path.isdir(realfile):
@@ -124,15 +126,13 @@ class fileBrowser(object):
           shutil.copy(realfile, dest)
           if del_source:
             os.unlink(realfile)
-    except Exception, e:
+    except Exception as e:
       return str(e)
     return '{result: \'1\'}'
 
   def rename(self, dir, filename, newfilename):
     """Rename file or directory to dir/filename"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     realfile = realpath(self.config, urllib.unquote(filename))
     if not realfile:
       raise NameError('Could not load directory %s: Permission denied' % filename)
@@ -144,9 +144,7 @@ class fileBrowser(object):
 
   def copyAsFile(self, dir, filename, newfilename):
     """Copy file or directory to dir/filename"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     fromfile = os.path.join(realdir, filename)
     tofile = os.path.join(realdir, newfilename)
     if not os.path.exists(fromfile):
@@ -158,21 +156,17 @@ class fileBrowser(object):
 
   def uploadFile(self, dir, files):
     """Upload a list of file in directory dir"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     for file in files:
       if files[file]:
-        filename = secure_filename(files[file].filename)
+        filename = werkzeug.secure_filename(files[file].filename)
         if not os.path.exists(os.path.join(dir, filename)):
           files[file].save(os.path.join(realdir, filename))
     return '{result: \'1\'}'
 
   def downloadFile(self, dir, filename):
     """Download file dir/filename"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     file = os.path.join(realdir, urllib.unquote(filename))
     if not os.path.exists(file):
       raise NameError('NOT ALLOWED OPERATION : File or directory does not exist %s'
@@ -181,9 +175,7 @@ class fileBrowser(object):
 
   def zipFile(self, dir, filename, newfilename):
     """Add filename to archive as newfilename"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     tozip = os.path.join(realdir, newfilename)
     fromzip = os.path.join(realdir, filename)
     if not os.path.exists(fromzip):
@@ -192,10 +184,10 @@ class fileBrowser(object):
       zip = zipfile.ZipFile(tozip, 'w', zipfile.ZIP_DEFLATED)
       if os.path.isdir(fromzip):
         rootlen = len(fromzip) + 1
-        for base, dirs, files in os.walk(fromzip):
-          for file in files:
-            fn = os.path.join(base, file).encode("utf-8")
-            zip.write(fn, fn[rootlen:])
+        for base, _, files in os.walk(fromzip):
+          for filename in files:
+            fn = os.path.join(base, filename).encode("utf-8")
+            zip.write(fn, fn[rootlen:])       # XXX can fail if 'fromzip' contains multibyte characters
       else:
         zip.write(fromzip)
       zip.close()
@@ -204,9 +196,7 @@ class fileBrowser(object):
 
   def unzipFile(self, dir, filename, newfilename):
     """Extract a zipped archive"""
-    realdir = realpath(self.config, urllib.unquote(dir))
-    if not realdir:
-      raise NameError('Could not load directory %s: Permission denied' % dir)
+    realdir = self._realdir(dir)
     target = os.path.join(realdir, newfilename)
     archive = os.path.join(realdir, filename)
     if not os.path.exists(archive):
@@ -222,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)))
@@ -230,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/gittools.py

 # -*- coding: utf-8 -*-
+# vim: set et sts=2:
+# pylint: disable-msg=W0311,C0301,C0103,C0111
+
 
-import slapos.slap
-import time
-import subprocess
 import os
 import re
-import urllib
-from flask import jsonify
 import shutil
-import string
-from git import *
 
-class Popen(subprocess.Popen):
-  def __init__(self, *args, **kwargs):
-    kwargs['stdin'] = subprocess.PIPE
-    kwargs['stderr'] = subprocess.STDOUT
-    kwargs.setdefault('stdout', subprocess.PIPE)
-    kwargs.setdefault('close_fds', True)
-    subprocess.Popen.__init__(self, *args, **kwargs)
-    self.stdin.flush()
-    self.stdin.close()
-    self.stdin = None
+from git import Repo
+from flask import jsonify
+
 
 def cloneRepo(data):
   """Clonne a repository
@@ -49,7 +38,7 @@ def cloneRepo(data):
     if data["email"] != "":
       config_writer.set_value("user", "email", data["email"])
     code = 1
-  except Exception, e:
+  except Exception as e:
     json = safeResult(str(e))
     if os.path.exists(workDir):
       shutil.rmtree(workDir)
@@ -70,7 +59,7 @@ def gitStatus(project):
     branch = git.branch().replace(' ', '').split('\n')
     isdirty = repo.is_dirty(untracked_files=True)
     code = 1
-  except Exception, e:
+  except Exception as e:
     json = safeResult(str(e))
   return jsonify(code=code, result=json, branch=branch, dirty=isdirty)
 
@@ -85,7 +74,6 @@ def switchBranch(project, name):
   json = ""
   try:
     repo = Repo(project)
-    branches = repo.branches
     current_branch = repo.active_branch.name
     if name == current_branch:
       json = "This is already your active branch for this project"
@@ -93,7 +81,7 @@ def switchBranch(project, name):
       git  = repo.git
       git.checkout(name)
       code = 1
-  except Exception, e:
+  except Exception as e:
     json = safeResult(str(e))
   return jsonify(code=code, result=json)
 
@@ -115,7 +103,7 @@ def addBranch(project, name, onlyCheckout=False):
     else:
       git.checkout(name)
     code = 1
-  except Exception, e:
+  except Exception as e:
     json = safeResult(str(e))
   return jsonify(code=code, result=json)
 
@@ -127,7 +115,7 @@ def getDiff(project):
     git = repo.git
     current_branch = repo.active_branch.name
     result = git.diff(current_branch)
-  except Exception, e:
+  except Exception as e:
     result = safeResult(str(e))
   return result
 
@@ -157,7 +145,7 @@ def gitPush(project, msg):
     else:
       json = "Nothing to be commited"
       code = 1
-  except Exception, e:
+  except Exception as e:
     if undo_commit:
       git.reset("HEAD~") #undo previous commit
     json = safeResult(str(e))
@@ -169,14 +157,13 @@ def gitPull(project):
   try:
     repo = Repo(project)
     git = repo.git
-    current_branch = repo.active_branch.name
     git.pull()
     code = 1
-  except Exception, e:
+  except Exception as e:
     result = safeResult(str(e))
   return jsonify(code=code, result=result)
 
 def safeResult(result):
   """Parse string and remove credential of the user"""
-  regex=re.compile("(https:\/\/)([\w\d\._-]+:[\w\d\._-]+)\@([\S]+\s)", re.VERBOSE)
+  regex = re.compile("(https:\/\/)([\w\d\._-]+:[\w\d\._-]+)\@([\S]+\s)", re.VERBOSE)
   return regex.sub(r'\1\3', result)

slapos/runner/process.py

+import os
+import psutil
+import signal
+import subprocess
+import sys
+
+SLAPRUNNER_PROCESS_LIST = []
+
+
+class Popen(subprocess.Popen):
+  """
+  Extension of Popen to launch and kill process in a clean way
+  """
+  def __init__(self, *args, **kwargs):
+    """
+    Launch process and add object to process list for handler
+    """
+    self.name = kwargs.pop('name', None)
+    kwargs['stdin'] = subprocess.PIPE
+    kwargs['stderr'] = subprocess.STDOUT
+    kwargs.setdefault('stdout', subprocess.PIPE)
+    kwargs.setdefault('close_fds', True)
+    subprocess.Popen.__init__(self, *args, **kwargs)
+    SLAPRUNNER_PROCESS_LIST.append(self)
+    self.stdin.flush()
+    self.stdin.close()
+    self.stdin = None
+
+  def kill(self, sig=signal.SIGTERM, recursive=False):
+    """
+    Kill process and all its descendant if recursive
+    """
+    if self.poll() is None:
+      if recursive:
+        childs_pids = pidppid(self.pid)
+        for pid in childs_pids:
+          killNoFail(pid, sig)
+      killNoFail(self.pid, sig)
+      if self.poll() is not None:
+        SLAPRUNNER_PROCESS_LIST.remove(self)
+
+  def __del__(self):
+    """
+    Del function, try to kill process group
+    and process if its group does not exist
+    """
+    for pid in (-self.pid, self.pid):
+      try:
+        os.kill(-self.pid, 15)
+      except OSError:
+        pass
+    subprocess.Popen.__del__(self)
+
+
+def pidppid(pid, recursive=True):
+  """
+  Return a list of all children of pid
+  """
+  return [p.pid for p in psutil.Process(pid).get_children(recursive=recursive)]
+
+
+def killNoFail(pid, sig):
+  """
+  function to kill without failing. Return True if kill do not fail
+  """
+  try:
+    os.kill(pid, sig)
+    return True
+  except OSError:
+    return False
+
+
+def isRunning(name):
+  """
+  Return True if a process with this name is running
+  """
+  for process in SLAPRUNNER_PROCESS_LIST:
+    if process.name == name:
+      if process.poll() is None:
+        return True
+  return False
+
+
+def killRunningProcess(name, recursive=False):
+  """
+  Kill all process with name
+  """
+  for process in SLAPRUNNER_PROCESS_LIST:
+    if process.name == name:
+      process.kill(recursive=recursive)
+
+
+def handler(sig, frame):
+  """
+  Signal handler to kill all process
+  """
+  pid = os.getpid()
+  os.kill(-pid, sig)
+  sys.exit()
+
+
+def setHandler(sig_list=None):
+  if sig_list is None:
+    sig_list = [signal.SIGTERM]
+  for sig in sig_list:
+    signal.signal(sig, handler)

slapos/runner/runnertest.py

 # -*- coding: utf-8 -*-
-import os
-import sys
-import views
-import unittest
-import tempfile
-from optparse import OptionParser, Option
+# vim: set et sts=2:
+# pylint: disable-msg=W0311,C0301,C0103,C0111,R0904
+
+import argparse
 import ConfigParser
-import shutil
-from gittools import cloneRepo, gitStatus, switchBranch, addBranch, getDiff, \
-     gitPush, gitPull
-from flaskext.auth import Auth, AuthUser, login_required, logout
-from utils import *
+import datetime
 import json
-from datetime import timedelta
+import os
+import shutil
+import time
+import unittest
+import hashlib
+
+from slapos.runner.utils import (getProfilePath, getSession, isInstanceRunning,
+                                 isSoftwareRunning, startProxy)
+from slapos.runner.process import killRunningProcess, isRunning
+from slapos.runner import views
+import slapos.slap
+
+#Helpers
+def loadJson(response):
+  return json.loads(response.data)
+
 
 class Config:
+  def __init__(self):
+    self.runner_workdir = None
+    self.software_root = None
+    self.instance_root = None
+    self.configuration_file_path = None
+
   def setConfig(self):
     """
     Set options given by parameters.
@@ -41,22 +56,33 @@ class SlaprunnerTestCase(unittest.TestCase):
     self.users = ["slapuser", "slappwd", "slaprunner@nexedi.com", "SlapOS web runner"]
     self.updateUser = ["newslapuser", "newslappwd", "slaprunner@nexedi.com", "SlapOS web runner"]
     self.rcode = "41bf2657"
+    self.repo = 'http://git.erp5.org/repos/slapos.git'
+    self.software = "workspace/slapos/software/" #relative directory fo SR
+    self.project = 'slapos' #Default project name
+    self.template = 'template.cfg'
+    self.partitionPrefix = 'slappart'
+    self.slaposBuildout = "1.6.0-dev-SlapOS-010"
     #create slaprunner configuration
     config = Config()
     config.setConfig()
     workdir = os.path.join(config.runner_workdir, 'project')
+    software_link = os.path.join(config.runner_workdir, 'softwareLink')
     views.app.config.update(**config.__dict__)
     #update or create all runner base directory to test_dir
+
     if not os.path.exists(workdir):
       os.mkdir(workdir)
+    if not os.path.exists(software_link):
+      os.mkdir(software_link)
     views.app.config.update(
       software_log=config.software_root.rstrip('/') + '.log',
       instance_log=config.instance_root.rstrip('/') + '.log',
       workspace = workdir,
+      software_link=software_link,
       instance_profile='instance.cfg',
       software_profile='software.cfg',
       SECRET_KEY="123456",
-      PERMANENT_SESSION_LIFETIME=timedelta(days=31),
+      PERMANENT_SESSION_LIFETIME=datetime.timedelta(days=31),
     )
     self.app = views.app.test_client()
     self.app.config = views.app.config
@@ -69,46 +95,28 @@ class SlaprunnerTestCase(unittest.TestCase):
     """Remove all test data"""
     os.unlink(os.path.join(self.app.config['etc_dir'], '.rcode'))
     project = os.path.join(self.app.config['etc_dir'], '.project')
-    sr_data = project = os.path.join(self.app.config['etc_dir'], '.softdata')
-    proxy = os.path.join(self.app.config['etc_dir'], '.proxy.pid')
-    slapgrid_cp = os.path.join(self.app.config['etc_dir'], '.slapgrid-cp.pid')
-    slapgrid_sr = os.path.join(self.app.config['etc_dir'], '.slapgrid-sr.pid')
     users = os.path.join(self.app.config['etc_dir'], '.users')
+
     if os.path.exists(users):
       os.unlink(users)
     if os.path.exists(project):
       os.unlink(project)
-    if os.path.exists(sr_data):
-      os.unlink(sr_data)
-    if os.path.exists(proxy):
-      os.unlink(proxy)
-    if os.path.exists(slapgrid_cp):
-      os.unlink(slapgrid_cp)
-    if os.path.exists(slapgrid_sr):
-      os.unlink(slapgrid_sr)
     if os.path.exists(self.app.config['workspace']):
       shutil.rmtree(self.app.config['workspace'])
     if os.path.exists(self.app.config['software_root']):
       shutil.rmtree(self.app.config['software_root'])
     if os.path.exists(self.app.config['instance_root']):
       shutil.rmtree(self.app.config['instance_root'])
+    if os.path.exists(self.app.config['software_link']):
+      shutil.rmtree(self.app.config['software_link'])
+    self.logout()
+    #Stop process
+    killRunningProcess('slapproxy', recursive=True)
+    killRunningProcess('slapgrid-cp', recursive=True)
+    killRunningProcess('slapgrid-sr', recursive=True)
 
-
-  #Helpers
-  def loadJson(self, response):
-    return json.loads(response.data)
-
-  def configAccount(self, username, password, email, name, rcode):
-    """Helper for configAccoun"""
-    return self.app.post('/configAccount', data=dict(
-            username=username,
-            password=password,
-            email=email,
-            name=name,
-            rcode=rcode
-          ), follow_redirects=True)
   def configAccount(self, username, password, email, name, rcode):
-    """Helper for configAccoun"""
+    """Helper for configAccount"""
     return self.app.post('/configAccount', data=dict(
             username=username,
             password=password,
@@ -126,9 +134,9 @@ class SlaprunnerTestCase(unittest.TestCase):
 
   def setAccount(self):
     """Initialize user account and log user in"""
-    response = self.loadJson(self.configAccount(self.users[0], self.users[1],
+    response = loadJson(self.configAccount(self.users[0], self.users[1],
                   self.users[2], self.users[3], self.rcode))
-    response2 = self.loadJson(self.login(self.users[0], self.users[1]))
+    response2 = loadJson(self.login(self.users[0], self.users[1]))
     self.assertEqual(response['result'], "")
     self.assertEqual(response2['result'], "")
 
@@ -146,6 +154,60 @@ class SlaprunnerTestCase(unittest.TestCase):
             rcode=rcode
           ), follow_redirects=True)
 
+  def getCurrentSR(self):
+   return getProfilePath(self.app.config['etc_dir'],
+                              self.app.config['software_profile'])
+
+  def proxyStatus(self, status=True, sleep_time=0):
+    """Helper for testslapproxy status"""
+    proxy = isRunning('slapproxy')
+    if proxy != status and sleep_time != 0:
+      time.sleep(sleep_time)
+      proxy = isRunning('slapproxy')
+    self.assertEqual(proxy, status)
+
+  def setupProjectFolder(self, withSoftware=False):
+    """Helper for create a project folder as for slapos.git"""
+    base = os.path.join(self.app.config['workspace'], 'slapos')
+    software = os.path.join(base, 'software')
+    os.mkdir(base)
+    os.mkdir(software)
+    if withSoftware:
+      testSoftware = os.path.join(software, 'slaprunner-test')
+      sr = "[buildout]\n\n"
+      sr += "parts = command\n\nunzip = true\nnetworkcache-section = networkcache\n\n"
+      sr += "find-links += http://www.nexedi.org/static/packages/source/slapos.buildout/\n\n"
+      sr += "[networkcache]\ndownload-cache-url = http://www.shacache.org/shacache"
+      sr += "\ndownload-dir-url = http://www.shacache.org/shadir\n\n"
+      sr += "[command]\nrecipe = zc.recipe.egg\neggs = plone.recipe.command\n\n"
+      sr += "[versions]\nzc.buildout = %s\n" % self.slaposBuildout
+      os.mkdir(testSoftware)
+      open(os.path.join(testSoftware, self.app.config['software_profile']),
+                          'w').write(sr)
+
+  def setupSoftwareFolder(self):
+    """Helper for setup compiled software release dir"""
+    self.setupProjectFolder(withSoftware=True)
+    md5 = hashlib.md5(os.path.join(self.app.config['workspace'],
+        "slapos/software/slaprunner-test", self.app.config['software_profile'])
+      ).hexdigest()
+    base = os.path.join(self.app.config['software_root'], md5)
+    template = os.path.join(base, self.template)
+    content = "[buildout]\n"
+    content += "parts = \n  create-file\n\n"
+    content += "eggs-directory = %s\n" % os.path.join(base, 'eggs')
+    content += "develop-eggs-directory = %s\n\n"  % os.path.join(base, 'develop-eggs')
+    content += "[create-file]\nrecipe = plone.recipe.command\n"
+    content += "filename = ${buildout:directory}/etc\n"
+    content += "command = mkdir ${:filename} && echo 'simple file' > ${:filename}/testfile\n"
+    os.mkdir(self.app.config['software_root'])
+    os.mkdir(base)
+    open(template, "w").write(content)
+
+  def stopSlapproxy(self):
+    """Kill slapproxy process"""
+    killRunningProcess('slapproxy', recursive=True)
+
 
   #Begin test case here
   def test_wrong_login(self):
@@ -158,22 +220,22 @@ class SlaprunnerTestCase(unittest.TestCase):
     """For the first lauch of slaprunner user need do create first account"""
     result = self.configAccount(self.users[0], self.users[1], self.users[2],
                   self.users[3], self.rcode)
-    response = self.loadJson(result)
+    response = loadJson(result)
     self.assertEqual(response['code'], 1)
     account = getSession(self.app.config)
     self.assertEqual(account, self.users)
 
   def test_login_logout(self):
     """test login with good and wrong values, test logout"""
-    response = self.loadJson(self.configAccount(self.users[0], self.users[1],
+    response = loadJson(self.configAccount(self.users[0], self.users[1],
                   self.users[2], self.users[3], self.rcode))
     self.assertEqual(response['result'], "")
-    result = self.loadJson(self.login(self.users[0], "wrongpwd"))
+    result = loadJson(self.login(self.users[0], "wrongpwd"))
     self.assertEqual(result['result'], "Login or password is incorrect, please check it!")
-    resultwr = self.loadJson(self.login("wronglogin", "wrongpwd"))
+    resultwr = loadJson(self.login("wronglogin", "wrongpwd"))
     self.assertEqual(resultwr['result'], "Login or password is incorrect, please check it!")
     #try now with true values
-    resultlg = self.loadJson(self.login(self.users[0], self.users[1]))
+    resultlg = loadJson(self.login(self.users[0], self.users[1]))
     self.assertEqual(resultlg['result'], "")
     #after login test logout
     result = self.logout()
@@ -182,21 +244,206 @@ class SlaprunnerTestCase(unittest.TestCase):
   def test_updateAccount(self):
     """test Update accound, this need user to loging in"""
     self.setAccount()
-    response = self.loadJson(self.updateAccount(self.updateUser, self.rcode))
+    response = loadJson(self.updateAccount(self.updateUser, self.rcode))
     self.assertEqual(response['code'], 1)
     result = self.logout()
     assert "<h2>Login to Slapos Web Runner</h2>" in result.data
     #retry login with new values
-    response = self.loadJson(self.login(self.updateUser[0], self.updateUser[1]))
+    response = loadJson(self.login(self.updateUser[0], self.updateUser[1]))
     self.assertEqual(response['result'], "")
     #log out now!
     self.logout()
 
+  def test_startProxy(self):
+    """Test slapproxy"""
+    self.proxyStatus(False)
+    startProxy(self.app.config)
+    self.proxyStatus(True)
+    self.stopSlapproxy()
+    self.proxyStatus(False, sleep_time=1)
+
+  def test_cloneProject(self):
+    """Start scenario 1 for deploying SR: Clone a project from git repository"""
+    self.setAccount()
+    folder = 'workspace/' + self.project
+    data = {"repo":self.repo, "user":'Slaprunner test',
+          "email":'slaprunner@nexedi.com', "name":folder}
+    response = loadJson(self.app.post('/cloneRepository', data=data,
+                    follow_redirects=True))
+    self.assertEqual(response['result'], "")
+    #Get realpath of create project
+    path_data = dict(file=folder)
+    response = loadJson(self.app.post('/getPath', data=path_data,
+                    follow_redirects=True))
+    self.assertEqual(response['code'], 1)
+    realFolder = response['result'].split('#')[0]
+    #Check git configuration
+    config = open(os.path.join(realFolder, '.git/config'), 'r').read()
+    assert "slaprunner@nexedi.com" in config and "Slaprunner test" in config
+    #Checkout to slaprunner branch, this supose that branch slaprunner exit
+    response = loadJson(self.app.post('/newBranch', data=dict(
+                    project=folder,
+                    create='0',
+                    name='slaprunner'),
+                    follow_redirects=True))
+    self.assertEqual(response['result'], "")
+    self.logout()
+
+  def test_createSR(self):
+    """Scenario 2: Create a new software release"""
+    self.setAccount()
+    #setup project directory
+    self.setupProjectFolder()
+    newSoftware = os.path.join(self.software, 'slaprunner-test')
+    response = loadJson(self.app.post('/createSoftware',
+                    data=dict(folder=newSoftware),
+                    follow_redirects=True))
+    self.assertEqual(response['result'], "")
+    currentSR = self.getCurrentSR()
+    assert newSoftware in currentSR
+    self.logout()
+
+  def test_openSR(self):
+    """Scenario 3: Open software release"""
+    self.test_cloneProject()
+    #Login
+    self.login(self.users[0], self.users[1])
+    software = os.path.join(self.software, 'drupal') #Drupal SR must exist in SR folder
+    response = loadJson(self.app.post('/setCurrentProject',
+                    data=dict(path=software),
+                    follow_redirects=True))
+    self.assertEqual(response['result'], "")
+    currentSR = self.getCurrentSR()
+    assert software in currentSR
+    self.assertFalse(isInstanceRunning(self.app.config))
+    self.assertFalse(isSoftwareRunning(self.app.config))
+    #Slapproxy process is supose to be started
+    #newSoftware = os.path.join(self.software, 'slaprunner-test')
+    self.proxyStatus(True)
+    self.stopSlapproxy()
+    self.logout()
+
+  def test_runSoftware(self):
+    """Scenario 4: CReate empty SR and save software.cfg file
+      then run slapgrid-sr
+    """
+    #Call config account
+    #call create software Release
+    self.test_createSR()
+    #Login
+    self.login(self.users[0], self.users[1])
+    newSoftware = self.getCurrentSR()
+    softwareRelease = "[buildout]\n\nparts =\n  test-application\n"
+    softwareRelease += "#Test download git web repos éè@: utf-8 caracters\n"
+    softwareRelease += "[test-application]\nrecipe = hexagonit.recipe.download\n"
+    softwareRelease += "url = http://git.erp5.org/gitweb/slapos.git\n"
+    softwareRelease += "filename = slapos.git\n"
+    softwareRelease += "download-only = true\n"
+    response = loadJson(self.app.post('/saveFileContent',
+                    data=dict(file=newSoftware,
+                    content=softwareRelease),
+                    follow_redirects=True))
+    self.assertEqual(response['result'], "")
+    #Compile software and wait until slapgrid it end
+    #this is supose to use curent SR
+    response = loadJson(self.app.post('/runSoftwareProfile',
+                    data=dict(),
+                    follow_redirects=True))
+    self.assertTrue(response['result'])
+    self.assertTrue(os.path.exists(self.app.config['software_root']))
+    self.assertTrue(os.path.exists(self.app.config['software_log']))
+    assert "test-application" in open(self.app.config['software_log'], 'r').read()
+    sr_dir = os.listdir(self.app.config['software_root'])
+    self.assertEqual(len(sr_dir), 1)
+    createdFile = os.path.join(self.app.config['software_root'], sr_dir[0],
+                              'parts', 'test-application', 'slapos.git')
+    self.assertTrue(os.path.exists(createdFile))
+    self.proxyStatus(True)
+    self.stopSlapproxy()
+    self.logout()
+
+  def test_updateInstanceParameter(self):
+    """Scenarion 5: Update parameters of current sofware profile"""
+    self.setAccount()
+    self.setupSoftwareFolder()
+    #Set current projet and run Slapgrid-cp
+    software = os.path.join(self.software, 'slaprunner-test')
+    response = loadJson(self.app.post('/setCurrentProject',
+                    data=dict(path=software),
+                    follow_redirects=True))
+    self.assertEqual(response['result'], "")
+    self.proxyStatus(True)
+    #Send paramters for the instance
+    parameterDict = dict(appname='slaprunnerTest', cacountry='France')
+    parameterXml = '<?xml version="1.0" encoding="utf-8"?>\n<instance>'
+    parameterXml += '<parameter id="appname">slaprunnerTest</parameter>\n'
+    parameterXml += '<parameter id="cacountry">France</parameter>\n</instance>'
+    software_type = 'production'
+    response = loadJson(self.app.post('/saveParameterXml',
+                    data=dict(parameter=parameterXml,
+                              software_type=software_type),
+                    follow_redirects=True))
+    self.assertEqual(response['result'], "")
+    slap = slapos.slap.slap()
+    slap.initializeConnection(self.app.config['master_url'])
+    computer = slap.registerComputer(self.app.config['computer_id'])
+    partitionList = computer.getComputerPartitionList()
+    self.assertNotEqual(partitionList, [])
+    #Assume that the requested partition is partition 0
+    slapParameterDict = partitionList[0].getInstanceParameterDict()
+    self.assertTrue(slapParameterDict.has_key('appname'))
+    self.assertTrue(slapParameterDict.has_key('cacountry'))
+    self.assertEqual(slapParameterDict['appname'], 'slaprunnerTest')
+    self.assertEqual(slapParameterDict['cacountry'], 'France')
+    self.assertEqual(slapParameterDict['slap_software_type'], 'production')
+
+    #test getParameterXml for webrunner UI
+    response = loadJson(self.app.get('/getParameterXml/xml'))
+    self.assertEqual(parameterXml, response['result'])
+    response = loadJson(self.app.get('/getParameterXml/dict'))
+    self.assertEqual(parameterDict, response['result']['instance'])
+    self.stopSlapproxy()
+    self.logout()
+
+  def test_requestInstance(self):
+    """Scenarion 6: request software instance"""
+    self.test_updateInstanceParameter()
+    #Login
+    self.login(self.users[0], self.users[1])
+    self.proxyStatus(False, sleep_time=1)
+    #run Software profile
+    response = loadJson(self.app.post('/runSoftwareProfile',
+                    data=dict(),
+                    follow_redirects=True))
+    self.assertTrue(response['result'])
+    #run instance profile
+    response = loadJson(self.app.post('/runInstanceProfile',
+                    data=dict(),
+                    follow_redirects=True))
+    self.assertTrue(response['result'])
+    #Check that all partitions has been created
+    assert "create-file" in open(self.app.config['instance_log'], 'r').read()
+    instanceDir = os.listdir(self.app.config['instance_root'])
+    for num in range(int(self.app.config['partition_amount'])):
+      partition = os.path.join(self.app.config['instance_root'],
+                    self.partitionPrefix + str(num))
+      self.assertTrue(os.path.exists(partition))
+
+    #Go to partition 0
+    instancePath = os.path.join(self.app.config['instance_root'],
+                         self.partitionPrefix + '0')
+    createdFile = os.path.join(instancePath, 'etc', 'testfile')
+    self.assertTrue(os.path.exists(createdFile))
+    assert 'simple file' in open(createdFile).read()
+    self.proxyStatus(True)
+    self.stopSlapproxy()
+    self.logout()
 
 def main():
-  argv = ['', 'test_wrong_login', 'test_configAccount',
-          'test_login_logout', 'test_updateAccount']
-  unittest.main(module=SlaprunnerTestCase, argv=argv)
+  # Empty parser for now - so that erp5testnode is happy when doing --help
+  parser = argparse.ArgumentParser()
+  parser.parse_args()
+  unittest.main(module=__name__)
 
 if __name__ == '__main__':
   main()

slapos/runner/static/css/gsFileManager.css

@@ -60,6 +60,7 @@ UL.jqueryFileTree A:hover {
     background-color: white;
     border: 1px solid #BBBBBB;
 }
+div.browser div.gs_dir_content_files{min-height:330px;}
 
 #curDir {
  height: 30px;
@@ -124,7 +125,7 @@ UL.jqueryFileTree A:hover {
     font-weight: bold;
 }
 .gs_head{padding: 10px 5px 10px 0;}
-.gs_title{padding-left: 10px; margin:5px 5px 0 0; background: #e4e4e4;}
+.gs_title{padding-left: 10px; margin:5px 5px 0 0; background: #e4e4e4; height:30px;}
 .rowSelected {
 	color: #FFF;
 	background-color: #c2c2c2;
@@ -133,6 +134,7 @@ UL.jqueryFileTree A:hover {
 .rowSelected a {
 	color: #FFF;
 }
+.pathlink {cursor: pointer; font-size: 13px; margin-right: 2px; margin-left: 2px;}
 
 .gs_delimiter {
     height: 16px;

slapos/runner/static/css/jqueryTabs.css

@@ -2,7 +2,7 @@
 	background: #e4e4e4;
 	padding:3px;
 	/*position:relative;*/
-	width:757px;
+	width:930px;
 	font-size: 14px;
   border-radius: 4px 4px 0 0;
 }
@@ -10,9 +10,9 @@
 #tabContaier textarea {
 	width:702px;
 }
-#tabContaier textarea.slap{white-space: pre-wrap;word-wrap: break-word;overflow: hidden;color: #6F6F6F;width:430px; max-height:120px;
+#tabContaier textarea.slap{white-space: pre-wrap;word-wrap: break-word;overflow: hidden;color: #6F6F6F;width:616px; max-height:120px;
   resize: none; height:18px;padding:3px;min-height:18px;font-size: 13px;}
-#tabContaier textarea.mb_style{width:560px;}
+#tabContaier textarea.mb_style{width:713px;}
 #tabContaier > ul{
 	overflow:hidden;
 	height:34px;

slapos/runner/static/css/styles.css

@@ -28,7 +28,7 @@ td{
     border-right: 1px solid #A8A8A8;
 }
 td.propertie{padding-left:10px; color:blue;width: 178px;}
-.slapvalues{display:block;width: 375px;word-wrap: break-word}
+.slapvalues{display:block;width: 522px;word-wrap: break-word}
 td.first{border-left: 1px solid #A8A8A8;}
 th{
     background: #2281C1;
@@ -39,7 +39,7 @@ th{
 }
 table.small th{padding: 4px;font-size: 16px;}
 textarea {
-	width:762px;
+	width:932px;
   font-family: 'Helvetica Neue',Tahoma,Helvetica,Arial,sans-serif;
 }
 
@@ -54,8 +54,8 @@ overflow-y: scroll;
 
 #page
 {
-	margin: 20px auto;
-	width: 841px;
+	margin: 10px auto;
+	width: 1014px;
 }
 
 #logo{
@@ -64,8 +64,8 @@ overflow-y: scroll;
 
 #header{
     height: 78px;
-    padding-top: 15px;
-    width: 847px;
+    padding-top: 12px;
+    width: 1014px;
     background: url(../images/head.png) no-repeat;
 }
 
@@ -86,7 +86,7 @@ overflow-y: scroll;
     font-weight: normal;
     padding-top: 3px;
     float: left;
-    width: 656px;
+    width: 820px;
     height: 22px;
     text-align: center;
     color: #4c6172;
@@ -114,16 +114,12 @@ overflow-y: scroll;
     }
 
 .wmenu{
-
+  margin: 1px 0 1px 20px;
 }
 
 .wmenu ul{
-    list-style:none;
-    margin:0;
-    margin-top:1px;
-    padding:0;
-    margin-left:20px;
-    height: 36px;
+    height: 34px;
+    overflow:hidden;
 }
 
 .space{
@@ -132,7 +128,6 @@ overflow-y: scroll;
 
 .wmenu li{
     float:left;
-    background: url(../images/sep.png) left center no-repeat;
 }
 
 .wmenu li .title_software{
@@ -146,7 +141,7 @@ overflow-y: scroll;
     padding-left: 20px;
     padding-right: 5px;
     margin-left:4px;
-    height: 20px;
+    height: 18px;
     text-shadow:1px 1px 0 #E6EDF2;
 }
 
@@ -165,20 +160,23 @@ overflow-y: scroll;
     text-shadow:1px 1px 0 #E6EDF2;
 }
 
-
+.wmenu ul li.sep{border-right: 1px solid #c2c2c2; min-width:20px; height:34px}
 .wmenu ul li a{
     display:block;
     height: 20px;
-    Color:#000;
-    font-size:14px;
+    Color:#275777;
+    /*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;
-    padding-left: 6px;
+    padding:7px 10px 7px 10px;
 }
+.wmenu ul li:last-child a {border: none}
 
 .wmenu ul li a:hover, .wmenu ul li a.active{
-    color:#0271BF;
-    background:url(../images/menu_hover.png) bottom repeat-x;
+    color: #000;/*#0271BF;*/
+    background:#c2c2c2;
 }
 
 #main
@@ -191,7 +189,7 @@ overflow-y: scroll;
 
 .main_content{
     position:relative;
-    width: 100%;
+    width: 99.6%;
     height: 430px;
     margin-top:10px;
     border:1px solid #4c6172;
@@ -201,12 +199,12 @@ overflow-y: scroll;
 .main_head{
     height: 15px;
     background: url(../images/main_top.png) no-repeat;
-    width: 794px;
+    width: 966px;
 }
 
 .content{
     background: url(../images/content.png) repeat-y;
-    width: 764px;
+    width: 936px;
     padding: 15px;
     padding-top:0;
     padding-bottom:0;
@@ -229,16 +227,16 @@ overflow-y: scroll;
 .main_foot{
     height: 15px;
     background: url(../images/main_bottom.png) no-repeat;
-    width: 794px;
+    width: 966px;
 }
 
 #footer{
     height: 35px;
-    width: 767px;
+    width: 934px;
     background: url(../images/footer_bg.png) no-repeat;
     padding-left: 40px;
     padding-right: 40px;
-    padding-top: 5px;
+    padding-top: 4px;
     text-align: center;
     color: #4c6172;
     text-shadow: 0px 1px 1px #fff;
@@ -319,7 +317,8 @@ input[type="radio"], input[type="checkbox"]{
     border: 2px solid #87B0D4;
     padding: 0;
     color: #4c6172;
-    margin: 15px 59px 15px 59px;
+    margin: 20px auto;
+    width: 641px;
 }
 
 #home_box a{
@@ -369,14 +368,14 @@ input[type="radio"], input[type="checkbox"]{
 .lmenu{
     display: block;
     height: 80px;
-    margin: 10px 45px 10px 45px;
+    margin: 10px 0 10px 45px;
     padding: 10px;
     padding-bottom:15px;
     width: 530px;
     border: 1px solid #678dad;
 }
 
-.smaller{margin-left:10px; width: 350px; float:right}
+.smaller{margin-left:10px; width: 350px; float:left}
 .smaller p{width: 280px;}
 .umenu{display: block;margin: 10px 0 10px 45px; width: 147px; float:left;border: 1px solid #678dad;
 padding: 10px;height: 80px;padding-bottom:15px;}
@@ -398,7 +397,6 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 .sright_menu{
     display: block;
     height: 80px;
-    margin: 0 45px 0 0;
     padding: 10px;
     padding-bottom:15px;
     border: #678dad;
@@ -415,7 +413,7 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 }
 
 .file_tree {
-    width: 752px;
+    width: 923px;
     height: 300px;
     border: solid 1px #678dad;
     background: #fff;
@@ -433,28 +431,30 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 }
 
 .file_tree_short{
-    width: 352px;
-    height: 170px;
+    width: 228px;
+    height: 379px;
     border: solid 1px #678dad;
     background: #fff;
     overflow: auto;
     padding: 5px;
-    float:left;
 }
-
 .box_software{
-    width: 362px;
-    height: 100px;
+    width: 240px;
     background: #fff;
-    padding: 5px;
-    float:right;
 }
+.software_details{float: left;}
 #details_box{
-    display:none;
+    display:block;
+    margin-top:10px;
 }
+#code{
+    float: right;
+    width: 692px;
+}
+#details_head{margin-bottom: 10px;}
 
 #contentInfo{
-    width: 756px;
+    width: 926px;
     border: solid 1px #678dad;
     background: #fff;
     overflow: auto;
@@ -490,10 +490,6 @@ h2.hight:hover{
     cursor: pointer;
 }
 
-.software_details{
-    padding: 10px;
-}
-
 .log_content{
     border: solid 1px #4c6172;
     padding: 2px;
@@ -503,13 +499,17 @@ h2.hight:hover{
     border: none;
     background: #f6f7f8;
     color: #000;
-    width: 754px;
+    width: 926px;
     padding: 2px;
     height: 450px;
     font-size: 13px;
+    overflow-y: auto;
+    white-space: pre-wrap;
 }
 .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;
@@ -557,7 +557,11 @@ h2.hight:hover{
     margin: 10px;
     margin-top: 20px;
 }
-
+label.header {
+    color: #4C6172;
+    font-size: 18px;
+    font-weight: normal;
+}
 select {
   -webkit-appearance: button;
   -webkit-border-radius: 2px;
@@ -655,7 +659,8 @@ a.lshare img{
 .form input[type=text] ,.form input[type=password] {float:left; width:190px;margin:5px;}
 .hiddendiv {display: none;white-space: pre-wrap;min-height: 18px;font-size: 13px;
   padding:3px;word-wrap: break-word;width:430px; max-height:120px;font-family: 'Helvetica Neue',Tahoma,Helvetica,Arial,sans-serif;}
-.list{background: url(../images/menu_dropdown.png) left center no-repeat; padding-left:10px;}
+.list{display: block;padding: 5px;background: #E7E7E7; margin-bottom:7px;}
+div.sep{display:block; height:7px;}
 .slidebox{padding:10px; }
 .alert_message{ background: url(../images/alert.png) center no-repeat; height: 26px;}
 .error_message{ background: url(../images/exit.png) center no-repeat; height: 26px;}
@@ -665,10 +670,10 @@ a.lshare img{
 #pClose, .close{background:url(../images/close.png) no-repeat 0px 0px; display:block; width:22px; height:22px; cursor:pointer}
 #pClose:hover, .close:hover{background:url(../images/close_hover.png) no-repeat 0px 0px;}
 .md5sum {margin:10px; font-size:15px;}
-.title{background: #e4e4e4; width: 100%; height: 25px; padding-top:2px; text-indent: 5px; color: #737373; text-shadow: 0px 1px #FFF;}
-.menu-box-left{float:left; width: 120px; font-size:14px; background: #e4e4e4; padding:5px 0 5px 5px; margin-top:10px;
+.title{background: #e4e4e4; width: 100%; height: 26px; padding-top:2px; text-indent: 5px; color: #737373; text-shadow: 0px 1px #FFF;}
+.menu-box-left{float:left; width: 135px; 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: 634px; margin-left: -5px;
+.menu-box-right{background: #e4e4e4; padding: 5px; float:right; width: 745px; 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;}
@@ -690,10 +695,14 @@ a.lshare img{
 .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;}
+.popup a{display: block; font-weight:bold;  color: #4DA0C6; padding-left: 5px; padding-bottom: 5px;}
 .popup a:hover{color: #666666;}
-.popup ul{margin:0; padding:0; list-style:none;}
-.popup li{border-bottom: 1px dashed #666666; padding:5px; padding-top:5px;}
+.popup ul{margin:0; margin-bottom:10px; padding:0; list-style:none;}
+.popup li{border-bottom: 1px dashed #666666; padding:0;}
+.popup ul li:last-child{border-bottom:none}
+.popup ul li a{padding-bottom:0}
+ul.menu li {padding-top:5px; padding-bottom:5px;}
+ul.menu{margin-bottom:0;}
 .popup-value{display:none;}
 textarea.parameter {border: solid 1px #678dad; color: #666666; height:110px;}
 .link{color:#fff; font-weight:bold; text-decoration:none}

slapos/runner/static/js/jquery/gsFileManager.js

@@ -465,7 +465,7 @@ if (jQuery) (function(jQuery){
                 var fileshtml = '';
                 var gs_lastparent = jQuery('#' + jQuery("#curDir").attr('rel')).parent().parent().parent().children('a');
                 if (gs_lastparent.length > 0) {
-                    fileshtml += "<tr><td class='first'><div class='directory directory_info gsItem' rel=\'up\'><a href='javascript:void(0)' onclick=\"jQuery('#" + jQuery("#curDir").attr('rel')+ "').parent().parent().parent().children('a').trigger('click'); return false\"> parent...</a></div></td align='center'><td align='center'>Folder</td><td align='center'>-</td><td align='center'>-</td></tr>";
+                    fileshtml += "<tr><td class='first'><div class='directory directory_info gsItem' rel=\'up\'><a href='javascript:void(0)' onclick=\"jQuery('#" + jQuery("#curDir").attr('rel')+ "').parent().parent().parent().children('a').trigger('click'); return false\"> ..</a></div></td align='center'><td align='center'>Folder</td><td align='center'>-</td><td align='center'>-</td></tr>";
                 }
                 if (gsfiless.length > 0) {
                     for (var numf in gsfiless) {
@@ -525,6 +525,21 @@ if (jQuery) (function(jQuery){
 
             }
 
+            function splitPath(path) {
+                var list = path.split('/'),
+                    html = "";
+                for (var i=0; i<list.length; i++){
+                    var subList = new Array();
+                    if (list[i] !== '') {
+                        for (var j=0; j<=i; j++){
+                            subList.push(list[j]);
+                        }
+                        html += "<a class='pathlink' rel='"+subList.join('/')+"/'>"+list[i]+"</a>/";
+                    }
+                }
+                return html;
+            }
+
             function showTree(c, t) {
                 var cObject = jQuery(c);
                 cObject.addClass('wait');
@@ -541,7 +556,8 @@ if (jQuery) (function(jQuery){
                     success: function(data) {
 
                         //remember current dir id
-                        jQuery("#curDir").html(unescape(t));
+                        jQuery("#curDir").html(splitPath(unescape(t)));
+												jQuery("#curDir").attr('val', unescape(t));
                         jQuery("#curDir").attr('rel', jQuery('a', cObject).attr('id'));
 
                         gs_cur_items = new Array();
@@ -587,6 +603,9 @@ if (jQuery) (function(jQuery){
             jQuery(t).find('LI > A').bind('click', function () {
                 showTree (jQuery(this).parent(), encodeURIComponent(jQuery(this).attr('rel').match( /.*\// )));
             });
+						jQuery('a.pathlink').bind('click', function () {
+								showTree( jQuery('#gs_dir_list'), jQuery(this).attr('rel'));
+						});
         }
 
         function showRoot(){
@@ -630,7 +649,7 @@ if (jQuery) (function(jQuery){
             });
             return false;
         }
-        var curDir = jQuery("#curDir").html();
+        var curDir = jQuery("#curDir").attr('val');
         var dataForSend = null;
         var gsitem = gs_get_cur_item(jQuery(this).attr('rel'));
 

slapos/runner/static/js/jquery/jqueryToolTip.js

@@ -45,7 +45,7 @@ $(function () {
                     $('.popup').css('display', 'none');
                     shown = false;
                 });
-            }, hideDelay)
+            }, hideDelay);
         return false;
     });
 });
\ No newline at end of file

slapos/runner/static/js/jquery/popup.js

@@ -8,11 +8,11 @@
   $.extend($.fn, {
     Popup: function(msg, option) {
       var h;
-      if (option.type == undefined) option.type = "info";
-      if (option.closebtn == undefined) option.closebtn = false;
-      if (option.duration == undefined) option.duration = 0;
-      if (option.load == undefined) option.load = false;
-      $box = $(this);
+      if (option.type === undefined) option.type = "info";
+      if (option.closebtn === undefined) option.closebtn = false;
+      if (option.duration === undefined) option.duration = 0;
+      if (option.load === undefined) option.load = false;
+      var $box = $(this);
       if(showDelayTimer){clearTimeout(showDelayTimer);}
       if(isShow){
         $box.fadeOut('normal', function() {
@@ -21,8 +21,8 @@
       }
       else{setupBox();}
       function setupBox(){
-        if (msg == undefined){
-          msg = "Cannot execute your request. Please make sure you are logged in!!"
+        if (msg === undefined){
+          msg = "Cannot execute your request. Please make sure you are logged in!!";
           option.type = "error";
         }
         $box.empty();
@@ -40,7 +40,7 @@
           close();
         });
         showBox();
-        if(option.duration != 0){
+        if(option.duration !== 0){
           showDelayTimer = setTimeout(function(){
             showDelayTimer = null;
             close();

slapos/runner/static/js/scripts/account.js

-$(document).ready( function() {
+/*jslint undef: true */
+/*global $, document, window, $SCRIPT_ROOT */
+/* vim: set et sts=4: */
+
+$(document).ready(function () {
+    "use strict";
     var send = false;
-  $("#update").click(function(){
-    var haspwd = false;
-    var hasAccount = !($("input#hasAccount").val() === "");
-    if($("input#username").val() === "" || !$("input#username").val().match(/^[\w\d\._-]+$/)){
-  		$("#error").Popup("Invalid user name. Please check it!", {type:'alert', duration:3000});
+    $("#update").click(function () {
+        var haspwd = false,
+            hasAccount = ($("input#hasAccount").val() !== "");
+        if ($("input#username").val() === "" || !$("input#username").val().match(/^[\w\d\._\-]+$/)) {
+            $("#error").Popup("Invalid user name. Please check it!", {type: 'alert', duration: 3000});
             return false;
         }
-    else if ($("input#username").val().length <6){
-      $("#error").Popup("Username must have at least 6 characters", {type:'alert', duration:3000});
+        if ($("input#username").val().length < 6) {
+            $("#error").Popup("Username must have at least 6 characters", {type: 'alert', duration: 3000});
             return false;
         }
-		if($("input#name").val() === ""){
-			$("#error").Popup("Please enter your name and surname!", {type:'alert', duration:3000});
+        if ($("input#name").val() === "") {
+            $("#error").Popup("Please enter your name and surname!", {type: 'alert', duration: 3000});
             return false;
         }
-		if(!$("input#email").val().match(/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/)){
-			$("#error").Popup("Please enter a valid email adress!", {type:'alert', duration:3000});
+        if (!$("input#email").val().match(/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/)) {
+            $("#error").Popup("Please enter a valid email adress!", {type: 'alert', duration: 3000});
             return false;
         }
-    if(!hasAccount && !$("input#password").val().match(/^[\w\d\._-]+$/)){
-      $("#error").Popup("Please enter your new password!", {type:'alert', duration:3000});
+        if (!hasAccount && !$("input#password").val()) {
+            $("#error").Popup("Please enter your new password!", {type: 'alert', duration: 3000});
             return false;
         }
-    if ($("input#password").val() !== "" && $("input#password").val().length <6){
-      $("#error").Popup("The password must have at least 6 characters", {type:'alert', duration:3000});
+        if ($("input#password").val() !== "" && $("input#password").val().length < 6) {
+            $("#error").Popup("The password must have at least 6 characters", {type: 'alert', duration: 3000});
             return false;
         }
-    if($("input#password").val() !== ""){
-      if($("input#password").val() === "" || !$("input#password").val().match(/^[\w\d\._-]+$/)){
-      	$("#error").Popup("Please enter your new password!", {type:'alert', duration:3000});
+        if ($("input#password").val() !== "") {
+            if ($("input#password").val() === "" || !$("input#password").val()) {
+                $("#error").Popup("Please enter your new password!", {type: 'alert', duration: 3000});
                 return false;
             }
-      if($("input#password").val() !== $("input#cpassword").val()){
-        $("#error").Popup("your password does not match!", {type:'alert', duration:3000});
+            if ($("input#password").val() !== $("input#cpassword").val()) {
+                $("#error").Popup("your password does not match!", {type: 'alert', duration: 3000});
                 return false;
             }
             haspwd = true;
         }
-    if(!$("input#rcode").val().match(/^[\w\d]+$/)){
-    	$("#error").Popup("Please enter your password recovery code.", {type:'alert', duration:3000});
+        if (!$("input#rcode").val().match(/^[\w\d]+$/)) {
+            $("#error").Popup("Please enter your password recovery code.", {type: 'alert', duration: 3000});
+            return false;
+        }
+        if (send) {
             return false;
         }
-    if(send) return false;
         send = true;
         $.ajax({
             type: "POST",
-			url: $SCRIPT_ROOT + ((hasAccount)? '/updateAccount':'/configAccount'),
-			data: {name: $("input#name").val(), username:$("input#username").val(), email:$("input#email").val(),
-				password:((haspwd) ? $("input#password").val():""), rcode:$("input#rcode").val()},
-			success: function(data){
-        if(data.code ==1){
-          location.href = $SCRIPT_ROOT+"/"
-        }
-        else{
-          $("#error").Popup(data.result, {type:'error', duration:5000});
+            url: $SCRIPT_ROOT + ((hasAccount) ? '/updateAccount' : '/configAccount'),
+            data: {
+                name: $("input#name").val(),
+                username: $("input#username").val(),
+                email: $("input#email").val(),
+                password: ((haspwd) ? $("input#password").val() : ""),
+                rcode: $("input#rcode").val()
+            },
+            success: function (data) {
+                if (data.code === 1) {
+                    window.location.href = $SCRIPT_ROOT + "/";
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
                 send = false;
             },
-      error:function(){send = false;}
+            error: function () { send = false; }
         });
         return false;
     });

slapos/runner/static/js/scripts/common.js

+/*jslint undef: true */
+/*global $, window, $SCRIPT_ROOT */
+/* vim: set et sts=4: */
+
 /*Common javascript function*/
-String.prototype.toHtmlChar = function(){
-  var c = {'<':'&lt;', '>':'&gt;', '&':'&amp;', '"':'&quot;', "'":'&#039;',
-       '#':'&#035;' };
-  return this.replace( /[<&>'"#]/g, function(s) { return c[s]; } );
+String.prototype.toHtmlChar = function () {
+    "use strict";
+    var c = {
+        '<': '&lt;',
+        '>': '&gt;',
+        '&': '&amp;',
+        '"': '&quot;',
+        "'": '&#039;',
+        '#': '&#035;'
+    };
+    return this.replace(/[<&>'"#]/g, function (s) { return c[s]; });
 };
 String.prototype.trim = function () {
+    "use strict";
     return this.replace(/^\s*/, "").replace(/\s*$/, "");
 };
 
 /****************************************/
 function setInput($elt) {
-  if(!$elt){$elt = $('input[type="text"], input[type="password"]');}
+    "use strict";
+    if (!$elt) {
+        $elt = $('input[type="text"], input[type="password"]');
+    }
     $elt.addClass("idleField");
-    $elt.focus(function() {
+    $elt.focus(function () {
         $(this).removeClass("idleField").addClass("focusField");
-      if (this.value == this.defaultValue){
+        if (this.value === this.defaultValue) {
             this.value = '';
         }
-		  if(this.value != this.defaultValue){
+        if (this.value !== this.defaultValue) {
             this.select();
         }
     });
-		$elt.blur(function() {
+    $elt.blur(function () {
         $(this).removeClass("focusField").addClass("idleField");
-		    if ($.trim(this.value) === ''){
-        this.value = (this.defaultValue ? this.defaultValue : '');
+        if ($.trim(this.value) === '') {
+            this.value = (this.defaultValue || '');
         }
     });
 }
 
 /*******************Bind remove all button*******************/
-function bindRemove(){
-  $("a#removeSr").click(function(){
-      if(!window.confirm("Do you really want to remove all software release?")){
+function bindRemove() {
+    "use strict";
+    $("a#removeSr").click(function () {
+        if (!window.confirm("Do you really want to remove all software release?")) {
             return false;
         }
-      location.href = $SCRIPT_ROOT + '/removeSoftware';
+        window.location.href = $SCRIPT_ROOT + '/removeSoftware';
     });
-  $("a#removeIst").click(function(){
-      if(!window.confirm("Do you really want to remove all computer partition?")){
+    $("a#removeIst").click(function () {
+        if (!window.confirm("Do you really want to remove all computer partition?")) {
             return false;
         }
-      location.href = $SCRIPT_ROOT + '/removeInstance';
+        window.location.href = $SCRIPT_ROOT + '/removeInstance';
     });
 }
 
 /**************************/
 (function ($, document, window) {
+    "use strict";
     $.extend($.fn, {
-      slideBox: function(state) {
-        if (!state) state = "hide";
-        var header = $("#"+$(this).attr('id')+">h2");
-        var box = $("#"+$(this).attr('id')+">div");
+        slideBox: function (state) {
+            if (!state) {
+                state = "hide";
+            }
+            var header = $("#" + $(this).attr('id') + ">h2"),
+                box = $("#" + $(this).attr('id') + ">div");
             header.addClass(state);
-        if(state=="hide"){box.css('display', 'none');}
-        header.click(function(){
+            if (state === "hide") {
+                box.css('display', 'none');
+            }
+            header.click(function () {
                 var state = box.css("display");
-          if (state == "none"){
+                if (state === "none") {
                     box.slideDown("normal");
                     header.removeClass("hide");
                     header.addClass("show");
-          }
-          else{
+                } else {
                     box.slideUp("normal");
                     header.removeClass("show");
                     header.addClass("hide");

slapos/runner/static/js/scripts/cookies.js

+/*jslint undef: true */
+/*global document, escape, unescape */
+/* vim: set et sts=4: */
+
 /*Cookies Management*/
-function setCookie(name,value,expires,path,domain,secure){
-  if (!expires){
-    var today = new Date();
-    expires = new Date(today.getTime() + 365 * 24 * 60 * 60 * 1000);
+function getCookie(name) {
+    "use strict";
+    var i,
+        x,
+        y,
+        result,
+        ARRcookies = document.cookie.split(";");
+    for (i = 0; i < ARRcookies.length; i += 1) {
+        x = ARRcookies[i].substr(0, ARRcookies[i].indexOf("="));
+        y = ARRcookies[i].substr(ARRcookies[i].indexOf("=") + 1);
+        x = x.replace(/^\s+|\s+$/g, "");
+        if (x === name) {
+            result = unescape(y);
+            if (result !== "" && result !== null) {
+                return result;
             }
-  document.cookie = name + "=" + escape(value) +
-    "; expires=" + expires.toGMTString() +
-    ((path) ? "; path=" + path : "/") +
-    ((domain) ? "; domain=" + domain : "") +
-    ((secure) ? "; secure" : "");
+            return null;
+        }
+    }
+    return null;
 }
-function deleteCookie(name,path,domain) {
+
+function deleteCookie(name, path, domain) {
+    "use strict";
     if (getCookie(name)) {
         document.cookie = name + "=" +
-    ((path) ? "; path=" + path : "/") +
-    ((domain) ? "; domain=" + domain : "") +
+            (path ? "; path=" + path : "/") +
+            (domain ? "; domain=" + domain : "") +
             "; expires=Thu, 01-Jan-70 00:00:01 GMT";
     }
 }
-function getCookie(name) {
-  var i,x,y,ARRcookies=document.cookie.split(";");
-  for (i=0;i<ARRcookies.length;i++){
-    x=ARRcookies[i].substr(0,ARRcookies[i].indexOf("="));
-    y=ARRcookies[i].substr(ARRcookies[i].indexOf("=")+1);
-    x=x.replace(/^\s+|\s+$/g,"");
-    if (x==name){
-      var result = unescape(y);
-      if (result != "" && result != null){
-        return result;
-      }
-      return null;
+
+function setCookie(name, value, expires, path, domain, secure) {
+    "use strict";
+    if (getCookie(name) !== null){
+      deleteCookie(name);
     }
+    if (!expires) {
+        var today = new Date();
+        expires = new Date(today.getTime() + 365 * 24 * 60 * 60 * 1000);
     }
-  return null;
+    document.cookie = name + "=" + escape(value) +
+        "; expires=" + expires.toGMTString() +
+        ((path) ? "; path=" + path : "/") +
+        ((domain) ? "; domain=" + domain : "") +
+        ((secure) ? "; secure" : "");
 }
 /**************************/

slapos/runner/static/js/scripts/editor.js

-$(document).ready( function() {
-	var editor = ace.edit("editor");
-	editor.setTheme("ace/theme/crimson_editor");
+/*jslint undef: true */
+/*global $, document, ace, $SCRIPT_ROOT */
+/* vim: set et sts=4: */
 
-	var CurentMode = require("ace/mode/buildout").Mode;
-	editor.getSession().setMode(new CurentMode());
-	editor.getSession().setTabSize(2);
-	editor.getSession().setUseSoftTabs(true);
-	editor.renderer.setHScrollBarAlwaysVisible(false);
 
-	var file = $("input#profile").val();
-	var workdir = $("input#workdir").val();
-	var edit = false;
-	var send = false;
-	selectFile(file);
+$(document).ready(function () {
+    "use strict";
 
-	$("#save").click(function(){
-		if(!edit){
-			$("#error").Popup("Can not load your file, please make sure that you have selected a Software Release", {type:'alert', duration:5000});
-			return false;
-		}
-		if (send) return;
-		send =true
-		$.ajax({
-			type: "POST",
-			url: $SCRIPT_ROOT + '/saveFileContent',
-			data: {file: file, content: editor.getSession().getValue()},
-			success: function(data){
-				if(data.code == 1){
-					$("#error").Popup("File Saved!", {type:'confirm', duration:2000});
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
-				}
-				send = false;
-			}
-		});
-		return false;
-	});
-	$("#getmd5").click(function(){
-		getmd5sum();
-		return false;
-	});
-	$("#adddevelop").click(function(){
-	    var developList = new Array();
-	    var i=0;
-	    $("#plist li").each(function(index){
-		var elt = $(this).find("input:checkbox");
-		if (elt.is(":checked")){
-		    developList[i] = workdir+"/"+elt.val();
-		    i++;
-		    elt.attr("checked", false);
-		}
-	    });
-	    if (developList.length > 0){setDevelop(developList);}
-	    return false;
-	});
+    var editor, CurrentMode, file, workdir, edit, send;
 
-	function selectFile(file){
+    function selectFile(file) {
         edit = false;
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/getFileContent',
             data: "file=" + file,
-			success: function(data){
-				if(data.code == 1){
+            success: function (data) {
+                if (data.code === 1) {
                     editor.getSession().setValue(data.result);
                     edit = true;
-				}
-				else{
-					$("#error").Popup("Can not load your file, please make sure that you have selected a Software Release", {type:'alert', duration:5000});
+                } else {
+                    $("#error").Popup("Can not load your file, please make sure that you have selected a Software Release",
+                                      {type: 'alert', duration: 5000});
                 }
             }
         });
         return;
     }
 
-	function getmd5sum(){
-		if (send) return;
-		send =true
+    function getmd5sum() {
+        if (send) {
+            return;
+        }
+        send = true;
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/getmd5sum',
             data: {file: file},
-			success: function(data){
-				if(data.code == 1){
+            success: function (data) {
+                if (data.code === 1) {
                     $("#md5sum").empty();
                     $("#md5sum").append('md5sum : <span>' + data.result + '</span>');
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
                 send = false;
             }
         });
     }
-	function setDevelop(developList){
-	    if (developList==null || developList.length <= 0) return;
-	    editor.navigateFileStart();
-	    editor.find('buildout',{caseSensitive: true,wholeWord: true});
-	    if(!editor.getSelectionRange().isEmpty()){
-		//editor.find("",{caseSensitive: true,wholeWord: true,regExp: true});
-		//if(!editor.getSelectionRange().isEmpty()){
-			//alert("found");
-		//}
-		//else{alert("no found");
-		//}
+
+    function setDevelop(developList) {
+        if (developList === null || developList.length <= 0) {
+            return;
         }
-	    else{
-		$("#error").Popup("Can not found part [buildout]! Please make sure that you have a cfg file", {type:'alert', duration:3000});
+        editor.navigateFileStart();
+        editor.find('buildout', {caseSensitive: true, wholeWord: true});
+        if (editor.getSelectionRange().isEmpty()) {
+            $("#error").Popup("Can not found part [buildout]! Please make sure that you have a cfg file",
+                              {type: 'alert', duration: 3000});
             return;
         }
+        //else {
+        //    //editor.find("",{caseSensitive: true,wholeWord: true,regExp: true});
+        //    //if (!editor.getSelectionRange().isEmpty()) {
+        //            //alert("found");
+        //    //}
+        //    //else{alert("no found");
+        //    //}
+        //}
         editor.navigateLineEnd();
-	    $.post($SCRIPT_ROOT+"/getPath", {file:developList.join("#")}, function(data) {
-		    if(data.code==1){
-			var result = data.result.split('#');
+        $.post($SCRIPT_ROOT + "/getPath", {file: developList.join("#")}, function (data) {
+            if (data.code === 1) {
+                var i,
+                    result = data.result.split('#');
                 editor.insert("\ndevelop =\n\t" + result[0] + "\n");
-			for(var i=1; i<result.length; i++)
+                for (i = 1; i < result.length; i += 1) {
                     editor.insert("\t" + result[i] + "\n");
                 }
+            }
         })
-	    .error(function() {  })
-	    .complete(function(){});
+            .error(function () {  })
+            .complete(function () {});
         editor.insert("\n");
     }
+
+
+    editor = ace.edit("editor");
+    CurrentMode = require("ace/mode/buildout").Mode;
+    file = $("input#profile").val();
+    workdir = $("input#workdir").val();
+    edit = false;
+    send = false;
+
+    editor.setTheme("ace/theme/crimson_editor");
+
+    editor.getSession().setMode(new CurrentMode());
+    editor.getSession().setTabSize(2);
+    editor.getSession().setUseSoftTabs(true);
+    editor.renderer.setHScrollBarAlwaysVisible(false);
+
+    selectFile(file);
+
+    $("#save").click(function () {
+        if (!edit) {
+            $("#error").Popup("Can not load your file, please make sure that you have selected a Software Release",
+                              {type: 'alert', duration: 5000});
+            return false;
+        }
+        if (send) {
+            return;
+        }
+        send = true;
+        $.ajax({
+            type: "POST",
+            url: $SCRIPT_ROOT + '/saveFileContent',
+            data: {file: file, content: editor.getSession().getValue()},
+            success: function (data) {
+                if (data.code === 1) {
+                    $("#error").Popup("File Saved!", {type: 'confirm', duration: 2000});
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
+                }
+                send = false;
+            }
+        });
+        return false;
+    });
+
+    $("#getmd5").click(function () {
+        getmd5sum();
+        return false;
+    });
+
+    $("#adddevelop").click(function () {
+        var developList = [],
+            i = 0;
+        $("#plist li").each(function (index) {
+            var elt = $(this).find("input:checkbox");
+            if (elt.is(":checked")) {
+                developList[i] = workdir + "/" + elt.val();
+                i += 1;
+                elt.attr("checked", false);
+            }
+        });
+        if (developList.length > 0) {
+            setDevelop(developList);
+        }
+        return false;
+    });
+
 });

slapos/runner/static/js/scripts/folder.js

-$(document).ready( function() {
-	var send = false;
-	var cloneRequest;
-  $('#fileNavigator').gsFileManager({ script: $SCRIPT_ROOT+"/fileBrowser", root: "workspace/"});
+/*jslint undef: true */
+/*global $, document, $SCRIPT_ROOT */
+/* vim: set et sts=4: */
+
+
+$(document).ready(function () {
+    "use strict";
+
+    function configRadio() {
+        $("#modelist li").each(function (index) {
+            var boxselector = "#box" + index;
+            if ($(this).hasClass('checked')) {
+                $(this).removeClass('checked');
+                $(boxselector).slideUp("normal");
+            }
+            if ($(this).find("input:radio").is(':checked')) {
+                $(this).addClass('checked');
+                //change content here
+                $(boxselector).slideDown("normal");
+            }
+            if (index !== 2) {
+                $("input#password").val("");
+                $("input#cpassword").val("");
+            }
+        });
+    }
+
+    var send = false,
+        cloneRequest;
+
+    $('#fileNavigator').gsFileManager({ script: $SCRIPT_ROOT + "/fileBrowser", root: "workspace/"});
     configRadio();
-	$("input#nothing").change(function(){
+    $("input#nothing").change(function () {
         configRadio();
     });
-	$("input#ssh").change(function(){
+    $("input#ssh").change(function () {
         configRadio();
     });
-	$("input#https").change(function(){
+    $("input#https").change(function () {
         configRadio();
     });
-	$("#clone").click(function(){
-		if(send){
+    $("#clone").click(function () {
+        if (send) {
             cloneRequest.abort();
             $("#imgwaitting").fadeOut('normal');
             $("#clone").empty();
@@ -21,51 +48,49 @@ $(document).ready( function() {
             send = false;
             return;
         }
-		var repo_url = $("input#repo").val();
-		var email = "";
-		var name = "";
+        var repo_url = $("input#repo").val(),
+            email = "",
+            name = "";
+
         /* /^(ht|f)tps?:\/\/[a-z0-9-\.]+\.[a-z]{2,4}\/?([^\s<>\#%"\,\{\}\\|\\\^\[\]`]+)?$/ */
-		if($("input#repo").val() === '' || !repo_url.match(/^[\w\d\.\/:~@_-]+$/)){
-			$("#error").Popup("Invalid url for the repository", {type:'alert', duration:3000});
+        if ($("input#repo").val() === '' || !repo_url.match(/^[\w\d\.\/:~@_\-]+$/)) {
+            $("#error").Popup("Invalid url for the repository", {type: 'alert', duration: 3000});
             return false;
         }
-		if($("input#name").val() === '' || !$("input#name").val().match(/^[\w\d\._-]+$/)){
-			$("#error").Popup("Invalid project name", {type:'alert', duration:3000});
+        if ($("input#name").val() === '' || !$("input#name").val().match(/^[\w\d\._\-]+$/)) {
+            $("#error").Popup("Invalid project name", {type: 'alert', duration: 3000});
             return false;
         }
-		if($("input#user").val() !== ""){
+        if ($("input#user").val() !== "") {
             name = $("input#user").val();
         }
-		if($("input#email").val() !== '' && $("input#email").val() !== "Enter your email adress..."){
-			if(!$("input#email").val().match(/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/)){
-				$("#error").Popup("Please enter a valid email adress!", {type:'alert', duration:3000});
+        if ($("input#email").val() !== '' && $("input#email").val() !== "Enter your email adress...") {
+            if (!$("input#email").val().match(/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/)) {
+                $("#error").Popup("Please enter a valid email adress!", {type: 'alert', duration: 3000});
                 return false;
             }
             email = $("input#email").val();
         }
-		if($("input#https").is(':checked')){
-			if($("input#username").val() == "" || !$("input#username").val().match(/^[\w\d\._-]+$/)){
-				$("#error").Popup("Please enter a correct username", {type:'alert', duration:3000});
+        if ($("input#https").is(':checked')) {
+            if ($("input#username").val() === "" || !$("input#username").val().match(/^[\w\d\._\-]+$/)) {
+                $("#error").Popup("Please enter a correct username", {type: 'alert', duration: 3000});
                 return false;
             }
-			if($("input#password").val() != ""){
-				if(repo_url.indexOf("https://") != -1){
+            if ($("input#password").val() !== "") {
+                if (repo_url.indexOf("https://") !== -1) {
                     repo_url = "https://" + $("input#username").val() +
                         ":" + $("input#password").val() +
                         "@" + repo_url.substring(8);
-				}
-				else{
-					$("#error").Popup("The URL of your repository should start with 'https://'", {type:'alert', duration:3000});
+                } else {
+                    $("#error").Popup("The URL of your repository should start with 'https://'", {type: 'alert', duration: 3000});
                     return false;
                 }
-			}
-			else{
-				$("#error").Popup("Please enter your password", {type:'alert', duration:3000});
+            } else {
+                $("#error").Popup("Please enter your password", {type: 'alert', duration: 3000});
                 return false;
             }
-		}
-		else if(repo_url.indexOf("https://") != -1){
-			$("#error").Popup("Please select HTTPS Security Mode for this repository", {type:'alert', duration:3000});
+        } else if (repo_url.indexOf("https://") !== -1) {
+            $("#error").Popup("Please select HTTPS Security Mode for this repository", {type: 'alert', duration: 3000});
             return false;
         }
         $("#imgwaitting").fadeIn('normal');
@@ -75,27 +100,29 @@ $(document).ready( function() {
         cloneRequest = $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/cloneRepository',
-			data: {repo: repo_url, name: ($("input#workdir").val() + "/" +
-				$("input#name").val()), email:email,
-				user:name},
-			success: function(data){
-				if(data.code == 1){
+            data: {
+                repo: repo_url,
+                name: $("input#workdir").val() + "/" + $("input#name").val(),
+                email: email,
+                user: name
+            },
+            success: function (data) {
+                if (data.code === 1) {
                     $("#file_navigation").fadeIn('normal');
-					$("#error").Popup("Your repository is cloned!", {type:'confirm', duration:3000});
+                    $("#error").Popup("Your repository is cloned!", {type: 'confirm', duration: 3000});
                     $("input#repo").val("Enter the url of your repository...");
                     $("input#name").val("Enter the project name...");
-					$('#fileNavigator').gsFileManager({ script: $SCRIPT_ROOT+"/fileBrowser", root: "workspace"});
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error'});
+                    $('#fileNavigator').gsFileManager({ script: $SCRIPT_ROOT + "/fileBrowser", root: "workspace/"});
+                } else {
+                    $("#error").Popup(data.result, {type: 'error'});
                 }
                 $("#imgwaitting").hide();
                 $("#clone").empty();
                 $("#clone").append("Clone");
                 send = false;
             },
-      error: function(request,error) {
-        $("#error").Popup("unable to clone your project, please check your internet connection", {type:'error', duration:3000});
+            error: function (request, error) {
+                $("#error").Popup("unable to clone your project, please check your internet connection", {type: 'error', duration: 3000});
                 $("#imgwaitting").hide();
                 $("#clone").empty();
                 $("#clone").append("Clone");
@@ -103,26 +130,8 @@ $(document).ready( function() {
         });
         return false;
     });
-	function configRadio(){
-		$("#modelist li").each(function(index) {
-			var boxselector = "#box" + index;
-			if($(this).hasClass('checked')){
-				$(this).removeClass('checked');
-				$(boxselector).slideUp("normal");
-			}
-			if($(this).find("input:radio").is(':checked')){
-				$(this).addClass('checked');
-				//change content here
-				$(boxselector).slideDown("normal");
-			}
-			if(index != 2){
-				$("input#password").val("");
-				$("input#cpassword").val("");
-			}
-		});
-	}
 
-	function selectFile(file){
+    function selectFile(file) {
         //nothing
         return;
     }

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

-$(document).ready(function() {
-  var editor;
+/*jslint undef: true */
+/*global $, document, window, alert, $SCRIPT_ROOT, setInput, ace */
+/* vim: set et sts=4: */
+
+$(document).ready(function () {
+    "use strict";
+
+    var editor,
+        send = false,
+        lastli = null,
+        partitionAmount = $('input#partitionAmount').val();
+
+    function setupTextarea($txt) {
+        var size = Number($txt.attr('id').split('_')[1]),
+            hiddenDiv = $(document.createElement('div')),
+            content = null;
+        hiddenDiv.attr('id', 'div_' + size);
+        hiddenDiv.addClass('hiddendiv');
+        $('div#parameterkw').append(hiddenDiv);
+        $txt.keyup(function () {
+            content = $txt.val().replace(/\n/g, '<br>');
+            hiddenDiv.html(content);
+            if (hiddenDiv.height() > $txt.height() && hiddenDiv.height() > 120) {
+                return;
+            }
+            $txt.css('height', hiddenDiv.height() + 'px');
+        });
+    }
+
+    function setupFileTree(path) {
+        var root = $("input#root").val();
+        if (root === '') {
+            return;
+        }
+        if (path) {
+            root += '/' + path + '/';
+        } else {
+            root += '/';
+        }
+        $('#fileNavigator').gsFileManager({script: $SCRIPT_ROOT + "/fileBrowser", root: root});
+    }
+
+    function configRadio() {
+        $('#slappart li').each(function () {
+            var $radio = $(this).find('input:radio'),
+                boxselector = '#box' + $radio.attr('id');
+
+            if ($(this).hasClass('checked')) {
+                $(this).removeClass('checked');
+                $(boxselector).slideUp('normal');
+            }
+            if ($radio.is(':checked')) {
+                $(this).addClass('checked');
+                //change content here
+                $(boxselector).slideDown('normal');
+            }
+        });
+    }
+
+    function setupSlappart() {
+        var i, elt, fileId;
+        for (i = 0; i < partitionAmount; i += 1) {
+            elt = $('#slappart' + i + 'Parameter');
+            fileId = $('#slappart' + i + 'Files');
+
+            if (elt && elt !== undefined) {
+                elt.click(function () {
+                    alert($(this).html());
+                });
+            }
+            if (fileId && fileId !== undefined) {
+                fileId.click(function () {
+                    $('#instancetabfiles').click();
+                    setupFileTree($(this).attr('rel'));
+                });
+            }
+        }
+    }
+
+    function updateParameter() {
+        var xml = '<?xml version="1.0" encoding="utf-8"?>\n',
+            software_type = '',
+            software_type_input_value = $('input#software_type').val(),
+            size = $('#partitionParameter > tbody > tr').length,
+            i;
+
+        if (software_type_input_value !== '' && software_type_input_value !== 'Software Type here...') {
+            software_type = software_type_input_value;
+        }
+        xml += '<instance>\n';
+        if (size > 1) {
+            for (i = 2; i <= size; i += 1) {
+                if ($('input#txt_' + i).val() !== '') {
+                    xml += '<parameter id="' + $('input#txt_' + i).val() + '">' + $('textarea#value_' + i).val() + '</parameter>\n';
+                }
+            }
+        }
+        xml += '</instance>\n';
+        $.ajax({
+            type: 'POST',
+            url: $SCRIPT_ROOT + '/saveParameterXml',
+            data: {software_type: software_type, parameter: xml},
+            success: function (data) {
+                if (data.code === 1) {
+                    $('#error').Popup('Instance parameters has been updated, please run your instance now!', {type: 'confirm', duration: 5000});
+                } else {
+                    $('#error').Popup(data.result, {type: 'error', duration: 5000});
+                }
+            }
+        });
+    }
+
+    function setupEditor(editable) {
+        editor = ace.edit('editor');
+        editor.setTheme('ace/theme/crimson_editor');
+
+        var CurentMode = require('ace/mode/text').Mode;
+        editor.getSession().setMode(new CurentMode());
+        editor.getSession().setTabSize(2);
+        editor.getSession().setUseSoftTabs(true);
+        editor.renderer.setHScrollBarAlwaysVisible(false);
+        if (!editable) {
+            editor.setReadOnly(true);
+        }
+    }
+
+    function loadParameter() {
+        $.ajax({
+            type: 'GET',
+            url: $SCRIPT_ROOT + '/getParameterXml/dict',
+            success: function (data) {
+                var dict, propertie, size;
+                if (data.code === 1) {
+                    dict = data.result.instance;
+                    for (propertie in dict) {
+                        $("#add_attribute").click();
+                        size = Number($("#partitionParameter > tbody > tr").last().attr('id').split('_')[1]);
+                        $("input#txt_" + size).val(propertie);
+                        $("textarea#value_" + size).val(dict[propertie]);
+                        $("textarea#value_" + size).keyup();
+                    }
+                } else {
+                    $('#error').Popup(data.result, {type: 'error', duration: 5000});
+                }
+            }
+        });
+    }
+
     setupFileTree();
     $($('#slappart li')[0]).find('input:radio').attr('checked', true);
     $('.menu-box-right>div').css('min-height', $('#slappart li').length * 26 + 20 + 'px');
     configRadio();
-  var send = false;
-  var lastli = null;
-  var partitionAmount = $('input#partitionAmount').val();
-  $('#slappart li').each(function() {
+    $('#slappart li').each(function () {
         lastli = $(this);
-    $(this).find('input:radio').change(function() {
+        $(this).find('input:radio').change(function () {
             configRadio();
         });
     });
-  if (lastli) {lastli.css('border-bottom', 'none');}
+    if (lastli) {
+        lastli.css('border-bottom', 'none');
+    }
 
     $('#parameterkw').slideBox('show');
     setupSlappart();
-  $('#reloadfiles').click(function() {
+    $('#reloadfiles').click(function () {
         setupFileTree();
     });
-  $('#refresh').click(function() {
-    if (send) return;
+    $('#refresh').click(function () {
+        if (send) {
+            return;
+        }
         $('#imgwaitting').fadeIn();
         $.ajax({
             type: 'GET',
             url: $SCRIPT_ROOT + '/supervisordStatus',
             data: '',
-      success: function(data) {
-            if (data.code == 1) {
+            success: function (data) {
+                if (data.code === 1) {
                     $('#supervisordcontent').empty();
                     $('#supervisordcontent').append(data.result);
                 }
@@ -37,25 +184,25 @@ $(document).ready(function() {
         });
         return false;
     });
-  $('#add_attribute').click(function() {
-    var size = Number($('#partitionParameter > tbody > tr').last().attr('id').split('_')[1]) + 1;
-    var row = "<tr id='row_" + size + "'><td class='first'><input type='text' name='txt_" + size + "' id='txt_" + size + "'></td>" +
+    $('#add_attribute').click(function () {
+        var size = Number($('#partitionParameter > tbody > tr').last().attr('id').split('_')[1]) + 1,
+            row = "<tr id='row_" + size + "'><td class='first'><input type='text' name='txt_" + size + "' id='txt_" + size + "'></td>" +
                 "<td style='padding:6px'><textarea class='slap' id='value_" + size + "'></textarea>" +
                 "</td><td valign='middle'><span style='margin-left: 10px;' id='btn_" + size + "' class='close'></span></td></tr>";
         $('#partitionParameter').append(row);
         setInput($('input#txt_' + size));
         setupTextarea($('textarea#value_' + size));
-    $('#btn_' + size).click(function() {
+        $('#btn_' + size).click(function () {
             var index = $(this).attr('id').split('_')[1];
             $('tr#row_' + index).remove();
         });
         return false;
     });
-  $('#updateParameters').click(function() {
+    $('#updateParameters').click(function () {
         updateParameter();
         return false;
     });
-  $('#xmlview').click(function() {
+    $('#xmlview').click(function () {
         var content = '<h2 style="color: #4c6172; font: 18px \'Helvetica Neue\', Helvetica, Arial, sans-serif;">' +
             'INSTANCE PARAMETERS: Load XML file</h2><p id="xmllog" class="message"><br/></p>';
         content += '<div class="main_content" style="height:230px"><pre id="editor"></pre></div>' +
@@ -63,38 +210,56 @@ $(document).ready(function() {
         $.ajax({
             type: 'GET',
             url: $SCRIPT_ROOT + '/getParameterXml/xml',
-    success: function(data){
-      if(data.code == 1){
+            success: function (data) {
+                if (data.code === 1) {
+                    $("#loadxml").unbind('click');
+                    $.colorbox.remove();
+                    $("#inline_instance").empty();
                     $("#inline_instance").html(content);
                     setupEditor(true);
-        $("a#inlineInstance").colorbox({inline:true, width: "600px", height: "410px", onComplete:function(){
+                    $("a#inlineInstance").colorbox(
+                        {
+                            inline: true,
+                            width: "600px",
+                            height: "410px",
+                            onComplete: function () {
                                 editor.getSession().setValue(data.result);
-        }});
+                            }
+                        }
+                    );
+
                     $("a#inlineInstance").click();
-        $("#loadxml").click(function(){
+                    $("#loadxml").click(function () {
                         //Parse XML file
                         try {
                             var xmlDoc = $.parseXML(editor.getSession().getValue()), $xml = $(xmlDoc);
-            if ($xml.find('parsererror').length !== 0) {$('p#xmllog').html('Error: Invalid XML document!<br/>');return false;}
+                            if ($xml.find('parsererror').length !== 0) {
+                                $('p#xmllog').html('Error: Invalid XML document!<br/>');
+                                return false;
+                            }
                         } catch (err) {
-            $('p#xmllog').html('Error: Invalid XML document!<br/>');return false;
+                            $('p#xmllog').html('Error: Invalid XML document!<br/>');
+                            return false;
                         }
                         $.ajax({
                             type: 'POST',
                             url: $SCRIPT_ROOT + '/saveParameterXml',
-            data: {software_type: '', parameter: editor.getSession().getValue()},
-            success: function(data) {
-              if (data.code == 1) {
-                location.href = $SCRIPT_ROOT + '/inspectInstance#tab3';
-                location.reload();
+                            data: {
+                                software_type: '',
+                                parameter: editor.getSession().getValue()
+                            },
+                            success: function (data) {
+                                if (data.code === 1) {
+                                    window.location.href = $SCRIPT_ROOT + '/inspectInstance#tab3';
+                                    window.location.reload();
+                                } else {
+                                    $('p#xmllog').html(data.result);
                                 }
-              else {$('p#xmllog').html(data.result);}
                             }
                         });
                         return false;
                     });
-      }
-      else {
+                } else {
                     $('#error').Popup(data.result, {type: 'error', duration: 5000});
                 }
             }
@@ -102,162 +267,44 @@ $(document).ready(function() {
     });
     //Load previous instance parameters
     loadParameter();
-  $('a#parameterTab').click(function() {
-    var size = $('#partitionParameter > tbody > tr').length;
-    for (var i = 2; i <= size; i++) {
+    $('a#parameterTab').click(function () {
+        var i,
+            size = $('#partitionParameter > tbody > tr').length;
+        for (i = 2; i <= size; i += 1) {
             $('textarea#value_' + i).keyup();
         }
     });
 
-  function setupFileTree(path){
-    var root = $("input#root").val();
-    if (root === '') return;
-    if (path){
-      root += '/' + path + '/';
-    }
-    else{root += '/';}
-    $('#fileNavigator').gsFileManager({ script: $SCRIPT_ROOT+"/fileBrowser", root: root});
-  }
-
     $("#parameter").load($SCRIPT_ROOT + '/getParameterXml');
-  $("#update").click(function(){
-    if($("#parameter").val() === ''){
-        $("#error").Popup("Can not save empty value!", {type:'alert', duration:3000});
+    $("#update").click(function () {
+        if ($("#parameter").val() === '') {
+            $("#error").Popup("Can not save empty value!", {type: 'alert', duration: 3000});
         }
         $.ajax({
             type: 'POST',
             url: $SCRIPT_ROOT + '/saveParameterXml',
             data: {parameter: $('#parameter').val().trim()},
-      success: function(data) {
-            if (data.code == 1) {
+            success: function (data) {
+                if (data.code === 1) {
                     $('#error').Popup('Instance parameters updated!', {type: 'info', duration: 3000});
-            }
-            else {
+                } else {
                     $('#error').Popup(data.result, {type: 'error', duration: 5000});
                 }
             }
         });
     });
 
-  function updateParameter() {
-    var xml = '<?xml version="1.0" encoding="utf-8"?>\n',
-        software_type = '',
-        software_type_input_value = $('input#software_type').val();
-    if (software_type_input_value !== '' && software_type_input_value !== 'Software Type here...') {
-      software_type = software_type_input_value;
-    }
-    xml += '<instance>\n';
-    var size = $('#partitionParameter > tbody > tr').length;
-    if (size > 1) {
-      for (var i = 2; i <= size; i++) {
-        if ($('input#txt_' + i).val() != '') {
-          xml += '<parameter id="' + $('input#txt_' + i).val() + '">' + $('textarea#value_' + i).val() + '</parameter>\n';
-        }
-      }
-    }
-    xml += '</instance>\n';
-    $.ajax({
-    type: 'POST',
-    url: $SCRIPT_ROOT + '/saveParameterXml',
-    data: {software_type: software_type, parameter: xml},
-    success: function(data) {
-      if (data.code == 1) {
-        $('#error').Popup('Instance parameters has been updated, please run your instance now!', {type: 'confirm', duration: 5000});
-      }
-      else {
-        $('#error').Popup(data.result, {type: 'error', duration: 5000});
-      }
-    }
-    });
-  }
-  function setupTextarea($txt) {
-    var size = Number($txt.attr('id').split('_')[1]);
-    var hiddenDiv = $(document.createElement('div')),
-    content = null;
-    hiddenDiv.attr('id', 'div_' + size);
-    hiddenDiv.addClass('hiddendiv');
-    $('div#parameterkw').append(hiddenDiv);
-    $txt.keyup(function() {
-      content = $txt.val().replace(/\n/g, '<br>');
-      hiddenDiv.html(content);
-      if (hiddenDiv.height() > $txt.height() && hiddenDiv.height() > 120) {
-        return;
-      }
-      $txt.css('height', hiddenDiv.height() + 'px');
-    });
-  }
-  function loadParameter() {
-    $.ajax({
-    type: 'GET',
-    url: $SCRIPT_ROOT + '/getParameterXml/dict',
-    success: function(data){
-      if(data.code == 1){
-        var dict = data.result['instance'];
-        for (var propertie in dict){
-          $("#add_attribute").click();
-          var size = Number($("#partitionParameter > tbody > tr").last().attr('id').split('_')[1]);
-          $("input#txt_"+size).val(propertie);
-          $("textarea#value_"+size).val(dict[propertie]);
-          $("textarea#value_"+size).keyup();
-        }
-      }
-      else {
-        $('#error').Popup(data.result, {type: 'error', duration: 5000});
-      }
-    }
-    });
-  }
-  function configRadio() {
-    $('#slappart li').each(function() {
-      var $radio = $(this).find('input:radio');
-      var boxselector = '#box' + $radio.attr('id');
-      if ($(this).hasClass('checked')) {
-        $(this).removeClass('checked');
-        $(boxselector).slideUp('normal');
-      }
-      if ($radio.is(':checked')) {
-        $(this).addClass('checked');
-        //change content here
-        $(boxselector).slideDown('normal');
 
-      }
-    });
-  }
     function setupBox() {
         var state = $('#softwareType').css('display');
-    if (state == 'none') {
+        if (state === 'none') {
             $('#softwareType').slideDown('normal');
             $('#softwareTypeHead').removeClass('hide');
             $('#softwareTypeHead').addClass('show');
-    }
-    else {
+        } else {
             $('#softwareType').slideUp('normal');
             $('#softwareTypeHead').removeClass('show');
             $('#softwareTypeHead').addClass('hide');
         }
     }
-  function setupEditor(editable) {
-    editor = ace.edit('editor');
-    editor.setTheme('ace/theme/crimson_editor');
-
-    var CurentMode = require('ace/mode/text').Mode;
-    editor.getSession().setMode(new CurentMode());
-    editor.getSession().setTabSize(2);
-    editor.getSession().setUseSoftTabs(true);
-    editor.renderer.setHScrollBarAlwaysVisible(false);
-    if (!editable) {editor.setReadOnly(true);}
-  }
-  function setupSlappart() {
-    for (var i = 0; i < partitionAmount; i++) {
-      var elt = $('#slappart' + i + 'Parameter');
-      var fileId = $('#slappart' + i + 'Files');
-      if (elt && elt !== undefined) elt.click(function() {
-        alert($(this).html());
-      });
-      if (fileId && fileId !== undefined) fileId.click(function() {
-        $('#instancetabfiles').click();
-        setupFileTree($(this).attr('rel'));
-      });
-    }
-  }
 });

slapos/runner/static/js/scripts/inspectSoftware.js

-$(document).ready( function() {
-	var editor;
-	var send = false;
-	var runnerDir = $("input#runnerdir").val();
-	$("#reloadfiles").click(function(){
+/*jslint undef: true */
+/*global $, document, window, $SCRIPT_ROOT, ace */
+/* vim: set et sts=4: */
+
+
+$(document).ready(function () {
+    "use strict";
+
+    var editor,
+        send = false,
+        runnerDir = $("input#runnerdir").val();
+
+    function fillContent() {
+        $('#fileNavigator').gsFileManager({script: $SCRIPT_ROOT + "/fileBrowser", root: runnerDir});
+    }
+
+    $("#reloadfiles").click(function () {
         fillContent();
     });
     fillContent();
 
-	function fillContent(){
-		$('#fileNavigator').gsFileManager({ script: $SCRIPT_ROOT+"/fileBrowser", root: runnerDir});
-	}
-
-	$("#open").click(function(){
+    $("#open").click(function () {
         var elt = $("option:selected", $("#softwarelist"));
-    if(elt.val() === "No Software Release found"){
-        $("#error").Popup("Please select your Software Release", {type:'alert', duration:5000});
+        if (elt.val() === "No Software Release found") {
+            $("#error").Popup("Please select your Software Release", {type: 'alert', duration: 5000});
             return false;
         }
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/setCurrentProject',
             data: "path=" + elt.attr('rel'),
-			success: function(data){
-				if(data.code == 1){
-					location.href = $SCRIPT_ROOT + '/editSoftwareProfile'
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
+            success: function (data) {
+                if (data.code === 1) {
+                    window.location.href = $SCRIPT_ROOT + '/editSoftwareProfile';
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
             }
         });
         return false;
     });
 
-	$("#delete").click(function(){
-    if($("#softwarelist").val() === "No Software Release found"){
-        $("#error").Popup("Please select your Software Release", {type:'alert', duration:5000});
+    $("#delete").click(function () {
+        if ($("#softwarelist").val() === "No Software Release found") {
+            $("#error").Popup("Please select your Software Release", {type: 'alert', duration: 5000});
             return false;
         }
-		if(send) return;
-    if(!window.confirm("Do you really want to delete this software release?")){
+        if (send) {
+            return;
+        }
+        if (!window.confirm("Do you really want to delete this software release?")) {
             return;
         }
         send = false;
@@ -47,24 +56,28 @@ $(document).ready( function() {
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/removeSoftwareDir',
-			data: {md5:$("#softwarelist").val(), title:elt.attr('title')},
-			success: function(data){
-				if(data.code == 1){
+            data: {
+                md5: $("#softwarelist").val(),
+                title: elt.attr('title')
+            },
+            success: function (data) {
+                var i;
+                if (data.code === 1) {
                     $("#softwarelist").empty();
-					for(var i=0; i<data.result.length; i++){
-						$("#softwarelist").append('<option value="' + data.result[i]['md5'] +
-							'" title="' + data.result[i]['title'] +'" rel="' +
-							data.result[i]['path'] +'">' + data.result[i]['title'] + '</option>');
+                    for (i = 0; i < data.result.length; i += 1) {
+                        $("#softwarelist").append('<option value="' + data.result[i].md5 +
+                            '" title="' + data.result[i].title + '" rel="' +
+                            data.result[i].path + '">' + data.result[i].title + '</option>');
                     }
-          if(data.result.length < 1){
+                    if (data.result.length < 1) {
                         $("#softwarelist").append('<option>No Software Release found</option>');
                         $('#fileTree').empty();
                     }
                     fillContent();
-					$("#error").Popup("Operation complete, Selected Software Release has been delete!", {type:'confirm', duration:5000});
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error'});
+                    $("#error").Popup("Operation complete, Selected Software Release has been delete!",
+                                      {type: 'confirm', duration: 5000});
+                } else {
+                    $("#error").Popup(data.result, {type: 'error'});
                 }
                 send = false;
             }
@@ -72,7 +85,7 @@ $(document).ready( function() {
         return false;
     });
 
-	function setupEditor(){
+    function setupEditor() {
         editor = ace.edit("editor");
         editor.setTheme("ace/theme/crimson_editor");
 

slapos/runner/static/js/scripts/login.js

-$(document).ready( function() {
+/*jslint undef: true */
+/*global $, document, window, $SCRIPT_ROOT */
+/* vim: set et sts=4: */
+
+$(document).ready(function () {
+    "use strict";
+
     var send = false;
     //change background
     $("body").css("background", "#9C9C9C");
-	$("#login").click(function(){
-    if (send) return false;
-		if($("input#clogin").val() === "" || !$("input#clogin").val().match(/^[\w\d\.-]+$/)){
-			$("#error").Popup("Please enter a valid user name", {type:'alert', duration:3000});
+    $("#login").click(function () {
+        if (send) {
             return false;
         }
-		if($("input#cpwd").val() === "" || $("input#cpwd").val() ==="******"){
-			$("#error").Popup("Please enter your password", {type:'alert', duration:3000});
+        if ($("input#clogin").val() === "" || !$("input#clogin").val().match(/^[\w\d\.\-]+$/)) {
+            $("#error").Popup("Please enter a valid user name", {type: 'alert', duration: 3000});
+            return false;
+        }
+        if ($("input#cpwd").val() === "" || $("input#cpwd").val() === "******") {
+            $("#error").Popup("Please enter your password", {type: 'alert', duration: 3000});
             return false;
         }
         send = true;
-    var param = {clogin:$("input#clogin").val(), cpwd:$("input#cpwd").val()};
-    var url = $SCRIPT_ROOT + "/doLogin";
+        var param = { clogin: $("input#clogin").val(), cpwd: $("input#cpwd").val() },
+            url = $SCRIPT_ROOT + "/doLogin";
+
         $("#login").removeClass("button").addClass("dsblebutton");
-    $.post(url, param, function(data) {
-      if (data.code==1){
-        location.href = $SCRIPT_ROOT + '/';
-      }
-      else{
-        $("#error").Popup(data.result, {type:'alert', duration:3000});
+        $.post(url, param, function (data) {
+            if (data.code === 1) {
+                window.location.href = $SCRIPT_ROOT + '/';
+            } else {
+                $("#error").Popup(data.result, {type: 'alert', duration: 3000});
             }
         })
-    .error(function() {
+            .error(function () {
                 $("#error").Popup("Cannot send your account identifier please try again!!",
-      {type:'alert', duration:3000});})
-    .complete(function() {
+                                  {type: 'alert', duration: 3000});
+            })
+            .complete(function () {
                 $("#login").removeClass('dsblebutton').addClass('button');
                 send = false;
             });

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

+/*jslint undef: true */
+/*global $, window, $SCRIPT_ROOT, setRunningState, setCookie, getCookie, deleteCookie */
+/*global currentState: true, running: true, $current: true, processType: true, currentProcess: true */
+/*global sendStop: true, processState: true, openedlogpage: true, logReadingPosition: true, speed: true */
+/*global isRunning: true */
+/* vim: set et sts=4: */
+
 //Global Traitment!!!
-var url = $SCRIPT_ROOT + "/slapgridResult"
+
+var url = $SCRIPT_ROOT + "/slapgridResult";
 var currentState = false;
 var running = true;
 var $current;
@@ -10,151 +18,207 @@ var processState = "Checking"; //define slapgrid running state
 var openedlogpage = ""; //content software or instance if the current page is software or instance log, otherwise nothing
 var logReadingPosition = 0;
 var speed = 5000;
-var isRunning = function(){
-  if (running){
-    $("#error").Popup("Slapgrid is currently under execution!", {type:'alert', duration:3000});
+var maxLogSize = 100000; //Define the max limit of log to display  ~ 2500 lines
+var currentLogSize = 0; //Define the size of log actually displayed
+var isRunning = function () {
+    "use strict";
+    if (running) {
+        $("#error").Popup("Slapgrid is currently under execution!",
+                          {type: 'alert', duration: 3000});
     }
     return running;
-}
-function setSpeed(value){
-  if (openedlogpage == ""){
+};
+
+function setSpeed(value) {
+    "use strict";
+    if (openedlogpage === "") {
         speed = 5000;
+    } else {
+        speed = value;
     }
-  else{ speed=value;}
 }
-function getRunningState(){
-  var param = {position:logReadingPosition, log:(processState!="Checking" && openedlogpage==processType.toLowerCase())? openedlogpage:""}
-  var jqxhr = $.post(url, param, function(data) {
-      setRunningState(data)
+
+function clearAll(setStop) {
+    "use strict";
+    currentState = false;
+    running = setStop;
+}
+
+function removeFirstLog(){
+  "use strict";
+  currentLogSize -= parseInt($("#salpgridLog p:first-child").attr('rel'), 10);
+  $("#salpgridLog p:first-child").remove();
+}
+
+function getRunningState() {
+    "use strict";
+    var size = 0;
+    var log_info = "";
+    var param = {
+        position: logReadingPosition,
+        log: (processState !== "Checking" && openedlogpage === processType.toLowerCase()) ? openedlogpage : ""
+    },
+        jqxhr = $.post(url, param, function (data) {
+            setRunningState(data);
+            size = data.content.position - logReadingPosition;
+            if (logReadingPosition !== 0 && data.content.truncated){
+                log_info = "<p  class='info' rel='0'>SLAPRUNNER INFO: SLAPGRID-LOG HAS BEEN TRUNCATED HERE. To see full log reload your log page</p>";
+            }
             logReadingPosition = data.content.position;
-      if(data.content.content != ""){
-        $("#salpgridLog").append(data.content.content.toHtmlChar());
+            if (data.content.content !== "") {
+                if (data.content.content !== "") {
+                    $("#salpgridLog").append(log_info + "<p rel='" + size + "'>" + data.content.content.toHtmlChar() + "</p>");
                     $("#salpgridLog")
-        .scrollTop($("#salpgridLog")[0].scrollHeight - $("#salpgridLog")
-          .height());
+                        .scrollTop($("#salpgridLog")[0].scrollHeight - $("#salpgridLog").height());
                 }
-      if (running && processState=="Checking" && openedlogpage != ""){$("#salpgridLog").show();$("#manualLog").hide();}
-      processState = (running)?"Running":"Stopped";
+            }
+            if (running && processState === "Checking" && openedlogpage !== "") {
+                $("#salpgridLog").show();
+                $("#manualLog").hide();
+            }
+            processState = running ? "Running" : "Stopped";
+            currentLogSize += parseInt(size, 10);
+            if (currentLogSize > maxLogSize){
+                //Remove the first element into log div
+                removeFirstLog();
+                if (currentLogSize > maxLogSize){
+                    removeFirstLog(); //in cas of previous <p/> size is 0
+                }
+            }
+        })
+        .error(function () {
+            clearAll(false);
         })
-  .error(function() { clearAll(false); })
-  .complete(function() {
-    if (running){
-      setTimeout(function(){
+        .complete(function () {
+            if (running) {
+                setTimeout(function () {
                     getRunningState();
                 }, speed);
             }
         });
 }
-function clearAll(setStop){
-  currentState = false;
-  running = setStop;
+
+function stopProcess() {
+    "use strict";
+    if (sendStop) {
+        return;
+    }
+    if (running) {
+        sendStop = true;
+
+        var urlfor = $SCRIPT_ROOT + "stopSlapgrid",
+            type = "slapgrid-sr";
+
+        if ($("#instrun").text() === "Stop instance") {
+            type = "slapgrid-cp";
+        }
+        $.post(urlfor, {type: type}, function (data) {
+            //if (data.result) {
+                //$("#error").Popup("Failled to run Slapgrid", {type:'error', duration:3000}); });
+            //}
+        })
+            .error(function () {
+                $("#error").Popup("Failed to stop Slapgrid process", {type: 'error', duration: 3000});
+            })
+            .complete(function () {
+                sendStop = false;
+                processState = "Stopped";
+            });
+    }
 }
-function bindRun(){
-  $("#softrun").click(function(){
-    if($("#softrun").text() == "Stop"){
+
+function bindRun() {
+    "use strict";
+    $("#softrun").click(function () {
+        if ($("#softrun").text() === "Stop software") {
             stopProcess();
-    }
-    else{
-      if(!isRunning()){
+        } else {
+            if (!isRunning()) {
                 setCookie("slapgridCMD", "Software");
-        location.href = $SCRIPT_ROOT + "/viewSoftwareLog";
+                window.location.href = $SCRIPT_ROOT + "/viewSoftwareLog";
             }
         }
         return false;
     });
-  $("#instrun").click(function(){
-    if($("#instrun").text() == "Stop"){
+    $("#instrun").click(function () {
+        if ($("#instrun").text() === "Stop instance") {
             stopProcess();
-    }
-    else{
-      if(!isRunning()){
+        } else {
+            if (!isRunning()) {
                 setCookie("slapgridCMD", "Instance");
-        location.href = $SCRIPT_ROOT + "/viewInstanceLog";
+                window.location.href = $SCRIPT_ROOT + "/viewInstanceLog";
             }
         }
         return false;
     });
 }
-function setRunningState(data){
-  if (data.result){
-    if(!currentState){
+
+function setRunningState(data) {
+    "use strict";
+    if (data.result) {
+        if (!currentState) {
             $("#running").show();
             running = true;
             //change run menu title and style
-      if(data.software){
+            if (data.software) {
                 $("#softrun").empty();
-        $("#softrun").append("Stop");
+                $("#softrun").append("Stop software");
                 $("#softrun").css("color", "#0271BF");
                 $current = $("#softrun");
                 processType = "Software";
             }
-      if(data.instance){
+            if (data.instance) {
                 $("#instrun").empty();
-        $("#instrun").append("Stop");
+                $("#instrun").append("Stop instance");
                 $("#instrun").css("color", "#0271BF");
                 $current = $("#instrun");
                 processType = "Instance";
             }
         }
-  }
-  else{
+    } else {
         $("#running").hide();
         running = false; //nothing is currently running
-    if ($current != undefined){
+        if ($current !== undefined) {
             $current.empty();
-      $current.append("Run");
-      $current.css("color", "#000");
+            $current.append("Run " + processType.toLowerCase());
+            $current.css("color", "#275777");
             $current = undefined;
             currentState = false;
-      $("#error").Popup("Slapgrid completely finish running your " + processType + " Profile", {type:'info', duration:3000});
+            $("#error").Popup("Slapgrid finished running your " + processType + " Profile", {type: 'info', duration: 3000});
         }
     }
     currentState = data.result;
 }
-function runProcess(urlfor, data){
-  if(!isRunning()){
+
+function runProcess(urlfor, data) {
+    "use strict";
+    if (!isRunning()) {
         running = true;
         processState = "Running";
         currentProcess = $.post(urlfor)
-    .error(function() {
-      $("#error").Popup("Failled to run Slapgrid", {type:'error', duration:3000}); });
+            .error(function () {
+                $("#error").Popup("Failled to run Slapgrid", {type: 'error', duration: 3000});
+            });
         setRunningState(data);
-    setTimeout("getRunningState()", 5000);
-  }
-}
-function stopProcess(){
-  if (sendStop) return;
-  if (running){
-    sendStop = true;
-    var urlfor = $SCRIPT_ROOT + "stopSlapgrid"
-    var type = "slapgrid-sr.pid";
-    if($("#instrun").text() == "Stop"){
-      type = "slapgrid-cp.pid";
-    }
-    $.post(urlfor, {type:type}, function(data){
-      //if (data.result){
-        //$("#error").Popup("Failled to run Slapgrid", {type:'error', duration:3000}); });
-      //}
-    })
-    .error(function() {
-      $("#error").Popup("Failled to stop Slapgrid process", {type:'error', duration:3000}); })
-    .complete(function() {sendStop = false;processState="Stopped";});
+        setTimeout(getRunningState, 6000);
     }
 }
 
-function checkSavedCmd(){
+function checkSavedCmd() {
+    "use strict";
     var result = getCookie("slapgridCMD");
-  if (!result) return false;
-  if (result == "Software"){
+    if (!result) {
+        return false;
+    }
+    if (result === "Software") {
         running = false;
         runProcess(($SCRIPT_ROOT + "/runSoftwareProfile"),
-      {result: true, instance:false, software:true});
-  }
-  else if(result == "Instance"){
+                   {result: true, instance: false, software: true});
+    } else if (result === "Instance") {
         running = false;
         runProcess(($SCRIPT_ROOT + "/runInstanceProfile"),
-      {result: true, instance:true, software:false});
+                   {result: true, instance: true, software: false});
     }
     deleteCookie("slapgridCMD");
-  return (result != null);
+    return (result !== null);
 }

slapos/runner/static/js/scripts/project.js

-$(document).ready( function() {
-	var method = $("input#method").val();
-	var workdir = $("input#workdir").val();
-	if (method != "file"){
-		script = "/openFolder";
-		$('#fileTree').fileTree({ root: workdir, script: $SCRIPT_ROOT + script, folderEvent: 'click', expandSpeed: 750, collapseSpeed: 750, multiFolder: false, selectFolder: true }, function(file) { 
+/*jslint undef: true */
+/*global $, document, window, $SCRIPT_ROOT */
+/* vim: set et sts=4: */
+
+$(document).ready(function () {
+    "use strict";
+
+    var method = $("input#method").val(),
+        workdir = $("input#workdir").val();
+
+    function checkFolder(path) {
+        $.ajax({
+            type: "POST",
+            url: $SCRIPT_ROOT + '/checkFolder',
+            data: "path=" + path,
+            success: function (data) {
+                var path = data.result;
+                $("input#path").val(path);
+                if (path !== "") {
+                    $("#check").fadeIn('normal');
+                } else {
+                    $("#check").hide();
+                }
+            }
+        });
+        return "";
+    }
+
+    function selectFile(file) {
+        $("#info").empty();
+        $("input#subfolder").val(file);
+        if (method === "open") {
+            $("#info").append("Selection: " + file);
+            checkFolder(file);
+        } else {
+            if ($("input#software").val() !== "" && $("input#software").val().match(/^[\w\d._\-]+$/)) {
+                $("#info").append("New Software in: " + file + $("input#software").val());
+            } else {
+                $("#info").append("Selection: " + file);
+            }
+        }
+        return;
+    }
+
+    if (method !== "file") {
+        $('#fileTree').fileTree({root: workdir, script: $SCRIPT_ROOT + '/openFolder', folderEvent: 'click', expandSpeed: 750, collapseSpeed: 750, multiFolder: false, selectFolder: true }, function (file) {
             selectFile(file);
         });
     }
     $("input#subfolder").val("");
-	$("#create").click(function(){
-		repo_url = $("input#software").val();
-		if($("input#software").val() == "" || !$("input#software").val().match(/^[\w\d._-]+$/)){
-			$("#error").Popup("Invalid Software name", {type:'alert', duration:3000})
+    $("#create").click(function () {
+        if ($("input#software").val() === "" || !$("input#software").val().match(/^[\w\d._\-]+$/)) {
+            $("#error").Popup("Invalid Software name", {type: 'alert', duration: 3000});
             return false;
         }
-		if($("input#subfolder").val() == ""){
-			$("#error").Popup("Select the parent folder of your software!", {type:'alert', duration:3000})
+        if ($("input#subfolder").val() === "") {
+            $("#error").Popup("Select the parent folder of your software!", {type: 'alert', duration: 3000});
             return false;
         }
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/createSoftware',
             data: "folder=" + $("input#subfolder").val() + $("input#software").val(),
-			success: function(data){
-				if(data.code == 1){
-					location.href = $SCRIPT_ROOT + '/editSoftwareProfile'
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000})
-					
+            success: function (data) {
+                if (data.code === 1) {
+                    window.location.href = $SCRIPT_ROOT + '/editSoftwareProfile';
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
             }
         });
         return false;
     });
 
-	$("#open").click(function(){
+    $("#open").click(function () {
         $("#flash").fadeOut('normal');
         $("#flash").empty();
         $("#flash").fadeIn('normal');
-		if($("input#path").val() == ""){
-			$("#error").Popup("Select a valid Software Release folder!", {type:'alert', duration:3000})
+        if ($("input#path").val() === "") {
+            $("#error").Popup("Select a valid Software Release folder!", {type: 'alert', duration: 3000});
             return false;
         }
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/setCurrentProject',
             data: "path=" + $("input#path").val(),
-			success: function(data){
-				if(data.code == 1){
-					location.href = $SCRIPT_ROOT + '/editSoftwareProfile'
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000})
+            success: function (data) {
+                if (data.code === 1) {
+                    window.location.href = $SCRIPT_ROOT + '/editSoftwareProfile';
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
             }
         });
         return false;
     });
-	
-	function selectFile(file){
-		$("#info").empty();		
-		$("input#subfolder").val(file);
-		path = "";
-		if(method == "open"){
-			$("#info").append("Selection: " + file);
-			checkFolder(file);
-		}
-		else{
-			if($("input#software").val() != "" && $("input#software").val().match(/^[\w\d._-]+$/)){
-				$("#info").append("New Software in: " + file + $("input#software").val());
-			}
-			else{
-				$("#info").append("Selection: " + file);
-			}
-		}
-		return;
-	}
-	
-	function checkFolder(path){
-		$.ajax({
-			type: "POST",
-			url: $SCRIPT_ROOT + '/checkFolder',
-			data: "path=" + path,
-			success: function(data){
-				var path = data.result;
-				$("input#path").val(path);
-				if (path != ""){
-					$("#check").fadeIn('normal');					
-				}
-				else{
-					$("#check").hide();
-				}
-			}
-		});
-		return "";
-	}
 });

slapos/runner/static/js/scripts/repo.js

-$(document).ready( function() {
-	var send = false;
-	var getStatus;
+/*jslint undef: true */
+/*global $, document, $SCRIPT_ROOT */
+/* vim: set et sts=4: */
+
+$(document).ready(function () {
+    "use strict";
+
+    var send = false,
+        getStatus;
+
+    function loadBranch(branch) {
+        var i, selected;
+        $("#activebranch").empty();
+        for (i = 0; i < branch.length; i += 1) {
+            selected = (branch[i].indexOf('*') === 0) ? "selected" : "";
+            $("#activebranch").append("<option value='" + branch[i] +
+                "' " + selected + ">" + branch[i] + "</option>");
+        }
+    }
+
+    function gitStatus() {
+        var project = $("#project").val(),
+            urldata = $("input#workdir").val() + "/" + project;
+
+        $("#status").empty();
+        $("#push").hide();
+        $("#flash").empty();
+        if (project === "") {
+            $("#status").append("<h2>Please select one project...</h2><br/><br/>");
+            $("#branchlist").hide();
+            return;
+        }
+        send = true;
+        getStatus = $.ajax({
+            type: "POST",
+            url: $SCRIPT_ROOT + '/getProjectStatus',
+            data: "project=" + urldata,
+            success: function (data) {
+                var message;
+
+                if (data.code === 1) {
+                    $("#branchlist").show();
+                    $("#status").append("<h2>Your Repository status</h2>");
+                    message = data.result.split('\n').join('<br/>');
+                    //alert(message);
+                    $("#status").append("<p>" + message + "</p>");
+                    if (data.dirty) {
+                        $("#push").show();
+                        $("#status").append("<br/><h2>Display Diff for current Project</h2>");
+                        $("#status").append("<p style='font-size:15px;'>You have changes in your project." +
+                            " <a href='" + $SCRIPT_ROOT + "/getProjectDiff/"
+                            + encodeURI(project) + "'>Watch the diff</a></p>");
+                    }
+                    loadBranch(data.branch);
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
+                }
+                send = false;
+            }
+        });
+    }
+
+    function checkout(mode) {
+        if ($("input#branchname").val() === "" ||
+                $("input#branchname").val() === "Enter the branch name...") {
+            $("#error").Popup("Please Enter the branch name", {type: 'alert', duration: 3000});
+            return false;
+        }
+        var project = $("#project").val(),
+            branch = $("input#branchname").val();
+        $.ajax({
+            type: "POST",
+            url: $SCRIPT_ROOT + '/newBranch',
+            data: {project: $("input#workdir").val() + "/" + project, name: branch, create: mode},
+            success: function (data) {
+                if (data.code === 1) {
+                    $("input#branchname").val("Enter the branch name...");
                     gitStatus();
-	$("#project").change(function(){
-		if (send){
+                } else {
+                    $("#error").Popup(data.result, {type: 'error'});
+                }
+            }
+        });
+        return false;
+    }
+
+
+    gitStatus();
+
+    $("#project").change(function () {
+        if (send) {
             getStatus.abort();
-			send=false;
+            send = false;
         }
         gitStatus();
     });
-	$("#activebranch").change(function(){
-		var branch = $("#activebranch").val();
-		var project = $("#project").val();
+    $("#activebranch").change(function () {
+        var branch = $("#activebranch").val(),
+            project = $("#project").val();
+
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/changeBranch',
             data: "project=" + $("input#workdir").val() + "/" + project + "&name=" + branch,
-			success: function(data){
-				if(data.code == 1){
+            success: function (data) {
+                if (data.code === 1) {
                     gitStatus();
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
             }
         });
     });
-	$("#addbranch").click(function(){
+    $("#addbranch").click(function () {
         checkout("1");
         return false;
     });
-	$("#docheckout").click(function(){
+    $("#docheckout").click(function () {
         checkout("0");
         return false;
     });
-	$("#commit").click(function(){
-		if($("input#commitmsg").val() == "" ||
-			$("input#commitmsg").val() == "Enter message..."){
-			$("#error").Popup("Please Enter the commit message", {type:'alert', duration:3000});
+    $("#commit").click(function () {
+        if ($("input#commitmsg").val() === "" ||
+                $("input#commitmsg").val() === "Enter message...") {
+            $("#error").Popup("Please Enter the commit message", {type: 'alert', duration: 3000});
             return false;
         }
-		if (send){
+        if (send) {
             return false;
         }
         send = true;
@@ -52,19 +137,18 @@ $(document).ready( function() {
             type: "POST",
             url: $SCRIPT_ROOT + '/pushProjectFiles',
             data: {project: $("input#workdir").val() + "/" + project, msg: $("input#commitmsg").val()},
-			success: function(data){
-				if(data.code == 1){
-					if (data.result != ""){
-						$("#error").Popup(data.result, {type:'error', duration:5000});
+            success: function (data) {
+                if (data.code === 1) {
+                    if (data.result !== "") {
+                        $("#error").Popup(data.result, {type: 'error', duration: 5000});
+                    } else {
+                        $("#error").Popup("Commit done!", {type: 'confirm', duration: 3000});
                     }
-					else
-						$("#error").Popup("Commit done!", {type:'confirm', duration:3000});
                     gitStatus();
+                } else {
+                    $("#error").Popup(data.result, {type: 'error'});
                 }
-				else{
-					$("#error").Popup(data.result, {type:'error'});
-				}
-				$("#imgwaitting").hide()
+                $("#imgwaitting").hide();
                 $("#commit").empty();
                 $("#commit").attr("value", "Commit");
                 send = false;
@@ -72,8 +156,9 @@ $(document).ready( function() {
         });
         return false;
     });
+
     /*
-	$("#pullbranch").click(function(){
+    $("#pullbranch").click(function (){
       if (send){
         return false;
       }
@@ -86,16 +171,15 @@ $(document).ready( function() {
         type: "POST",
         url: $SCRIPT_ROOT + '/pullProjectFiles',
         data: "project=" + $("input#workdir").val() + "/" + project,
-			success: function(data){
-				if(data.code == 1){
+        success: function (data){
+          if (data.code == 1){
             if (data.result != ""){
               error(data.result);
             }
             else
               error("Pull done!");
             gitStatus();
-				}
-				else{
+          } else {
             error(data.result);
           }
           $("#pullimgwaitting").hide()
@@ -106,75 +190,5 @@ $(document).ready( function() {
       });
       return false;
     });*/
-	function gitStatus(){
-		var project = $("#project").val();
-		$("#status").empty();
-		$("#push").hide();
-		$("#flash").empty();
-		if (project == ""){
-			$("#status").append("<h2>Please select one project...</h2><br/><br/>");
-			$("#branchlist").hide();
-			return;
-		}
-		send = true;
-		var urldata = $("input#workdir").val() + "/" + project;
-		getStatus = $.ajax({
-			type: "POST",
-			url: $SCRIPT_ROOT + '/getProjectStatus',
-			data: "project=" + urldata,
-			success: function(data){
-				if(data.code == 1){
-					$("#branchlist").show();
-					$("#status").append("<h2>Your Repository status</h2>");
-					message = data.result.split('\n').join('<br/>');
-					//alert(message);
-					$("#status").append("<p>" + message + "</p>");
-					if(data.dirty){
-						$("#push").show();
-						$("#status").append("<br/><h2>Display Diff for current Project</h2>");
-						$("#status").append("<p style='font-size:15px;'>You have changes in your project." +
-							" <a href='" + $SCRIPT_ROOT + "/getProjectDiff/"
-							+ encodeURI(project) + "'>Watch the diff</a></p>");
-					}
-					loadBranch(data.branch);
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
-				}
-				send = false;
-			}
-		});
-	}
-	function checkout(mode){
-		if($("input#branchname").val() == "" ||
-			$("input#branchname").val() == "Enter the branch name..."){
-			$("#error").Popup("Please Enter the branch name", {type:'alert', duration:3000});
-			return false;
-		}
-		var project = $("#project").val();
-		var branch = $("input#branchname").val();
-		$.ajax({
-			type: "POST",
-			url: $SCRIPT_ROOT + '/newBranch',
-			data: {project:$("input#workdir").val() + "/" + project, name:branch, create:mode},
-			success: function(data){
-				if(data.code == 1){
-					$("input#branchname").val("Enter the branch name...");
-					gitStatus();
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error'});
-				}
-			}
-		});
-		return false;
-	}
-	function loadBranch(branch){
-		$("#activebranch").empty();
-		for(i=0; i< branch.length; i++){
-			selected = (branch[i].indexOf('*') == 0)? "selected":"";
-			$("#activebranch").append("<option value='" + branch[i] +
-				"' " + selected + ">" + branch[i] + "</option>");
-		}
-	}
+
 });

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

-$(document).ready( function() {
-	var editor = ace.edit("editor");
+/*jslint undef: true */
+/*global $, document, $SCRIPT_ROOT, ace */
+/*global path: true */
+/* vim: set et sts=4: */
+
+
+$(document).ready(function () {
+    "use strict";
+
+    var editor = ace.edit("editor"),
+        CurrentMode,
+        script = "/readFolder",
+        softwareDisplay = true,
+        Mode,
+        modes,
+        projectDir = $("input#project").val(),
+        workdir = $("input#workdir").val(),
+        currentProject = workdir + "/" + projectDir.replace(workdir, "").split('/')[1],
+        send = false,
+        edit = false,
+        selection = "",
+        edit_status = "";
+
+    var base_path = function() {
+      return softwareDisplay ? projectDir : currentProject;
+    }
+
+    function setEditMode(file) {
+        var i,
+            CurrentMode = require("ace/mode/text").Mode;
+        editor.getSession().setMode(new CurrentMode());
+        for (i = 0; i < modes.length; i += 1) {
+            if (modes[i].extRe.test(file)) {
+                editor.getSession().setMode(modes[i].mode);
+                break;
+            }
+        }
+    }
+
+    function openFile(file) {
+        if (send) {
+            return;
+        }
+        send = true;
+        edit = false;
+        if (file.substr(-1) !== "/") {
+            $.ajax({
+                type: "POST",
+                url: $SCRIPT_ROOT + '/getFileContent',
+                data: {file: file},
+                success: function (data) {
+                    var name, start, path = file;
+                    if (data.code === 1) {
+                        $("#edit_info").empty();
+                        name = file.split('/');
+                        if (file.length > 60) {
+                            //substring title.
+                            start = file.length - 60;
+                            path = "..." + file.substring(file.indexOf("/", (start + 1)));
+                        }
+                        $("#edit_info").append(" " + path);
+                        $("a#option").show();
+                        editor.getSession().setValue(data.result);
+                        setEditMode(name[name.length - 1]);
+                        edit = true;
+                        $("input#subfolder").val(file);
+                        $("span#edit_status").html("");
+                        edit_status = "";
+                    } else {
+                        $("#error").Popup(data.result, {type: 'error', duration: 5000});
+                    }
+                    send = false;
+                }
+            });
+        } else {
+            $("#edit_info").empty();
+            $("#edit_info").append("No file in editor");
+            $("a#option").hide();
+            editor.getSession().setValue("");
+        }
+        return;
+    }
+
+    function selectFile(file) {
+        $("#info").empty();
+        $("#info").append("Selection: " + file);
+        selection = file;
+        return;
+    }
+    /*
+    function setDetailBox() {
+        var state = $("#details_box").css("display");
+        if (state === "none") {
+            $("#details_box").fadeIn("normal");
+            $("#details_head").removeClass("hide");
+            $("#details_head").addClass("show");
+        } else {
+            $("#details_box").fadeOut("normal");
+            $("#details_head").removeClass("show");
+            $("#details_head").addClass("hide");
+        }
+    } */
+
+    function switchContent() {
+        if (!softwareDisplay) {
+            $("#switch").empty();
+            $("#switch").append("Switch to Profile&nbsp;");
+            $('#fileTreeFull').show();
+            $('#fileTree').hide();
+        } else {
+            $("#switch").empty();
+            $("#switch").append("Switch to Project");
+            $('#fileTree').show();
+            $('#fileTreeFull').hide();
+        }
+        $("#info").empty();
+        $("#info").append("Selection: " + base_path());
+        selection = "";
+    }
+
+    function getmd5sum() {
+        if (send) {
+            return;
+        }
+        send = true;
+        $.ajax({
+            type: "POST",
+            url: $SCRIPT_ROOT + '/getmd5sum',
+            data: {file: $("input#subfolder").val()},
+            success: function (data) {
+                if (data.code === 1) {
+                    $("#info").empty();
+                    $("#info").html("Md5sum Current file: " + data.result);
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
+                }
+                send = false;
+            }
+        });
+    }
+
+    function setDevelop(developList) {
+        if (developList === null || developList.length <= 0) {
+            return;
+        }
+        editor.navigateFileStart();
+        editor.find('buildout', {caseSensitive: true, wholeWord: true});
+        if (!editor.getSelectionRange().isEmpty()) {
+            //editor.find("",{caseSensitive: true,wholeWord: true,regExp: true});
+            //if (!editor.getSelectionRange().isEmpty()) {
+                    //alert("found");
+            //}
+            //else{alert("no found");
+            //}
+        } else {
+            $("#error").Popup("Can not found part [buildout]! Please make sure that you have a cfg file", {type: 'alert', duration: 3000});
+            return;
+        }
+        editor.navigateLineEnd();
+        $.post($SCRIPT_ROOT + "/getPath", {file: developList.join("#")}, function (data) {
+            var result, i;
+            if (data.code === 1) {
+                result = data.result.split('#');
+                editor.insert("\ndevelop =\n\t" + result[0] + "\n");
+                for (i = 1; i < result.length; i += 1) {
+                    editor.insert("\t" + result[i] + "\n");
+                }
+            }
+        })
+            .error(function () {})
+            .complete(function () {});
+        editor.insert("\n");
+    }
+
+
     editor.setTheme("ace/theme/crimson_editor");
 
-	var CurentMode = require("ace/mode/text").Mode;
-	editor.getSession().setMode(new CurentMode());
+    CurrentMode = require("ace/mode/text").Mode;
+    editor.getSession().setMode(new CurrentMode());
     editor.getSession().setTabSize(2);
     editor.getSession().setUseSoftTabs(true);
     editor.renderer.setHScrollBarAlwaysVisible(false);
 
-	var script = "/readFolder";
-	var softwareDisplay = true;
-	var Mode = function(name, desc, clazz, extensions) {
+    Mode = function (name, desc, Clazz, extensions) {
         this.name = name;
         this.desc = desc;
-		this.clazz = clazz;
-		this.mode = new clazz();
+        this.clazz = Clazz;
+        this.mode = new Clazz();
         this.mode.name = name;
 
         this.extRe = new RegExp("^.*\\.(" + extensions.join("|") + ")$");
     };
-	var modes = [
-		new Mode("php", "PHP",require("ace/mode/php").Mode, ["php", "in", "inc"]),
+    modes = [
+        new Mode("php", "PHP", require("ace/mode/php").Mode, ["php", "in", "inc"]),
         new Mode("python", "Python", require("ace/mode/python").Mode, ["py"]),
         new Mode("buildout", "Python Buildout config", require("ace/mode/buildout").Mode, ["cfg"])
     ];
-	var projectDir = $("input#project").val();
-	var workdir = $("input#workdir").val();
-	var currentProject = workdir + "/" + projectDir.replace(workdir, "").split('/')[1];
-	var send = false;
-	var edit = false;
-	$('#fileTree').fileTree({ root: projectDir, script: $SCRIPT_ROOT + script, folderEvent: 'click', expandSpeed: 750, collapseSpeed: 750, multiFolder: false, selectFolder: true }, function(file) {
+    $('#fileTree').fileTree({ root: projectDir, script: $SCRIPT_ROOT + script, folderEvent: 'click', expandSpeed: 750, collapseSpeed: 750, multiFolder: false, selectFolder: true }, function (file) {
         selectFile(file);
+    }, function (file) { openFile(file); });
+    $('#fileTreeFull').fileTree({ root: currentProject, script: $SCRIPT_ROOT + script, folderEvent: 'click', expandSpeed: 750, collapseSpeed: 750, multiFolder: false, selectFolder: true }, function (file) {
+        selectFile(file);
+    }, function (file) { openFile(file); });
+    $("#info").append("Selection: " + base_path());
+    /*setDetailBox();*/
+
+    editor.on("change", function (e) {
+        if (edit_status === "" && edit) {
+            $("span#edit_status").html("*");
+        }
     });
-	setDetailBox();
-	$("#add").click(function(){
-		var path = (softwareDisplay)? projectDir:currentProject;
-		if (send) return false;
-		if($("input#file").val() == "" ||
-			$("input#file").val() == "Enter name here..."){
-			$("#error").Popup("Please enter your file or folder name", {type:'alert', duration:3000});
+
+    $("#add").click(function () {
+        var path = base_path();
+        if (send) {
             return false;
         }
-		if($("input#subfolder").val() != ""){
-			path = $("input#subfolder").val();
+        if ($("input#file").val() === "" || $("input#file").val() === "Name here...") {
+            $("#error").Popup("Please select a directory or nothing for root directory and enter your file name", {type: 'alert', duration: 5000});
+            return false;
+        }
+        if (selection !== "") {
+            path = selection;
         }
         path = path + "/" + $("input#file").val();
         send = true;
@@ -50,18 +228,17 @@ $(document).ready( function() {
             type: "POST",
             url: $SCRIPT_ROOT + '/createFile',
             data: "file=" + path + "&type=" + $("#type").val(),
-			success: function(data){
-				if(data.code == 1){
+            success: function (data) {
+                if (data.code === 1) {
                     switchContent();
                     $("input#file").val("");
                     $("#flash").fadeOut('normal');
                     $("#flash").empty();
                     $("#info").empty();
-					$("#info").append("Select parent directory or nothing for root...");
-					$("input#subfolder").val("");
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
+                    $("#info").append("Selection: " + base_path());
+                    selection = "";
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
                 send = false;
             }
@@ -69,23 +246,28 @@ $(document).ready( function() {
         return false;
     });
 
-	$("#save").click(function(){
-		if(!edit){
-			$("#error").Popup("Please select the file to edit", {type:'alert', duration:3000});
+    $("#save").click(function () {
+        if (!edit) {
+            $("#error").Popup("Please select the file to edit", {type: 'alert', duration: 3000});
+            return false;
+        }
+        if (send) {
             return false;
         }
-		if (send) return false;
         send = true;
         $.ajax({
             type: "POST",
             url: $SCRIPT_ROOT + '/saveFileContent',
-			data: {file: $("input#subfolder").val(), content: editor.getSession().getValue()},
-			success: function(data){
-				if(data.code == 1){
-					$("#error").Popup("File saved succefuly!", {type:'confirm', duration:3000});
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
+            data: {
+                file: $("input#subfolder").val(),
+                content: editor.getSession().getValue()
+            },
+            success: function (data) {
+                if (data.code === 1) {
+                    $("#error").Popup("File saved succefuly!", {type: 'confirm', duration: 3000});
+                    $("span#edit_status").html("");
+                } else {
+                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
                 send = false;
             }
@@ -93,183 +275,48 @@ $(document).ready( function() {
         return false;
     });
 
-	$("#details_head").click(function(){
+    /*$("#details_head").click(function () {
         setDetailBox();
-	});
+    });*/
 
-	$("#switch").click(function(){
+    $("#switch").click(function () {
         softwareDisplay = !softwareDisplay;
         switchContent();
         return false;
     });
-	$("#getmd5").click(function(){
+    $("#getmd5").click(function () {
         getmd5sum();
         return false;
     });
 
-	$("#clearselect").click(function(){
+    $("#clearselect").click(function () {
+        edit = false;
         $("#info").empty();
-	    $("#info").append("Select directory or nothing for root directory...");
+        $("#info").append("Selection: " + base_path());
         $("input#subfolder").val("");
         $("#edit_info").empty();
-	    $("#edit_info").append("No file selected");
+        $("#edit_info").append("No file in editor");
         editor.getSession().setValue("");
-	    $("#md5sum").empty();
         $("a#option").hide();
+        selection = "";
         return false;
     });
-	$("#adddevelop").click(function(){
-	    var developList = new Array();
-	    var i=0;
-	    $("#plist li").each(function(index){
+    $("#adddevelop").click(function () {
+        var developList = [],
+            i = 0;
+        $("#plist li").each(function (index) {
             var elt = $(this).find("input:checkbox");
-		if (elt.is(":checked")){
-		    developList[i] = workdir+"/"+elt.val();
-		    i++;
+            if (elt.is(":checked")) {
+                developList[i] = workdir + "/" + elt.val();
+                i += 1;
                 elt.attr("checked", false);
             }
         });
-	    if (developList.length > 0){setDevelop(developList);}
-	    return false;
-	});
-
-	function getmd5sum(){
-		var file = $("input#subfolder").val();
-		if (send) return;
-		send =true
-		$.ajax({
-			type: "POST",
-			url: $SCRIPT_ROOT + '/getmd5sum',
-			data: {file: $("input#subfolder").val()},
-			success: function(data){
-				if(data.code == 1){
-					$("#md5sum").empty();
-					$("#md5sum").append('md5sum : <span>' + data.result + '</span>');
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
-				}
-				send = false;
-			}
-		});
-	}
-
-	function switchContent(){
-	    var root = projectDir;
-	    if(!softwareDisplay){
-		$("#switch").empty();
-		$("#switch").append("Switch to Software files");
-		root = currentProject;
-	    }
-	    else{
-		$("#switch").empty();
-		$("#switch").append("Switch to Project files");
+        if (developList.length > 0) {
+            setDevelop(developList);
         }
-	    $('#fileTree').fileTree({ root: root, script: $SCRIPT_ROOT + script, folderEvent: 'click', expandSpeed: 750, collapseSpeed: 750, multiFolder: false, selectFolder: true }, function(file) {
-	        selectFile(file);
+        return false;
     });
-	    $("#info").empty();
-	    $("#info").append("Select directory or nothing for root directory...");
-	    $("input#subfolder").val("");
-	}
 
-	function setDetailBox(){
-	    var state = $("#details_box").css("display");
-	    if (state == "none"){
-		$("#details_box").slideDown("normal");
-		$("#details_head").removeClass("hide");
-		$("#details_head").addClass("show");
-	    }
-	    else{
-		$("#details_box").slideUp("normal");
-		$("#details_head").removeClass("show");
-		$("#details_head").addClass("hide");
-	    }
-	}
 
-	function selectFile(file){
-		$("#info").empty();
-		$("#info").append(file);
-		$("input#subfolder").val(file);
-		$("#md5sum").empty();
-		path = "";
-		send = false;
-		edit = false;
-		if(file.substr(-1) != "/"){
-			$.ajax({
-			type: "POST",
-			url: $SCRIPT_ROOT + '/getFileContent',
-			data: {file: file},
-			success: function(data){
-				if(data.code == 1){
-					$("#edit_info").empty();
-					var name = file.split('/');
-					if(file.length > 65){
-						//substring title.
-						var start = file.length - 65;
-						file = "..." + file.substring(file.indexOf("/", (start + 1)));
-					}
-					$("#edit_info").append("Current file: " +
-						file);
-					$("a#option").show();
-					editor.getSession().setValue(data.result);
-					setEditMode(name[name.length - 1]);
-					edit = true;
-				}
-				else{
-					$("#error").Popup(data.result, {type:'error', duration:5000});
-				}
-				send = false;
-			}
-		});
-		}
-		else{
-			$("#edit_info").empty();
-			$("#edit_info").append("No file selected");
-			$("a#option").hide();
-			editor.getSession().setValue("");
-		}
-		return;
-	}
-
-	function setEditMode(file){
-		var CurentMode = require("ace/mode/text").Mode;
-		editor.getSession().setMode(new CurentMode());
-		for (var i=0; i< modes.length; i++){
-			if(modes[i].extRe.test(file)){
-				editor.getSession().setMode(modes[i].mode);
-				set = true;
-				break;
-			}
-		}
-	}
-	function setDevelop(developList){
-	    if (developList==null || developList.length <= 0) return;
-	    editor.navigateFileStart();
-	    editor.find('buildout',{caseSensitive: true,wholeWord: true});
-	    if(!editor.getSelectionRange().isEmpty()){
-		//editor.find("",{caseSensitive: true,wholeWord: true,regExp: true});
-		//if(!editor.getSelectionRange().isEmpty()){
-			//alert("found");
-		//}
-		//else{alert("no found");
-		//}
-	    }
-	    else{
-		$("#error").Popup("Can not found part [buildout]! Please make sure that you have a cfg file", {type:'alert', duration:3000});
-		return;
-	    }
-	    editor.navigateLineEnd();
-	    $.post($SCRIPT_ROOT+"/getPath", {file:developList.join("#")}, function(data) {
-		    if(data.code==1){
-			var result = data.result.split('#');
-			editor.insert("\ndevelop =\n\t" + result[0] + "\n");
-			for(var i=1; i<result.length; i++)
-			    editor.insert("\t" + result[i] + "\n");
-		    }
-	    })
-	    .error(function() {  })
-	    .complete(function(){});
-	    editor.insert("\n");
-	}
 });

slapos/runner/static/js/scripts/viewlog.js

-$(document).ready( function() {
-  openedlogpage = $("input#type").val();
-  updatelogBox();
-  var state = getCookie("autoUpdate");
+/*jslint undef: true */
+/*global $, document, window, processState, getCookie, setCookie, setSpeed, $SCRIPT_ROOT */
+/*global openedlogpage: true */
+/* vim: set et sts=4: */
 
-  $("#logheader").click(function(){
-    setupBox();
-  });
-  $("#manual").change(function(){
-    setCookie("autoUpdate", "manual");
-    if ($("input#type").val() == "instance"){location.href = $SCRIPT_ROOT + "/viewInstanceLog";}
-    else{location.href = $SCRIPT_ROOT + "/viewSoftwareLog";}
-  });
-  $("#live").change(function(){
-    updatelogBox();$("#logconfigbox").find("input:radio").attr('checked', false);$("#live").attr('checked', true);
-    setSpeed(100);setCookie("autoUpdate", "live");openedlogpage = $("input#type").val();});
-  $("#slow").change(function(){
-    updatelogBox();$("#logconfigbox").find("input:radio").attr('checked', false);$("#slow").attr('checked', true);
-    setSpeed(2500);setCookie("autoUpdate", "slow");openedlogpage = $("input#type").val();});
-  if(state){
-    $("#"+state).attr('checked', true);
-    updatelogBox();
-    if (state == "manual"){
-      openedlogpage = ""; setSpeed(0);
-    }
-    else{setSpeed((state=="live")?100:2500);}
-  }
-  else{$("#slow").attr('checked', true);}
+$(document).ready(function () {
+    "use strict";
 
-  function setupBox(){
+    function setupBox() {
         var state = $("#logconfigbox").css("display");
-    if (state == "none"){
+        if (state === "none") {
             $("#logconfigbox").slideDown("normal");
             $("#logheader").removeClass("hide");
             $("#logheader").addClass("show");
-    }
-    else{
+        } else {
             $("#logconfigbox").slideUp("normal");
             $("#logheader").removeClass("show");
             $("#logheader").addClass("hide");
         }
     }
 
-  function updatelogBox(){
-    if(processState=="Stopped" || processState=="Checking" || $("#manual").is(":checked")){
+    function updatelogBox() {
+        if (processState === "Stopped" || processState === "Checking" || $("#manual").is(":checked")) {
             $("#salpgridLog").hide();
             $("#manualLog").show();
             $("#manualLog")
-        .scrollTop($("#manualLog")[0].scrollHeight - $("#manualLog")
-          .height());
-    }
-    else{
+                .scrollTop($("#manualLog")[0].scrollHeight - $("#manualLog").height());
+        } else {
             $("#salpgridLog").show();
             $("#manualLog").hide();
         }
     }
+
+    openedlogpage = $("input#type").val();
+    updatelogBox();
+    var state = getCookie("autoUpdate");
+
+    $("#logheader").click(function () {
+        setupBox();
+    });
+
+    $("#manual").change(function () {
+        setCookie("autoUpdate", "manual");
+        if ($("input#type").val() === "instance") {
+            window.location.href = $SCRIPT_ROOT + "/viewInstanceLog";
+        } else {
+            window.location.href = $SCRIPT_ROOT + "/viewSoftwareLog";
+        }
+    });
+
+    $("#live").change(function () {
+        updatelogBox();
+        $("#logconfigbox").find("input:radio").attr('checked', false);
+        $("#live").attr('checked', true);
+        setSpeed(100);
+        setCookie("autoUpdate", "live");
+        openedlogpage = $("input#type").val();
+    });
+
+    $("#slow").change(function () {
+        updatelogBox();
+        $("#logconfigbox").find("input:radio").attr('checked', false);
+        $("#slow").attr('checked', true);
+        setSpeed(2500);
+        setCookie("autoUpdate", "slow");
+        openedlogpage = $("input#type").val();
+    });
+
+    if (state) {
+        $("#" + state).attr('checked', true);
+        updatelogBox();
+        if (state === "manual") {
+            openedlogpage = "";
+            setSpeed(0);
+        } else {
+            setSpeed((state === "live") ? 100 : 2500);
+        }
+    } else {
+        $("#slow").attr('checked', true);
+    }
 });

slapos/runner/static/js/scripts/workspace.js

+/*jslint undef: true */
+/*global $, document, window, $SCRIPT_ROOT, ace */
+/* vim: set et sts=4: */
+
+
+$(document).ready(function () {
+    "use strict";
+
+    $('#fileNavigator').gsFileManager({script: $SCRIPT_ROOT + "/fileBrowser", root:'workspace/'});
+});

slapos/runner/templates/cloneRepository.html

@@ -36,7 +36,7 @@
       </div>
       <br/>
       <h2>Set your Security Mode</h2>
-      <div class="menu-box-right" style="width: 592px;">
+      <div class="menu-box-right">
         <div style="background:#fff; padding:10px; min-height:100px; font-size:14px;">
         <div id="box0">
       	<h2>Clone Repository without using HTTPS and SSH</h2><br/>
@@ -53,7 +53,7 @@
       	</div>
       	<div id="box2" style="display:none;">
       	<h2>Enter your username and password for https authentication access</h2><br/>
-      	<div style="margin-left:80px; margin-bottom:20px;">
+      	<div style="margin-left:140px; margin-bottom:20px;">
       	<label for='username'>Your username:&nbsp;&nbsp;</label>
       	<input type="text" name="username" id="username" size='20' value="Enter your username..." /><br/><br/>
       	<label for='password'>Your password: &nbsp;&nbsp;</label>
@@ -63,7 +63,7 @@
       	</div>
       	</div>
       </div>
-      <div class="menu-box-left"  style="width: 115px;">
+      <div class="menu-box-left">
       	<ul id="modelist">
       		<li class="checked"><input type="radio" name="security" id="nothing" value="nothing" /><label for="nothing">ReadOnly</label></li>
       		<li><input type="radio" name="security" id="ssh" value="SSH" checked /><label for="ssh">SSH Mode</label></li>

slapos/runner/templates/editFile.html

@@ -24,17 +24,15 @@
 </form>
 <div id="tooltip-editOption" style="display:none">
   <span class="list">MD5 SUM for the current file</span>
-    <div style="margin-top:3px; margin-bottom:5px;border-bottom: 1px dashed #666666; heigth:1px"></div>
     <a id='getmd5' href="#">Get or Update md5sum</a>
-    <br/><span class="list">Add Project to Develop</span><br/>
-    <div style="margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"></div>
+    <div class="sep"></div>
+    <span class="list">Add Project to Develop</span>
     <ul id="plist">
     {% for name in projectList%}
       <li><input type="checkbox" name="develop" value="{{name}}" id="{{name}}">
     	<label>{{name}}</label></li>
     {% endfor %}
     </ul>
-    <br/>
     <a href="#" id="adddevelop" class="lshare">Add to profile</a>
 </div>
 {% endblock %}

slapos/runner/templates/index.html

@@ -23,6 +23,11 @@
     <img src="{{ url_for('static', filename='images/manage_repo.png') }}" />
 </div>
 <div class="clear"></div>
+<div class="umenu">
+  <h2><a href="{{ url_for('myAccount')}}">Your Account</a></h2>
+  <p>Update your account informations</p>
+  <img src="{{ url_for('static', filename='images/user_card.png') }}" />
+</div>
 <div class="lmenu smaller">
     <h2><a href="{{ url_for('openProject', method='new')}}">Create your Software Release</a></h2>
     <p>To create a new Software Release, choose the project directory in which you want to create your software.<!-- You will then be able to edit and
@@ -31,11 +36,6 @@
     <img src="{{ url_for('static', filename='images/folder_blue.png') }}" />
     <div class="clear"></div>
 </div>
-<div class="umenu">
-  <h2><a href="{{ url_for('myAccount')}}">Your Account</a></h2>
-  <p>Update your account informations</p>
-  <img src="{{ url_for('static', filename='images/user_card.png') }}" />
-</div>
 <div class="clear"></div>
 </div>
 </div>

slapos/runner/templates/instanceInspect.html

@@ -20,7 +20,7 @@
     <ul>
       <li><a href="#tab1" class="active">Slapgrid Supervisor</a></li>
       <li><a href="#tab2">SLAP Response</a></li>
-      <li><a href="#tab3" id="parameterTab">Parameters</a></li>
+      <li><a href="#tab3" id="parameterTab">SLAP Parameters</a></li>
       <li><a href="#tab4" id="instancetabfiles">Partitions Content</a></li>
     </ul><!-- //Tab buttons -->
     <div class="tabDetails">
@@ -51,7 +51,7 @@
       <div id="tab2" class="tabContents">
       {% if slap_status %}
       <p>Uses parameters below to run your application</p>
-      <div class="menu-box-right" style="width: 597px;">
+      <div class="menu-box-right">
       <div style="background:#fff; padding:10px;">
         {% for item in slap_status %}
         <div id="box{{item[0]}}" style="display:none;">
@@ -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>
@@ -82,7 +82,7 @@
         {% endfor %}
       </div>
       </div>
-      <div class="menu-box-left" style="width: 110px;">
+      <div class="menu-box-left">
         <ul id="slappart">
           {% for item in slap_status %}
             <li><input type="radio" name="slapresponse" id="{{item[0]}}" value="{{item[0]}}" />
@@ -143,6 +143,5 @@
 
 </div>
 </div>
-{{instance}}
 {% endblock %}
 

slapos/runner/templates/layout.html

@@ -13,7 +13,7 @@
         <meta name="description" content="" />
 
         <link href="{{ url_for('static', filename='css/styles.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
-        <script src="{{ url_for('static', filename='js/jquery/jquery-1.8.0.min.js') }}" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ url_for('static', filename='js/jquery/jquery-1.8.0.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/popup.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>
@@ -64,19 +64,17 @@
                 </div>
                 <div class="wmenu">
                     <ul>
-                        <li><span class="title_software">Software</span></li>
-                        <li><a href="{{ url_for('editSoftwareProfile') }}">Edit</a></li>
-                        <li><a href="{{ url_for('runSoftwareProfile') }}" id="softrun">Run</a></li>
-                        <li><a href="{{ url_for('viewSoftwareLog') }}">Build log</a></li>
-                        <li><a href="{{ url_for('inspectSoftware') }}">Inspect</a></li>
-                        <li><a id="removeSr" href="#">Remove all</a></li>
-
-                        <li class="space"><span class="title_instance">Instance</span></li>
-                        <li><a href="{{ url_for('editInstanceProfile') }}">Edit</a></li>
-                        <li><a href="{{ url_for('runInstanceProfile') }}" id="instrun">Run</a></li>
-                        <li><a href="{{ url_for('viewInstanceLog') }}">Build log</a></li>
-                        <li><a href="{{ url_for('inspectInstance') }}">Inspect</a></li>
-                        <li><a id="removeIst" href="#">Remove all</a></li>
+                        <li><a href="{{ url_for('editSoftwareProfile') }}">Profiles</a></li>
+                        <li><a href="{{ url_for('browseWorkspace') }}">Workspace</a></li>
+                        <li class='sep'></li>
+                        <li><a href="{{ url_for('runSoftwareProfile') }}" id="softrun">Run software</a></li>
+                        <li><a href="{{ url_for('viewSoftwareLog') }}">Software log</a></li>
+                        <li><a href="{{ url_for('inspectSoftware') }}">SR result</a></li>
+                        <li class='sep'></li>
+                        <li><a href="{{ url_for('runInstanceProfile') }}" id="instrun">Run instance</a></li>
+                        <li><a href="{{ url_for('viewInstanceLog') }}">Instance log</a></li>
+                        <li><a href="{{ url_for('inspectInstance') }}">Inspect instance</a></li>
+                        <li><a id="removeIst" href="#">Destroy instance</a></li>
                     </ul>
                 </div>
                 <div class="clear"></div>
@@ -123,11 +121,12 @@
       <div id="tooltip-home" style="display:none">
         <span style="font-weight:bold">QUICK ACCESS TO MENU</span><br/><br/>
           <div style="margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"></div>
-          <ul>
+          <ul class="menu">
             <li><a href="{{ url_for('manageProject')}}">Manage Repositories</a></li>
             <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/runResult.html

@@ -12,9 +12,8 @@
 
 {% endblock %}
 {% block body %}
-<h2>Inspect software release</h2>
 <input type="hidden" name="runnerdir" id="runnerdir" value="{{softwareRoot}}" />
-<label for='softwarelist'>Software Release: </label>
+<label for='softwarelist' class='header'>Inspect software release </label>
 <select name="softwarelist" id="softwarelist">
 {%if not softwares %}<option >No Software Release found</option>{% endif %}
 {%for soft in softwares %}

slapos/runner/templates/softwareFolder.html

@@ -18,51 +18,53 @@
 <input type="hidden" name="workdir" id="workdir" value="{{workDir}}" />
 <input type="hidden" name="subfolder" id="subfolder" value="" />
 <div id="software_folder">
-    <h2 class="hight show" id="details_head">Current software release file content</h2>
-    <div class="software_details" id="details_box">
-	<div id="fileTree" class="file_tree_short"></div>
+  <div class="software_details">
+    <a href="#" id="switch" class="lshare no-right-border" style="float:left">Switch to Project</a>
+    <a href="#"  id="clearselect" class="lshare no-right-border" style="float:left">Reset</a>
+    <a href="#"  id="save" class="lshare" style="float:left">Save</a>
+    <div class="clear"></div>
+    <div id="details_box">
+  	  <div id="fileTree" class="file_tree_short" title="Double click to edit selected file..."></div>
+      <div id="fileTreeFull" style='display:none' class="file_tree_short" title="Double click to edit selected file..."></div>
     	<div class="box_software">
-	    <h2>Add new file or folder</h2>
-	    <input type="text" name="file" id="file" size='22' value="Enter name here..." />
-	    &nbsp;&nbsp;&nbsp;<select name="type" id="type">
+    	    <input type="text" name="file" id="file" size='12' value="Name here..." />
+    	    &nbsp;<select name="type" id="type">
     	    <option value="file">file</option>
     	    <option value="folder">folder</option>
     	    </select>
-	    &nbsp;&nbsp;&nbsp;<input type="submit" name="add" id ="add" value="Add" class="button"/>
-	    <br/><br/>
-	    <a href="#" id="switch" class="lshare">Switch to Project files</a>
-	    <a href=""  id="clearselect" class="lshare">Clear selection</a><br/><br/>
-	    <div id="file_info" class="file_info"><span id="info">Select directory or nothing for root directory...</span></div>
+    	    &nbsp;<input type="submit" name="add" id ="add" value="Add" class="button"/>
     	</div>
-	<div class="clear"></div>
     </div>
-    <div class="clear"></div>
-    <div id="code" style="margin-top:10px">
-    <h2 class='title'><span id="edit_info">No file selected</span> <a style="display:none" id='option' href='#' rel='tooltip' title='Show more option'>[More]</a></h2>
-    <div class='md5sum' id='md5sum'></div>
+  </div>
+  <div id="code">
+  <h2 class='title'>
+    <a style="display:none" id='option' href='#' rel='tooltip' title='Show more option'>[Current file]</a><span id="edit_info">No file in editor</span>
+    <span id="edit_status"></span>
+  </h2>
   <div class="main_content">
 <pre id="editor">
 
 </pre>
             </div>
-	    <input type=submit value="Save" id="save" class="button">
+	    <!--<input type=submit value="Save" id="save" class="button">-->
 	</div>
 
 </div>
+<div class="clear"></div>
+<div id="file_info" class="file_info"><span id="info"></span></div>
+<br/>
 </form>
 <div id="tooltip-option" style="display:none">
-  <span class="list">MD5 SUM for the current file</span>
-    <div style="margin-top:3px; margin-bottom:5px;border-bottom: 1px dashed #666666; heigth:1px"></div>
+  <span class="list first-list">MD5 SUM for the current file</span>
     <a id='getmd5' href="#">Get or Update md5sum</a>
-    <br/><span class="list">Add Project to Develop</span><br/>
-    <div style="margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"></div>
+    <div class="sep"></div>
+    <span class="list">Add Project to Develop</span>
     <ul id="plist">
     {% for name in projectList%}
       <li><input type="checkbox" name="develop" value="{{name}}" id="{{name}}">
       <label>{{name}}</label></li>
     {% endfor %}
     </ul>
-    <br/>
     <a href="#" id="adddevelop" class="lshare">Add to profile</a>
 </div>
 {% endblock %}

slapos/runner/templates/updateInstanceProfile.html

@@ -24,17 +24,15 @@
 </form>
 <div id="tooltip-editOption" style="display:none">
   <span class="list">MD5 SUM for the current file</span>
-    <div style="margin-top:3px; margin-bottom:5px;border-bottom: 1px dashed #666666; heigth:1px"></div>
     <a id='getmd5' href="#">Get or Update md5sum</a>
-    <br/><span class="list">Add Project to Develop</span><br/>
-    <div style="margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"></div>
+    <div class="sep"></div>
+    <span class="list">Add Project to Develop</span><br/>
     <ul id="plist">
     {% for name in projectList%}
   <li><input type="checkbox" name="develop" value="{{name}}" id="{{name}}">
 	<label>{{name}}</label></li>
     {% endfor %}
     </ul>
-    <br/>
     <a href="#" id="adddevelop" class="lshare">Add to profile</a>
 </div>
 {% endblock %}

slapos/runner/templates/updateSoftwareProfile.html

@@ -23,18 +23,17 @@
     </dl>
 </form>
 <div id="tooltip-editOption" style="display:none">
-  <span class="list">MD5 SUM for the current file</span>
-    <div style="margin-top:3px; margin-bottom:5px;border-bottom: 1px dashed #666666; heigth:1px"></div>
+  <span class="list">Current profile options</span>
     <a id='getmd5' href="#">Get or Update md5sum</a>
-    <br/><span class="list">Add Project to Develop</span><br/>
-    <div style="margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"></div>
+    <a href="{{ url_for('editCurrentProject')}}">Edit software release files</a>
+    <div class="sep"></div>
+    <span class="list">Add Project to Develop</span>
     <ul id="plist">
     {% for name in projectList%}
       <li><input type="checkbox" name="develop" value="{{name}}" id="{{name}}">
       <label>{{name}}</label></li>
     {% endfor %}
     </ul>
-    <br/>
     <a href="#" id="adddevelop" class="lshare">Add to profile</a>
 </div>
 {% endblock %}

slapos/runner/templates/viewLog.html

@@ -18,6 +18,6 @@
 <label for="slow">From time to time</label>
 </div>
 <br/>
-<div class="log_content"><textarea class="log" readonly id="salpgridLog"></textarea>
+<div class="log_content"><div class="log" id="salpgridLog"></div>
 <textarea class="log" readonly id="manualLog" style="display:none">{{result}}</textarea></div>
 {% endblock %}

slapos/runner/templates/workspace.html

+{% extends "layout.html" %}
+{% block title %}Browse webrunner workspace{% 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/scripts/workspace.js') }}" type="text/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>
+  <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>
+
+{% endblock %}
+{% block body %}
+<div id="fileNavigator" class="browser"></div>
+{% endblock %}
\ No newline at end of file

slapos/runner/utils.py

 # -*- coding: utf-8 -*-
+# vim: set et sts=2:
+# pylint: disable-msg=W0311,C0301,C0103,C0111,W0141,W0142
 
-import slapos.slap
-import time
-import subprocess
-import os
-from xml_marshaller import xml_marshaller
-from xml.dom import minidom
+
+import md5
+import logging
+import multiprocessing
 import re
+from slapos.runner.process import Popen, isRunning, killRunningProcess
+import shutil
+import os
+import time
 import urllib
+from xml.dom import minidom
+
+import xml_marshaller
 from flask import jsonify
-import shutil
-import string
-import hashlib
-import signal
-import multiprocessing
+
+import slapos.slap
+
 
 # Setup default flask (werkzeug) parser
-import logging
-logger = logging.getLogger('werkzeug')
 
+logger = logging.getLogger('werkzeug')
 
-class Popen(subprocess.Popen):
-  def __init__(self, *args, **kwargs):
-    kwargs['stdin'] = subprocess.PIPE
-    kwargs['stderr'] = subprocess.STDOUT
-    kwargs.setdefault('stdout', subprocess.PIPE)
-    kwargs.setdefault('close_fds', True)
-    subprocess.Popen.__init__(self, *args, **kwargs)
-    self.stdin.flush()
-    self.stdin.close()
-    self.stdin = None
 
 html_escape_table = {
   "&": "&",
@@ -41,7 +35,7 @@ html_escape_table = {
 
 def html_escape(text):
   """Produce entities within text."""
-  return "".join(html_escape_table.get(c,c) for c in text)
+  return "".join(html_escape_table.get(c, c) for c in text)
 
 def getSession(config):
   """
@@ -86,7 +80,7 @@ def saveSession(config, account):
     #save new account data
     open(user, 'w').write((';'.join(account)).encode("utf-8"))
     return True
-  except Exception, e:
+  except Exception as e:
     try:
       if backup:
         os.remove(user)
@@ -169,24 +163,9 @@ def updateProxy(config):
                      'reference': partition_reference,
                      'tap': {'name': partition_reference},
                      })
-  computer.updateConfiguration(xml_marshaller.dumps(slap_config))
+  computer.updateConfiguration(xml_marshaller.xml_marshaller.dumps(slap_config))
   return True
 
-def readPid(file):
-  """Read process pid from file `file`"""
-  if os.path.exists(file):
-    data = open(file).read().strip()
-    try:
-      return int(data)
-    except Exception:
-      return 0
-  return 0
-
-
-def writePid(file, pid):
-  """Save process pid into a file `file`"""
-  open(file, 'w').write(str(pid))
-
 def updateInstanceParameter(config, software_type=None):
   """
   Reconfigure Slapproxy to re-deploy current Software Instance with parameters.
@@ -200,30 +179,16 @@ def updateInstanceParameter(config, software_type=None):
 
 def startProxy(config):
   """Start Slapproxy server"""
-  proxy_pid = os.path.join(config['etc_dir'], 'proxy.pid')
-  pid = readPid(proxy_pid)
-  running = False
-  if pid:
-    try:
-      os.kill(pid, 0)
-    except Exception:
-      pass
-    else:
-      running = True
-  if not running:
-    proxy = Popen([config['slapproxy'], config['configuration_file_path']])
-    proxy_pid = os.path.join(config['etc_dir'], 'proxy.pid')
-    writePid(proxy_pid, proxy.pid)
-    time.sleep(5)
+  if not isRunning('slapproxy'):
+    log = os.path.join(config['log_dir'], 'slapproxy.log')
+    Popen([config['slapproxy'], '--log_file', log,
+           config['configuration_file_path']],
+          name='slapproxy')
+    time.sleep(4)
 
 
 def stopProxy(config):
   """Stop Slapproxy server"""
-  pid = readPid(os.path.join(config['etc_dir'], 'proxy.pid'))
-  if pid:
-    try:
-      os.kill(pid)
-    except:
   pass
 
 
@@ -233,22 +198,11 @@ def removeProxyDb(config):
   if os.path.exists(config['database_uri']):
     os.unlink(config['database_uri'])
 
-def isSoftwareRunning(config):
+def isSoftwareRunning(config=None):
   """
     Return True if slapgrid-sr is still running and false if slapgrid if not
   """
-  slapgrid_pid = os.path.join(config['etc_dir'], 'slapgrid-sr.pid')
-  pid = readPid(slapgrid_pid)
-  if pid:
-    try:
-      os.kill(pid, 0)
-    except Exception:
-      running = False
-    else:
-      running = True
-  else:
-    running = False
-  return running
+  return isRunning('slapgrid-sr')
 
 
 def runSoftwareWithLock(config):
@@ -256,8 +210,8 @@ def runSoftwareWithLock(config):
     Use Slapgrid to compile current Software Release and wait until
     compilation is done
   """
-  slapgrid_pid = os.path.join(config['etc_dir'], 'slapgrid-sr.pid')
-  if not isSoftwareRunning(config):
+  slapgrid_pid = os.path.join(config['run_dir'], 'slapgrid-sr.pid')
+  if not isSoftwareRunning():
     if not os.path.exists(config['software_root']):
       os.mkdir(config['software_root'])
     stopProxy(config)
@@ -270,9 +224,10 @@ def runSoftwareWithLock(config):
     environment = os.environ.copy()
     environment['MAKEFLAGS'] = '-j%r' % multiprocessing.cpu_count()
     slapgrid = Popen([config['slapgrid_sr'], '-vc',
+                      '--pidfile', slapgrid_pid,
                       config['configuration_file_path'], '--now', '--develop'],
-        stdout=logfile, env=environment)
-    writePid(slapgrid_pid, slapgrid.pid)
+                     stdout=logfile, env=environment,
+                     name='slapgrid-sr')
     slapgrid.wait()
     #Saves the current compile software for re-use
     config_SR_folder(config)
@@ -328,68 +283,28 @@ def loadSoftwareRList(config):
       list.append(dict(md5=cfg[1], path=cfg[0], title=path))
   return list
 
-def isInstanceRunning(config):
+def isInstanceRunning(config=None):
   """
     Return True if slapgrid-cp is still running and false if slapgrid if not
   """
-  slapgrid_pid = os.path.join(config['etc_dir'], 'slapgrid-cp.pid')
-  pid = readPid(slapgrid_pid)
-  if pid:
-    try:
-      os.kill(pid, 0)
-    except Exception:
-      running = False
-    else:
-      running = True
-  else:
-    running = False
-  return running
-
-def killRunningSlapgrid(config, ptype):
-  """Kill slapgrid process and all running children process"""
-  slapgrid_pid = os.path.join(config['etc_dir'], ptype)
-  pid = readPid(slapgrid_pid)
-  if pid:
-      recursifKill([pid])
-  else:
-    return False
+  return isRunning('slapgrid-cp')
 
-def recursifKill(pids):
-  """Try to kill a list of proccess by the given pid list"""
-  if pids == []:
-    return
-  else:
-    for pid in pids:
-      ppids = pidppid(pid)
-      try:
-        os.kill(pid, signal.SIGKILL) #kill current process
-      except Exception:
-              pass
-      recursifKill(ppids) #kill all children of this process
-
-def pidppid(pid):
-  """get the list of the children pids of a process `pid`"""
-  proc = Popen('ps -o pid,ppid ax | grep "%d"' % pid, shell=True,
-               stdout=subprocess.PIPE)
-  ppid  = [x.split() for x in proc.communicate()[0].split("\n") if x]
-  return list(int(p) for p, pp in ppid if int(pp) == pid)
 
 def runInstanceWithLock(config):
   """
     Use Slapgrid to deploy current Software Release and wait until
     deployment is done.
   """
-  slapgrid_pid = os.path.join(config['etc_dir'], 'slapgrid-cp.pid')
-  if not isInstanceRunning(config):
+  slapgrid_pid = os.path.join(config['run_dir'], 'slapgrid-cp.pid')
+  if not isInstanceRunning():
     startProxy(config)
     logfile = open(config['instance_log'], 'w')
     if not (updateProxy(config) and requestInstance(config)):
       return False
-    svcStopAll(config) #prevent lost control of process
     slapgrid = Popen([config['slapgrid_cp'], '-vc',
+                      '--pidfile', slapgrid_pid,
                       config['configuration_file_path'], '--now'],
-        stdout=logfile)
-    writePid(slapgrid_pid, slapgrid.pid)
+                     stdout=logfile, name='slapgrid-cp')
     slapgrid.wait()
     return True
   return False
@@ -425,7 +340,7 @@ def getSlapStatus(config):
   if partition_list:
     for i in xrange(0, int(config['partition_amount'])):
       slappart_id = '%s%s' % ("slappart", i)
-      if not [x[0] for x in partition_list if slappart_id==x[0]]:
+      if not [x[0] for x in partition_list if slappart_id == x[0]]:
         partition_list.append((slappart_id, []))
   return partition_list
 
@@ -438,7 +353,7 @@ def removeInstanceRoot(config):
   """Clean instance directory and stop all its running process"""
   if os.path.exists(config['instance_root']):
     svcStopAll(config)
-    for root, dirs, files in os.walk(config['instance_root']):
+    for root, dirs, _ in os.walk(config['instance_root']):
       for fname in dirs:
         fullPath = os.path.join(root, fname)
         if not os.access(fullPath, os.W_OK) :
@@ -450,14 +365,12 @@ def getSvcStatus(config):
   """Return all Softwares Instances process Informations"""
   result = Popen([config['supervisor'], config['configuration_file_path'],
                   'status']).communicate()[0]
-  regex = "(^unix:.+\.socket)|(^error:).*$"
+  regex = "(^unix:.+\.socket)|(^error:)|(^watchdog).*$"
   supervisord = []
   for item in result.split('\n'):
     if item.strip() != "":
       if re.search(regex, item, re.IGNORECASE) == None:
         supervisord.append(re.split('[\s,]+', item))
-      else:
-        return [] #ignore because it is an error message
   return supervisord
 
 def getSvcTailProcess(config, process):
@@ -495,11 +408,11 @@ def getFolderContent(config, folder):
   Returns:
     Html formated string or error message when fail.
   """
-  r=['<ul class="jqueryFileTree" style="display: none;">']
+  r = ['<ul class="jqueryFileTree" style="display: none;">']
   try:
     folder = str(folder)
-    r=['<ul class="jqueryFileTree" style="display: none;">']
-    d=urllib.unquote(folder)
+    r = ['<ul class="jqueryFileTree" style="display: none;">']
+    d = urllib.unquote(folder)
     realdir = realpath(config, d)
     if not realdir:
       r.append('Could not load directory: Permission denied')
@@ -509,14 +422,14 @@ def getFolderContent(config, folder):
     for f in ldir:
       if f.startswith('.'): #do not displays this file/folder
         continue
-      ff=os.path.join(d,f)
-      if os.path.isdir(os.path.join(realdir,f)):
-        r.append('<li class="directory collapsed"><a href="#%s" rel="%s/">%s</a></li>' % (ff, ff,f))
+      ff = os.path.join(d, f)
+      if os.path.isdir(os.path.join(realdir, f)):
+        r.append('<li class="directory collapsed"><a href="#%s" rel="%s/">%s</a></li>' % (ff, ff, f))
       else:
-        e=os.path.splitext(f)[1][1:] # get .ext and remove dot
-        r.append('<li class="file ext_%s"><a href="#%s" rel="%s">%s</a></li>' % (e, ff,ff,f))
+        e = os.path.splitext(f)[1][1:] # get .ext and remove dot
+        r.append('<li class="file ext_%s"><a href="#%s" rel="%s">%s</a></li>' % (e, ff, ff, f))
     r.append('</ul>')
-  except Exception,e:
+  except Exception as e:
     r.append('Could not load directory: %s' % str(e))
   r.append('</ul>')
   return jsonify(result=''.join(r))
@@ -532,11 +445,11 @@ def getFolder(config, folder):
   Returns:
     Html formated string or error message when fail.
   """
-  r=['<ul class="jqueryFileTree" style="display: none;">']
+  r = ['<ul class="jqueryFileTree" style="display: none;">']
   try:
     folder = str(folder)
-    r=['<ul class="jqueryFileTree" style="display: none;">']
-    d=urllib.unquote(folder)
+    r = ['<ul class="jqueryFileTree" style="display: none;">']
+    d = urllib.unquote(folder)
     realdir = realpath(config, d)
     if not realdir:
       r.append('Could not load directory: Permission denied')
@@ -546,11 +459,11 @@ def getFolder(config, folder):
     for f in ldir:
       if f.startswith('.'): #do not display this file/folder
         continue
-      ff=os.path.join(d,f)
-      if os.path.isdir(os.path.join(realdir,f)):
+      ff = os.path.join(d, f)
+      if os.path.isdir(os.path.join(realdir, f)):
         r.append('<li class="directory collapsed"><a href="#%s" rel="%s/">%s</a></li>' % (ff, ff, f))
     r.append('</ul>')
-  except Exception,e:
+  except Exception as e:
     r.append('Could not load directory: %s' % str(e))
   r.append('</ul>')
   return jsonify(result=''.join(r))
@@ -581,10 +494,10 @@ def configNewSR(config, projectpath):
   """
   folder = realpath(config, projectpath)
   if folder:
-    if isInstanceRunning(config):
-      killRunningSlapgrid(config, "slapgrid-cp.pid")
-    if isSoftwareRunning(config):
-      killRunningSlapgrid(config, "slapgrid-sr.pid")
+    if isInstanceRunning():
+      killRunningProcess('slapgrid-cp')
+    if isSoftwareRunning():
+      killRunningProcess('slapgrid-sr')
     stopProxy(config)
     removeProxyDb(config)
     startProxy(config)
@@ -623,12 +536,18 @@ def newSoftware(folder, config, session):
       open(os.path.join(folderPath, config['software_profile']), 'w').write(softwareContent)
       open(os.path.join(folderPath, config['instance_profile']), 'w').write("")
       open(os.path.join(basedir, ".project"), 'w').write(folder + "/")
+      #Clean sapproxy Database
+      stopProxy(config)
+      removeProxyDb(config)
+      startProxy(config)
+      #Stop runngin process and remove existing instance
+      removeInstanceRoot(config)
       session['title'] = getProjectTitle(config)
       code = 1
     else:
       json = "Bad folder or Directory '" + folder + \
         "' already exist, please enter a new name for your software"
-  except Exception, e:
+  except Exception as e:
     json = "Can not create your software, please try again! : " + str(e)
     if os.path.exists(folderPath):
       shutil.rmtree(folderPath)
@@ -646,8 +565,8 @@ def getProjectTitle(config):
   conf = os.path.join(config['etc_dir'], ".project")
   if os.path.exists(conf):
     project = open(conf, "r").read().split("/")
-    software = project[len(project) - 2]
-    return software + " (" + string.join(project[:(len(project) - 2)], '/') + ")"
+    software = project[-2]
+    return '%s (%s)' % (software, '/'.join(project[:-2]))
   return "No Profile"
 
 def getSoftwareReleaseName(config):
@@ -655,7 +574,7 @@ def getSoftwareReleaseName(config):
   sr_profile = os.path.join(config['etc_dir'], ".project")
   if os.path.exists(sr_profile):
     project = open(sr_profile, "r").read().split("/")
-    software = project[len(project) - 2]
+    software = project[-2]
     return software.replace(' ', '_')
   return "No_name"
 
@@ -666,7 +585,7 @@ def removeSoftwareByName(config, md5, folderName):
     config: slaprunner configuration
     foldername: the link name given to the software release
     md5: the md5 filename given by slapgrid to SR folder"""
-  if isSoftwareRunning(config) or isInstanceRunning(config):
+  if isSoftwareRunning() or isInstanceRunning():
     raise Exception("Software installation or instantiation in progress, cannot remove")
   path = os.path.join(config['software_root'], md5)
   linkpath = os.path.join(config['software_link'], folderName)
@@ -698,19 +617,20 @@ def tail(f, lines=20):
           data.insert(0, f.read(BUFSIZ))
       else:
           # file too small, start from begining
-          f.seek(0,0)
+          f.seek(0, 0)
           # only read what was not read
           data.insert(0, f.read(bytes))
       linesFound = data[0].count('\n')
       size -= linesFound
       bytes -= BUFSIZ
       block -= 1
-  return string.join(''.join(data).splitlines()[-lines:], '\n')
+  return '\n'.join(''.join(data).splitlines()[-lines:])
 
-def readFileFrom(f, lastPosition):
+def readFileFrom(f, lastPosition, limit=20000):
   """
   Returns the last lines of file `f`, from position lastPosition.
   and the last position
+  limit = max number of caracter to read
   """
   BUFSIZ = 1024
   f.seek(0, 2)
@@ -718,8 +638,10 @@ def readFileFrom(f, lastPosition):
   block = -1
   data = ""
   length = bytes
-  if lastPosition <= 0 and length > 30000:
-    lastPosition = length-30000
+  truncated = False #True if a part of log data has been truncated
+  if (lastPosition <= 0 and length > limit) or (length-lastPosition > limit):
+    lastPosition = length - limit
+    truncated = True
   size = bytes - lastPosition
   while bytes > lastPosition:
     if abs(block*BUFSIZ) <= size:
@@ -729,7 +651,7 @@ def readFileFrom(f, lastPosition):
     else:
       margin = abs(block*BUFSIZ) - size
       if length < BUFSIZ:
-        f.seek(0,0)
+        f.seek(0, 0)
       else:
         seek = block * BUFSIZ + margin
         f.seek(seek, 2)
@@ -737,13 +659,13 @@ def readFileFrom(f, lastPosition):
     bytes -= BUFSIZ
     block -= 1
   f.close()
-  return {"content":data, "position":length}
+  return {"content":data, "position":length, "truncated":truncated}
 
 def isText(file):
   """Return True if the mimetype of file is Text"""
   if not os.path.exists(file):
     return False
-  text_range = ''.join(map(chr, [7,8,9,10,12,13,27] + range(0x20, 0x100)))
+  text_range = ''.join(map(chr, [7, 8, 9, 10, 12, 13, 27] + range(0x20, 0x100)))
   is_binary_string = lambda bytes: bool(bytes.translate(None, text_range))
   try:
     return not is_binary_string(open(file).read(1024))
@@ -756,7 +678,7 @@ def md5sum(file):
     return False
   try:
     fh = open(file, 'rb')
-    m = hashlib.md5()
+    m = md5.md5()
     while True:
       data = fh.read(8192)
       if not data:
@@ -799,14 +721,14 @@ def readParameters(path):
   if os.path.exists(path):
     try:
       xmldoc = minidom.parse(path)
-      object = {}
+      obj = {}
       for elt in xmldoc.childNodes:
-        sub_object = {}
+        sub_obj = {}
         for subnode in elt.childNodes:
           if subnode.nodeType != subnode.TEXT_NODE:
-            sub_object[str(subnode.getAttribute('id'))] = subnode.childNodes[0].data #.decode('utf-8').decode('utf-8')
-            object[str(elt.tagName)] = sub_object
-      return object
+            sub_obj[str(subnode.getAttribute('id'))] = subnode.childNodes[0].data #.decode('utf-8').decode('utf-8')
+            obj[str(elt.tagName)] = sub_obj
+      return obj
     except Exception, e:
       return str(e)
   else:

slapos/runner/views.py

 # -*- coding: utf-8 -*-
+# vim: set et sts=2:
+# pylint: disable-msg=W0311,C0301,C0103,C0111
+
 
-from flask import Flask, request, redirect, url_for, \
-         render_template, g, flash, jsonify, session, abort, send_file
-from utils import *
 import os
 import shutil
-import md5
-from gittools import cloneRepo, gitStatus, switchBranch, addBranch, getDiff, \
-     gitPush, gitPull
-from flaskext.auth import Auth, AuthUser, login_required, logout
-from fileBrowser import fileBrowser
 import urllib
 
+from flaskext.auth import Auth, AuthUser, login_required, logout
+from flask import (Flask, request, redirect, url_for, render_template,
+                   g, flash, jsonify, session, abort, send_file)
+
+from slapos.runner.process import killRunningProcess
+from slapos.runner.utils import (checkSoftwareFolder, configNewSR, getFolder,
+                                 getFolderContent, getProfilePath,
+                                 getProjectList, getProjectTitle, getSession,
+                                 getSlapStatus, getSvcStatus,
+                                 getSvcTailProcess, isInstanceRunning,
+                                 isSoftwareRunning, isText,
+                                 loadSoftwareRList, md5sum, newSoftware,
+                                 readFileFrom, readParameters, realpath,
+                                 removeInstanceRoot, removeProxyDb,
+                                 removeSoftwareByName, runInstanceWithLock,
+                                 runSoftwareWithLock, saveSession,
+                                 svcStartStopProcess, svcStopAll, tail,
+                                 updateInstanceParameter)
+
+from slapos.runner.fileBrowser import FileBrowser
+from slapos.runner.gittools import (cloneRepo, gitStatus, switchBranch,
+                                    addBranch, getDiff, gitPush, gitPull)
+
+
 app = Flask(__name__)
 app.config['MAX_CONTENT_LENGTH'] = 20 * 1024 * 1024
 auth = Auth(app, login_url_name='login')
 auth.user_timeout = 0
-file_request = fileBrowser(app.config)
+file_request = FileBrowser(app.config)
 
 # Setup default flask (werkzeug) parser
 import logging
@@ -45,6 +64,11 @@ def before_request():
 def home():
   return render_template('index.html')
 
+# general views
+@login_required()
+def browseWorkspace():
+  return render_template('workspace.html')
+
 @app.route("/login")
 def login():
   return render_template('login.html')
@@ -64,7 +88,7 @@ def myAccount():
 
 @app.route("/dologout")
 def dologout():
-  user_data = logout()
+  _ = logout()
   return redirect(url_for('login'))
 
 @login_required()
@@ -95,10 +119,6 @@ def editSoftwareProfile():
 
 @login_required()
 def inspectSoftware():
-  if not os.path.exists(app.config['software_root']):
-    result = ""
-  else:
-    result = app.config['software_root']
   return render_template('runResult.html', softwareRoot='software_link/',
                          softwares=loadSoftwareRList(app.config))
 
@@ -164,11 +184,17 @@ def supervisordStatus():
   html = "<tr><th>Partition and Process name</th><th>Status</th><th>Process PID </th><th> UpTime</th><th></th></tr>"
   for item in result:
     html += "<tr>"
-    html +="<td  class='first'><b><a href='" + url_for('tailProcess', process=item[0])+"'>"+item[0]+"</a></b></td>"
-    html +="<td align='center'><a href='"+url_for('startStopProccess', process=item[0], action=item[1])+"'>"+item[1]+"</a></td>"
-    html +="<td align='center'>"+item[3]+"</td><td>"+item[5]+"</td>"
-    html +="<td align='center'><a href='"+url_for('startStopProccess', process=item[0], action='RESTART')+"'>Restart</a></td>"
-    html +="</tr>"
+    html += "<td  class='first'><b><a href='" \
+        + url_for('tailProcess', process=item[0]) + "'>" \
+        + item[0] + "</a></b></td>"
+    html += "<td align='center'><a href='" \
+        + url_for('startStopProccess', process=item[0], action=item[1]) \
+        + "'>" + item[1] + "</a></td>"
+    html += "<td align='center'>" + item[3] + "</td><td>" + item[5] + "</td>"
+    html += "<td align='center'><a href='" \
+        + url_for('startStopProccess', process=item[0], action='RESTART') \
+        + "'>Restart</a></td>"
+    html += "</tr>"
   return jsonify(code=1, result=html)
 
 @login_required()
@@ -176,9 +202,8 @@ def removeInstance():
   if isInstanceRunning(app.config):
     flash('Instantiation in progress, cannot remove')
   else:
-    stopProxy(app.config)
     removeProxyDb(app.config)
-    startProxy(app.config)
+    svcStopAll(app.config) #Stop All instance process
     removeInstanceRoot(app.config)
     param_path = os.path.join(app.config['etc_dir'], ".parameter.xml")
     if os.path.exists(param_path):
@@ -287,11 +312,11 @@ def createFile():
                    request.form['type'] + ": Permission Denied")
   try:
     if request.form['type'] == "file":
-      f = open(path, 'w').write(" ")
+      open(path, 'w')
     else:
       os.mkdir(path)
     return jsonify(code=1, result="")
-  except Exception, e:
+  except Exception as e:
     return jsonify(code=0, result=str(e))
 
 #remove file or directory
@@ -303,7 +328,7 @@ def removeFile():
     else:
       os.remove(request.form['path'])
     return jsonify(code=1, result="")
-  except Exception, e:
+  except Exception as e:
     return jsonify(code=0, result=str(e))
 
 @login_required()
@@ -312,7 +337,7 @@ def removeSoftwareDir():
     data = removeSoftwareByName(app.config, request.form['md5'],
             request.form['title'])
     return jsonify(code=1, result=data)
-  except Exception, e:
+  except Exception as e:
     return jsonify(code=0, result=str(e))
 
 #read file and return content to ajax
@@ -320,6 +345,9 @@ def removeSoftwareDir():
 def getFileContent():
   file_path = realpath(app.config, request.form['file'])
   if file_path:
+    if not isText(file_path):
+      return jsonify(code=0,
+            result="Can not open a binary file, please select a text file!")
     if not request.form.has_key('truncate'):
       return jsonify(code=1, result=open(file_path, 'r').read())
     else:
@@ -386,7 +414,8 @@ def checkFileType():
   if isText(path):
     return jsonify(code=1, result="text")
   else:
-    return jsonify(code=0, result="Can not open a binary file, please select a text file!")
+    return jsonify(code=0,
+                   result="Can not open a binary file, please select a text file!")
 
 @login_required()
 def getmd5sum():
@@ -404,7 +433,7 @@ def getmd5sum():
 def slapgridResult():
   software_state = isSoftwareRunning(app.config)
   instance_state = isInstanceRunning(app.config)
-  log_result = {"content":"", "position":0}
+  log_result = {"content":"", "position":0, "truncated":False}
   if request.form['log'] == "software"  or\
      request.form['log'] == "instance":
     log_file = request.form['log'] + "_log"
@@ -416,7 +445,7 @@ def slapgridResult():
 
 @login_required()
 def stopSlapgrid():
-  result = killRunningSlapgrid(app.config, request.form['type'])
+  result = killRunningProcess(request.form['type'])
   return jsonify(result=result)
 
 @login_required()
@@ -430,9 +459,10 @@ def getPath():
       break
     else:
       list.append(path)
-  realfile = string.join(list, "#")
+  realfile = '#'.join(list)
   if not realfile:
-    return jsonify(code=0, result="Can not access to this file: Permission Denied!")
+    return jsonify(code=0,
+                   result="Can not access to this file: Permission Denied!")
   else:
     return jsonify(code=1, result=realfile)
 
@@ -451,7 +481,7 @@ def saveParameterXml():
     f.write(content)
     f.close()
     result = readParameters(param_path)
-  except Exception, e:
+  except Exception as e:
       result = str(e)
   software_type = None
   if request.form['software_type']:
@@ -461,8 +491,10 @@ def saveParameterXml():
   else:
     try:
       updateInstanceParameter(app.config, software_type)
-    except Exception, e:
-      return jsonify(code=0, result="An error occurred while applying your settings!<br/>" + str(e))
+    except Exception as e:
+      return jsonify(
+        code=0,
+        result="An error occurred while applying your settings!<br/>" + str(e))
     return jsonify(code=1, result="")
 
 #read instance parameters into the local xml file and return a dict
@@ -520,7 +552,8 @@ def configAccount():
       return jsonify(code=0, result=result)
     else:
       return jsonify(code=1, result="")
-  return jsonify(code=0, result="Unable to respond to your request, permission denied.")
+  return jsonify(code=0,
+                 result="Unable to respond to your request, permission denied.")
 
 #Global File Manager
 @login_required()
@@ -567,8 +600,7 @@ def fileBrowser():
       except:
         abort(404)
     elif opt == 9:
-      truncateTo = int(request.form.get('truncate', '0'))
-      result = file_request.readFile(dir, filename)
+      result = file_request.readFile(dir, filename, False)
     elif opt == 11:
       #Upload file
       result = file_request.uploadFile(dir, request.files)
@@ -583,7 +615,7 @@ def fileBrowser():
       result = file_request.unzipFile(dir, filename, newfilename)
     else:
       result = "ARGS PARSE ERROR: Bad option..."
-  except Exception, e:
+  except Exception as e:
     return str(e)
   return result
 
@@ -596,49 +628,78 @@ def editFile():
 
 #Setup List of URLs
 app.add_url_rule('/', 'home', home)
-app.add_url_rule('/editSoftwareProfile', 'editSoftwareProfile', editSoftwareProfile)
+app.add_url_rule('/browseWorkspace', 'browseWorkspace', browseWorkspace)
+app.add_url_rule('/editSoftwareProfile', 'editSoftwareProfile',
+                editSoftwareProfile)
 app.add_url_rule('/inspectSoftware', 'inspectSoftware', inspectSoftware)
 app.add_url_rule('/removeSoftware', 'removeSoftware', removeSoftware)
-app.add_url_rule('/runSoftwareProfile', 'runSoftwareProfile', runSoftwareProfile, methods=['POST'])
-app.add_url_rule('/viewSoftwareLog', 'viewSoftwareLog', viewSoftwareLog, methods=['GET'])
-app.add_url_rule('/editInstanceProfile', 'editInstanceProfile', editInstanceProfile)
-app.add_url_rule('/inspectInstance', 'inspectInstance', inspectInstance, methods=['GET'])
-app.add_url_rule('/supervisordStatus', 'supervisordStatus', supervisordStatus, methods=['GET'])
-app.add_url_rule('/runInstanceProfile', 'runInstanceProfile', runInstanceProfile, methods=['POST'])
+app.add_url_rule('/runSoftwareProfile', 'runSoftwareProfile',
+                 runSoftwareProfile, methods=['POST'])
+app.add_url_rule('/viewSoftwareLog', 'viewSoftwareLog',
+                 viewSoftwareLog, methods=['GET'])
+app.add_url_rule('/editInstanceProfile', 'editInstanceProfile',
+                 editInstanceProfile)
+app.add_url_rule('/inspectInstance', 'inspectInstance',
+                 inspectInstance, methods=['GET'])
+app.add_url_rule('/supervisordStatus', 'supervisordStatus',
+                 supervisordStatus, methods=['GET'])
+app.add_url_rule('/runInstanceProfile', 'runInstanceProfile',
+                 runInstanceProfile, methods=['POST'])
 app.add_url_rule('/removeInstance', 'removeInstance', removeInstance)
-app.add_url_rule('/viewInstanceLog', 'viewInstanceLog', viewInstanceLog, methods=['GET'])
-app.add_url_rule('/stopAllPartition', 'stopAllPartition', stopAllPartition, methods=['GET'])
-app.add_url_rule('/tailProcess/name/<process>', 'tailProcess', tailProcess, methods=['GET'])
-app.add_url_rule('/startStopProccess/name/<process>/cmd/<action>', 'startStopProccess', startStopProccess, methods=['GET'])
-app.add_url_rule("/getParameterXml/<request>", 'getParameterXml', getParameterXml, methods=['GET'])
+app.add_url_rule('/viewInstanceLog', 'viewInstanceLog',
+                 viewInstanceLog, methods=['GET'])
+app.add_url_rule('/stopAllPartition', 'stopAllPartition',
+                 stopAllPartition, methods=['GET'])
+app.add_url_rule('/tailProcess/name/<process>', 'tailProcess',
+                 tailProcess, methods=['GET'])
+app.add_url_rule('/startStopProccess/name/<process>/cmd/<action>',
+                 'startStopProccess', startStopProccess, methods=['GET'])
+app.add_url_rule("/getParameterXml/<request>", 'getParameterXml',
+                 getParameterXml, methods=['GET'])
 app.add_url_rule("/stopSlapgrid", 'stopSlapgrid', stopSlapgrid, methods=['POST'])
-app.add_url_rule("/slapgridResult", 'slapgridResult', slapgridResult, methods=['POST'])
+app.add_url_rule("/slapgridResult", 'slapgridResult',
+                 slapgridResult, methods=['POST'])
 app.add_url_rule("/getmd5sum", 'getmd5sum', getmd5sum, methods=['POST'])
-app.add_url_rule("/checkFileType", 'checkFileType', checkFileType, methods=['POST'])
-app.add_url_rule("/pullProjectFiles", 'pullProjectFiles', pullProjectFiles, methods=['POST'])
-app.add_url_rule("/pushProjectFiles", 'pushProjectFiles', pushProjectFiles, methods=['POST'])
-app.add_url_rule("/getProjectDiff/<project>", 'getProjectDiff', getProjectDiff, methods=['GET'])
+app.add_url_rule("/checkFileType", 'checkFileType', checkFileType,
+                 methods=['POST'])
+app.add_url_rule("/pullProjectFiles", 'pullProjectFiles', pullProjectFiles,
+                 methods=['POST'])
+app.add_url_rule("/pushProjectFiles", 'pushProjectFiles', pushProjectFiles,
+                 methods=['POST'])
+app.add_url_rule("/getProjectDiff/<project>", 'getProjectDiff', getProjectDiff,
+                 methods=['GET'])
 app.add_url_rule("/newBranch", 'newBranch', newBranch, methods=['POST'])
 app.add_url_rule("/changeBranch", 'changeBranch', changeBranch, methods=['POST'])
-app.add_url_rule("/saveFileContent", 'saveFileContent', saveFileContent, methods=['POST'])
-app.add_url_rule("/removeSoftwareDir", 'removeSoftwareDir', removeSoftwareDir, methods=['POST'])
-app.add_url_rule("/getFileContent", 'getFileContent', getFileContent, methods=['POST'])
+app.add_url_rule("/saveFileContent", 'saveFileContent', saveFileContent,
+                 methods=['POST'])
+app.add_url_rule("/removeSoftwareDir", 'removeSoftwareDir', removeSoftwareDir,
+                 methods=['POST'])
+app.add_url_rule("/getFileContent", 'getFileContent', getFileContent,
+                 methods=['POST'])
 app.add_url_rule("/removeFile", 'removeFile', removeFile, methods=['POST'])
 app.add_url_rule("/createFile", 'createFile', createFile, methods=['POST'])
 app.add_url_rule("/editCurrentProject", 'editCurrentProject', editCurrentProject)
-app.add_url_rule("/getProjectStatus", 'getProjectStatus', getProjectStatus, methods=['POST'])
-app.add_url_rule('/openProject/<method>', 'openProject', openProject, methods=['GET'])
+app.add_url_rule("/getProjectStatus", 'getProjectStatus', getProjectStatus,
+                 methods=['POST'])
+app.add_url_rule('/openProject/<method>', 'openProject', openProject,
+                 methods=['GET'])
 app.add_url_rule("/manageProject", 'manageProject', manageProject, methods=['GET'])
-app.add_url_rule("/setCurrentProject", 'setCurrentProject', setCurrentProject, methods=['POST'])
+app.add_url_rule("/setCurrentProject", 'setCurrentProject', setCurrentProject,
+                 methods=['POST'])
 app.add_url_rule("/checkFolder", 'checkFolder', checkFolder, methods=['POST'])
-app.add_url_rule('/createSoftware', 'createSoftware', createSoftware, methods=['POST'])
-app.add_url_rule('/cloneRepository', 'cloneRepository', cloneRepository, methods=['POST'])
+app.add_url_rule('/createSoftware', 'createSoftware', createSoftware,
+                 methods=['POST'])
+app.add_url_rule('/cloneRepository', 'cloneRepository', cloneRepository,
+                 methods=['POST'])
 app.add_url_rule('/openFolder', 'openFolder', openFolder, methods=['POST'])
 app.add_url_rule('/readFolder', 'readFolder', readFolder, methods=['POST'])
 app.add_url_rule('/configRepo', 'configRepo', configRepo)
-app.add_url_rule("/saveParameterXml", 'saveParameterXml', saveParameterXml, methods=['POST'])
+app.add_url_rule("/saveParameterXml", 'saveParameterXml', saveParameterXml,
+                 methods=['POST'])
 app.add_url_rule("/getPath", 'getPath', getPath, methods=['POST'])
 app.add_url_rule("/myAccount", 'myAccount', myAccount)
-app.add_url_rule("/updateAccount", 'updateAccount', updateAccount, methods=['POST'])
-app.add_url_rule("/fileBrowser", 'fileBrowser', fileBrowser, methods=['GET', 'POST'])
+app.add_url_rule("/updateAccount", 'updateAccount', updateAccount,
+                 methods=['POST'])
+app.add_url_rule("/fileBrowser", 'fileBrowser', fileBrowser,
+                 methods=['GET', 'POST'])
 app.add_url_rule("/editFile", 'editFile', editFile, methods=['GET'])

slapos/shacache/config.py

@@ -26,7 +26,7 @@ class NetworkcacheParser(OptionParser):
   """
   def __init__(self, usage=None, version=None):
     """
-    Initialize all options possibles.
+    Initialize all possible options.
     """
     OptionParser.__init__(self, usage=usage, version=version,
                           option_list=[