Merge branch 'slaprunner'

slapos/runner/static/css/jqueryTabs.css

@@ -54,7 +54,8 @@
 	margin:34px 0 0;
 }
 .tabContents{
-	padding:20px
+	padding:20px;
+    min-height: 250px;
 }
 .tabContents p{
 	padding:0 0 10px;

slapos/runner/static/css/styles.css

@@ -27,7 +27,8 @@ td{
     border-bottom: 1px solid #A8A8A8;
     border-right: 1px solid #A8A8A8;
 }
-td.propertie{padding-left:10px; color:blue;}
+td.propertie{padding-left:10px; color:blue;width: 178px;}
+.slapvalues{display:block;width: 375px;word-wrap: break-word}
 td.first{border-left: 1px solid #A8A8A8;}
 th{
     background: #2281C1;
@@ -505,6 +506,7 @@ h2.hight:hover{
     width: 754px;
     padding: 2px;
     height: 450px;
+    font-size: 13px;
 }
 .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;}
@@ -715,4 +717,4 @@ padding:10px; font-size:14px; color:#03406A}
 .login-label{padding:5px; font-size:16px;}
 .login-input{width:220px;}
 .information{display:block; float:left; height:16px; margin-top:10px; margin-left:10px; font-weight:bold}
-.account{margin-left:60px;}
\ No newline at end of file
+.account{margin-left:60px;}

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

@@ -21,6 +21,10 @@
       }
       else{setupBox();}
       function setupBox(){
+        if (msg == undefined){
+          msg = "Cannot execute your request. Please make sure you are logged in!!"
+          option.type = "error";
+        }
         $box.empty();
         $box.css('top','-1000px');
         $box.show();
@@ -66,4 +70,4 @@
       }
     }
   });
-}(jQuery, document, this));
\ No newline at end of file
+}(jQuery, document, this));

slapos/runner/templates/instanceInspect.html

@@ -62,13 +62,13 @@
           </h2>
           <div class="clear"></div><br/>
           <div id="bcontent{{item[0]}}">
-            <table cellpadding="0" cellspacing="0" width="100%">
+            <table cellpadding="0" cellspacing="0" width="577">
             <tr>
         	     <th>Parameter Name</th><th>Parameter Value</th>
       	    </tr>
             {% for k in item[1] %}
             <tr>
-               <td class="propertie first">{{k}}</td><td align='left'>{{item[1][k]}}</td>
+               <td class="propertie first">{{k}}</td><td align='left'><span class="slapvalues">{{item[1][k]}}</span></td>
       	    </tr>
             {% endfor %}
             </table>
@@ -140,3 +140,4 @@
 </div>
 {{instance}}
 {% endblock %}
+

slapos/runner/views.py

@@ -79,7 +79,7 @@ def doLogin():
 # software views
 @login_required()
 def editSoftwareProfile():
-  profile = getProfilePath(app.config['runner_workdir'], app.config['software_profile'])
+  profile = getProfilePath(app.config['etc_dir'], app.config['software_profile'])
   if profile == "":
     flash('Error: can not open profile, please select your project first')
   return render_template('updateSoftwareProfile.html', workDir='workspace',
@@ -92,18 +92,18 @@ def inspectSoftware():
   else:
     result = app.config['software_root']
   return render_template('runResult.html', softwareRoot='software_root',
-                         softwares=loadSoftwareData(app.config['runner_workdir']))
+                         softwares=loadSoftwareData(app.config['etc_dir']))
 
 #remove content of compiled software release
 @login_required()
 def removeSoftware():
-  file_config = os.path.join(app.config['runner_workdir'], ".softdata")
+  file_config = os.path.join(app.config['etc_dir'], ".softdata")
   if isSoftwareRunning(app.config) or isInstanceRunning(app.config):
     flash('Software installation or instantiation in progress, cannot remove')
   elif os.path.exists(file_config):
     svcStopAll(app.config)
     shutil.rmtree(app.config['software_root'])
-    os.remove(os.path.join(app.config['runner_workdir'], ".softdata"))
+    os.remove(file_config)
     flash('Software removed')
   return redirect(url_for('inspectSoftware'))
 
@@ -121,12 +121,12 @@ def viewSoftwareLog():
   else:
     result = 'Not found yet'
   return render_template('viewLog.html', type='software',
-      result=result)
+      result=result.encode("utf-8"))
 
 # instance views
 @login_required()
 def editInstanceProfile():
-  profile = getProfilePath(app.config['runner_workdir'], app.config['instance_profile'])
+  profile = getProfilePath(app.config['etc_dir'], app.config['instance_profile'])
   if profile == "":
     flash('Error: can not open instance profile for this Software Release')
   return render_template('updateInstanceProfile.html', workDir='workspace',
@@ -171,7 +171,7 @@ def removeInstance():
     removeProxyDb(app.config)
     startProxy(app.config)
     removeInstanceRoot(app.config)
-    param_path = os.path.join(app.config['runner_workdir'], ".parameter.xml")
+    param_path = os.path.join(app.config['etc_dir'], ".parameter.xml")
     if os.path.exists(param_path):
       os.remove(param_path)
     flash('Instance removed')
@@ -193,7 +193,7 @@ def viewInstanceLog():
   else:
     result = 'Not found yet'
   return render_template('viewLog.html', type='instance',
-      result=result)
+      result=result.encode("utf-8"))
 
 @login_required()
 def stopAllPartition():
@@ -210,15 +210,6 @@ def startStopProccess(process, action):
   svcStartStopProcess(app.config, process, action)
   return redirect(url_for('inspectInstance'))
 
-@login_required()
-def viewBuildoudAnnotate():
-  if os.path.exists(app.config['annotate_log']):
-    result = open(app.config['annotate_log'], 'r').read()
-  else:
-    result = 'Not found yet'
-  return render_template('viewLog.html', type='Instance',
-      result=result, running=isInstanceRunning(app.config))
-
 @login_required(login_redirect)
 def openProject(method):
   return render_template('projectFolder.html', method=method,
@@ -271,7 +262,7 @@ def getProjectStatus():
 #view for current software release files
 @login_required()
 def editCurrentProject():
-  project = os.path.join(app.config['runner_workdir'], ".project")
+  project = os.path.join(app.config['etc_dir'], ".project")
   if os.path.exists(project):
     return render_template('softwareFolder.html', workDir='workspace',
                            project=open(project).read(),
@@ -438,11 +429,11 @@ def getPath():
 #update instance parameter into a local xml file
 @login_required()
 def saveParameterXml():
-  project = os.path.join(app.config['runner_workdir'], ".project")
+  project = os.path.join(app.config['etc_dir'], ".project")
   if not os.path.exists(project):
     return jsonify(code=0, result="Please first open a Software Release")
   content = request.form['parameter'].encode("utf-8")
-  param_path = os.path.join(app.config['runner_workdir'], ".parameter.xml")
+  param_path = os.path.join(app.config['etc_dir'], ".parameter.xml")
   try:
     f = open(param_path, 'w')
     f.write(content)
@@ -465,7 +456,7 @@ def saveParameterXml():
 #read instance parameters into the local xml file and return a dict
 @login_required()
 def getParameterXml(request):
-  param_path = os.path.join(app.config['runner_workdir'], ".parameter.xml")
+  param_path = os.path.join(app.config['etc_dir'], ".parameter.xml")
   if not os.path.exists(param_path):
     default = '<?xml version="1.0" encoding="utf-8"?>\n'
     default += '<instance>\n</instance>'
@@ -483,7 +474,6 @@ def getParameterXml(request):
 @login_required()
 def updateAccount():
   account = []
-  user = os.path.join(app.config['runner_workdir'], '.users')
   account.append(request.form['username'].strip())
   account.append(request.form['password'].strip())
   account.append(request.form['email'].strip())
@@ -504,7 +494,6 @@ def configAccount():
   last_account = getSession(app.config)
   if not last_account:
     account = []
-    user = os.path.join(app.config['runner_workdir'], '.users')
     account.append(request.form['username'].strip())
     account.append(request.form['password'].strip())
     account.append(request.form['email'].strip())
@@ -536,7 +525,6 @@ app.add_url_rule('/viewInstanceLog', 'viewInstanceLog', viewInstanceLog, methods
 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('/viewBuildoudAnnotate', 'viewBuildoudAnnotate', viewBuildoudAnnotate, 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'])
@@ -566,4 +554,4 @@ app.add_url_rule('/configRepo', 'configRepo', configRepo)
 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'])
\ No newline at end of file
+app.add_url_rule("/updateAccount", 'updateAccount', updateAccount, methods=['POST'])