Commit 4c815ff9 authored by Alain Takoudjou's avatar Alain Takoudjou

Add Cloud9 componnent to webrunner

parent 38a788d5
...@@ -58,7 +58,8 @@ class Config: ...@@ -58,7 +58,8 @@ class Config:
configuration_parser.read(configuration_file_path) configuration_parser.read(configuration_file_path)
# Merges the arguments and configuration # Merges the arguments and configuration
for section in ("slaprunner", "slapos", "slapproxy", "slapformat", "sshkeys_authority", "gitclient"): for section in ("slaprunner", "slapos", "slapproxy", "slapformat",
"sshkeys_authority", "gitclient", "cloud9_IDE"):
configuration_dict = dict(configuration_parser.items(section)) configuration_dict = dict(configuration_parser.items(section))
for key in configuration_dict: for key in configuration_dict:
if not getattr(self, key, None): if not getattr(self, key, None):
......
...@@ -313,9 +313,8 @@ input[type="radio"], input[type="checkbox"]{ ...@@ -313,9 +313,8 @@ input[type="radio"], input[type="checkbox"]{
background: none; background: none;
border: 1px solid #678dad; border: 1px solid #678dad;
padding: 0; padding: 0;
height: 405px;
color: #4c6172; color: #4c6172;
margin: 15px; margin: 15px 59px 15px 59px;
} }
#home_box a{ #home_box a{
...@@ -351,26 +350,26 @@ input[type="radio"], input[type="checkbox"]{ ...@@ -351,26 +350,26 @@ input[type="radio"], input[type="checkbox"]{
margin: 0; margin: 0;
border: 1px solid #CAD4DC; border: 1px solid #CAD4DC;
display: block; display: block;
padding: 15px; padding: 30px 0 30px 0;
height: 373px;
} }
.inner_box p{ .inner_box p{
font-size: 13px; font-size: 13px;
float: left; float: left;
width: 460px; width: 450px;
cursor:default; cursor:default;
text-align:justify;
} }
.lmenu{ .lmenu{
display: block; display: block;
height: 80px; height: 80px;
margin: 10px; margin: 10px 45px 10px 45px;
margin-left: 60px; padding: 10px;
padding: 15px; padding-bottom:15px;
border: #678dad; border: #678dad;
width: 540px; width: 530px;
border: 1px solid #678dad; border: 1px solid #678dad;
} }
...@@ -382,9 +381,9 @@ input[type="radio"], input[type="checkbox"]{ ...@@ -382,9 +381,9 @@ input[type="radio"], input[type="checkbox"]{
.smenu{ .smenu{
display: block; display: block;
height: 80px; height: 80px;
margin-left: 60px; margin: 0 10px 0 45px;
margin-right: 10px; padding: 10px;
padding: 15px; padding-bottom:15px;
border: #678dad; border: #678dad;
width: 250px; width: 250px;
border: 1px solid #678dad; border: 1px solid #678dad;
...@@ -394,7 +393,9 @@ input[type="radio"], input[type="checkbox"]{ ...@@ -394,7 +393,9 @@ input[type="radio"], input[type="checkbox"]{
.sright_menu{ .sright_menu{
display: block; display: block;
height: 80px; height: 80px;
padding: 15px; margin: 0 45px 0 0;
padding: 10px;
padding-bottom:15px;
border: #678dad; border: #678dad;
width: 247px; width: 247px;
border: 1px solid #678dad; border: 1px solid #678dad;
...@@ -676,3 +677,4 @@ a.lshare img{ ...@@ -676,3 +677,4 @@ a.lshare img{
.popup a:hover{color: #666666;} .popup a:hover{color: #666666;}
.popup ul{margin:0; padding:0; list-style:none;} .popup ul{margin:0; padding:0; list-style:none;}
.popup li{border-bottom: 1px dashed #666666; padding:5px; padding-top:5px;} .popup li{border-bottom: 1px dashed #666666; padding:5px; padding-top:5px;}
textarea.parameter {border: solid 1px #678dad; color: #666666; height:110px;}
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
<div class="smenu"> <div class="smenu">
<h2><a href="{{ url_for('openProject', method='open')}}">Open Software Release</a></h2> <h2><a href="{{ url_for('openProject', method='open')}}">Open Software Release</a></h2>
<p>If you have cloned your repository, you can now edit and test existing Software Release.</p> <p>If you have cloned your repository, edit and test your existing Software Release.</p>
<img src="{{ url_for('static', filename='images/mydocuments.png') }}" /> <img src="{{ url_for('static', filename='images/mydocuments.png') }}" />
<div class="clear"></div> <div class="clear"></div>
</div> </div>
......
...@@ -17,12 +17,18 @@ ...@@ -17,12 +17,18 @@
<h2>Instance inspection</h2><br/> <h2>Instance inspection</h2><br/>
<div id="tabContaier"> <div id="tabContaier">
<ul> <ul>
<li><a class="active" href="#tab1">Slapgrid Supervisor</a></li> <li><a class="active" href="#tab1">Parameters</a></li>
<li><a href="#tab2">SLAP response</a></li> <li><a href="#tab2">Slapgrid Supervisor</a></li>
<li><a href="#tab3">Partitions Content</a></li> <li><a href="#tab3">SLAP response</a></li>
<li><a href="#tab4">Partitions Content</a></li>
</ul><!-- //Tab buttons --> </ul><!-- //Tab buttons -->
<div class="tabDetails"> <div class="tabDetails">
<div id="tab1" class="tabContents"> <div id="tab1" class="tabContents">
<p>Add your instance parameters here and click on the update button</p>
<textarea class="parameter">&lt;?xml version='1.0' encoding='utf-8'?&gt;</textarea>
<input type="submit" name="update" id ="update" value="Update" class="button"/>
</div><!-- end tab1 -->
<div id="tab2" class="tabContents">
<p>This tab show all process generated by slapgrid for your application. You can click on the process name to display log.</p> <p>This tab show all process generated by slapgrid for your application. You can click on the process name to display log.</p>
{% if supervisor != []%} {% if supervisor != []%}
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
...@@ -41,17 +47,17 @@ ...@@ -41,17 +47,17 @@
{% else %} {% else %}
<h2>No process to display, please run your instance</h2> <h2>No process to display, please run your instance</h2>
{%endif%} {%endif%}
</div><!-- end tab1 --> </div><!-- end tab2 -->
<div id="tab2" class="tabContents"> <div id="tab3" class="tabContents">
<p>Uses parameters below to run your application</p> <p>Uses parameters below to run your application</p>
{% for item in slap_status %} {% for item in slap_status %}
<h2>{{ item[0 ]}}</h2> <h2>{{ item[0 ]}}</h2>
<textarea rows=5 readonly>{{ item[1] }}</textarea><br> <textarea rows=5 readonly>{{ item[1] }}</textarea><br>
{% endfor %} {% endfor %}
</div><!-- end tab2 -->
<div id="tab3" class="tabContents">
<div id="fileTree" class="file_tree_tabs"></div>
</div><!-- end tab3 --> </div><!-- end tab3 -->
<div id="tab4" class="tabContents">
<div id="fileTree" class="file_tree_tabs"></div>
</div><!-- end tab4 -->
</div> </div>
</div> </div>
<!-- This contains the hidden content for inline calls --> <!-- This contains the hidden content for inline calls -->
......
...@@ -64,10 +64,10 @@ def updateProxy(config): ...@@ -64,10 +64,10 @@ def updateProxy(config):
'reference': partition_reference, 'reference': partition_reference,
'tap': {'name': partition_reference}, 'tap': {'name': partition_reference},
}) })
computer.updateConfiguration(xml_marshaller.dumps(slap_config)) computer.updateConfiguration(xml_marshaller.dumps(slap_config))
slap.registerOpenOrder().request(profile, slap.registerOpenOrder().request(profile, partition_reference=partition_reference,
partition_reference=partition_reference) partition_parameter_kw=None, software_type=None, filter_kw=None,
state=None, shared=False)
return True return True
def readPid(file): def readPid(file):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment