Skip to content

S
slapos.toolbox
Commit 5d472df2 authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

Update webrunner UI, fix JavaScript error

parent 51ab20f4
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 86 deletions
slapos/runner/static/css/jqueryTabs.css
View file @ 5d472df2
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
} }
#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:430px; max-height:120px;
resize: none; height:18px;padding:3px;min-height:18px;font-size: 13px;} resize: none; height:18px;padding:3px;min-height:18px;font-size: 13px;}
#tabContaier textarea.mb_style{width:560px;}
#tabContaier > ul{ #tabContaier > ul{
overflow:hidden; overflow:hidden;
height:34px; height:34px;
......
slapos/runner/static/css/styles.css
View file @ 5d472df2
...@@ -544,7 +544,6 @@ h2.hight:hover{ ...@@ -544,7 +544,6 @@ h2.hight:hover{
overflow: auto; overflow: auto;
height: 95px; height: 95px;
padding: 5px; padding: 5px;
width: 604px;
background:#fff; background:#fff;
margin-bottom: 10px; margin-bottom: 10px;
color: #3A494F; color: #3A494F;
......
slapos/runner/static/js/jquery/popup.js
View file @ 5d472df2
...@@ -3,46 +3,66 @@ ...@@ -3,46 +3,66 @@
// //
(function ($, document, window) { (function ($, document, window) {
var isShow = null;
var showDelayTimer = null;
$.extend($.fn, { $.extend($.fn, {
Popup: function(msg, option) { Popup: function(msg, option) {
var h;
if (option.type == undefined) option.type = "info"; if (option.type == undefined) option.type = "info";
if (option.closebtn == undefined) option.closebtn = false; if (option.closebtn == undefined) option.closebtn = false;
if (option.duration == undefined) option.duration = 0; if (option.duration == undefined) option.duration = 0;
if (option.load == undefined) option.load = false; if (option.load == undefined) option.load = false;
$box = $(this); $box = $(this);
$box.empty(); if(showDelayTimer){clearTimeout(showDelayTimer);}
$box.css('top','-1000px'); if(isShow){
$box.show(); $box.fadeOut('normal', function() {
$box.append('<div><table id="bcontent"><tr>' + setupBox();
'<td valign="middle" class="logo ' + option.type + '_message"></td>' + });
'<td valign="middle"><p>' + msg + '</p></td>' +
'<td valign="middle" class="b_close"><span id="pClose"></span></td></tr></table></div>');
$(window).scroll(function(){
$box.animate({top:$(window).scrollTop()+"px" },{queue: false, duration: 350});
});
var h = $("#bcontent").height()+5;
$("#pClose").bind("click", function() {
close();
});
if(option.load){
$(window).load(function(){
$box.css('top', + ($(window).scrollTop() - h) +'px');
$box.animate({ top:"+=" + h + "px" }, "slow");
});
} }
else{ else{setupBox();}
$box.css('top', + ($(window).scrollTop() - h) +'px'); function setupBox(){
$box.animate({ top:"+=" + h + "px" }, "slow"); $box.empty();
$box.css('top','-1000px');
$box.show();
$box.append('<div><table id="bcontent"><tr>' +
'<td valign="middle" class="logo ' + option.type + '_message"></td>' +
'<td valign="middle"><p>' + msg + '</p></td>' +
'<td valign="middle" class="b_close"><span id="pClose"></span></td></tr></table></div>');
$(window).scroll(function(){
$box.animate({top:$(window).scrollTop()+"px" },{queue: false, duration: 350});
});
h = $("#bcontent").height()+5;
$("#pClose").bind("click", function() {
close();
});
showBox();
if(option.duration != 0){
showDelayTimer = setTimeout(function(){
showDelayTimer = null;
close();
}, option.duration);
}
} }
if(option.duration != 0){ function showBox(){
setTimeout(function(){ if(option.load){
close(); $(window).load(function(){
}, option.duration); $box.css('top', + ($(window).scrollTop() - h) +'px');
$box.animate({ top:"+=" + h + "px" }, "slow");
isShow = true;
});
}
else{
$box.css('top', + ($(window).scrollTop() - h) +'px');
$box.animate({ top:"+=" + h + "px" }, "slow");
isShow = true;
}
} }
function close(){ function close(){
$box.animate({ top:"-=" + h + "px" }, "slow", function(){ $box.animate({ top:"-=" + h + "px" }, "slow", function(){
$box.fadeOut("normal"); $box.fadeOut("normal", function() {
}); isShow = false;
});
});
} }
} }
}); });
......
slapos/runner/static/js/scripts/inspectInstance.js
View file @ 5d472df2
...@@ -13,7 +13,8 @@ $(document).ready( function() { ...@@ -13,7 +13,8 @@ $(document).ready( function() {
configRadio(); configRadio();
}); });
}); });
lastli.css("border-bottom", "none"); if(lastli){lastli.css("border-bottom", "none");}
$("#parameterkw").slideBox("show"); $("#parameterkw").slideBox("show");
setupSlappart(); setupSlappart();
$("#softwareType").slideBox(); $("#softwareType").slideBox();
......
slapos/runner/templates/cloneRepository.html
View file @ 5d472df2
...@@ -3,64 +3,77 @@ ...@@ -3,64 +3,77 @@
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<link href="{{ url_for('static', filename='css/jqueryFileTree.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" /> <link href="{{ url_for('static', filename='css/jqueryFileTree.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
<link href="{{ url_for('static', filename='css/jqueryTabs.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
<script src="{{ url_for('static', filename='js/jquery/jqueryFileTree.js') }}" type="text/javascript" charset="utf-8"></script> <script src="{{ url_for('static', filename='js/jquery/jqueryFileTree.js') }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ url_for('static', filename='js/scripts/folder.js') }}" type="text/javascript" charset="utf-8"></script> <script src="{{ url_for('static', filename='js/scripts/folder.js') }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ url_for('static', filename='js/jquery/jqueryTabs.js') }}" type="text/javascript" charset="utf-8"></script>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<h2>Clone a repository into your workspace</h2><br/>
<h2 class='title'>Clone your repository into the workspace</h2><br/> <div id="tabContaier">
<div id="repository" style="margin-left:40px;"> <ul>
<label for='name'>Project name*: </label> <li><a href="#tab1" class="active">Clone your repository</a></li>
<input type="text" name="name" id="name" size='20' value="Enter the project name..." /> <li><a href="#tab2">Manage your project folder</a></li>
<label for='repo'>&nbsp;url*: &nbsp;&nbsp;</label> </ul><!-- //Tab buttons -->
<input type="text" name="repo" id="repo" size='25' value="Enter the url of your repository..." /><br/> <div class="tabDetails">
<label for='user'>Your name: &nbsp;&nbsp;&nbsp;&nbsp;</label> <div id="tab1" class="tabContents">
<input type="text" name="user" id="user" size='20' value="{{name}}" /> <div id="repository" style="margin-left:40px;">
<label for='email'>Email: </label> <label for='name'>Project name*: </label>
<input type="text" name="email" id="email" size='25' value="{% if not email %}Enter your email adress...{% else %}{{email}}{%endif%}" /> <input type="text" name="name" id="name" size='20' value="Enter the project name..." />
<input type="hidden" name="workdir" id="workdir" value="{{workDir}}" /> <label for='repo'>&nbsp;url*: &nbsp;&nbsp;</label>
<button class="button" id="clone">clone</button> <input type="text" name="repo" id="repo" size='25' value="Enter the url of your repository..." /><br/>
<img class="waitting" id="imgwaitting" src="{{ url_for('static', filename='images/waiting.gif') }}" alt="" /> <label for='user'>Your name: &nbsp;&nbsp;&nbsp;&nbsp;</label>
<br/><br/> <input type="text" name="user" id="user" size='20' value="{{name}}" />
</div> <label for='email'>Email: </label>
<h2>Set your Security Mode</h2> <input type="text" name="email" id="email" size='25' value="{% if not email %}Enter your email adress...{% else %}{{email}}{%endif%}" />
<div class="menu-box-right"> <input type="hidden" name="workdir" id="workdir" value="{{workDir}}" />
<div style="background:#fff; padding:10px; min-height:100px; font-size:14px;"> <button class="button" id="clone">clone</button>
<div id="box0"> <img class="waitting" id="imgwaitting" src="{{ url_for('static', filename='images/waiting.gif') }}" alt="" />
<h2>Clone Repository without using HTTPS and SSH</h2><br/> <br/><br/>
<p>Choose this mode if you don't have login and password for the repository and you if you don't have the possibility to </div>
use SSH authentication. Otherwise use your public key or your login and password to clone your project by choosing https or ssh mode. Note <br/>
that, with readonly mode you can not be able to push your changes.</p> <h2>Set your Security Mode</h2>
<br/> <div class="menu-box-right" style="width: 592px;">
</div> <div style="background:#fff; padding:10px; min-height:100px; font-size:14px;">
<div id="box1" style="display:none"> <div id="box0">
<h2>You can use this public key to setup your repository</h2><br/> <h2>Clone Repository without using HTTPS and SSH</h2><br/>
<textarea class="public_key" readonly> <p>Choose this mode if you don't have login and password for the repository and you if you don't have the possibility to
{{public_key}} use SSH authentication. Otherwise use your public key or your login and password to clone your project by choosing https or ssh mode. Note
</textarea> that, with readonly mode you can not be able to push your changes.</p>
</div> <br/>
<div id="box2" style="display:none;"> </div>
<h2>Enter your username and password for https authentication access</h2><br/> <div id="box1" style="display:none">
<div style="margin-left:80px; margin-bottom:20px;"> <h2>You can use this public key to setup your repository</h2><br/>
<label for='username'>Your username:&nbsp;&nbsp;</label> <textarea class="mb_style public_key" readonly>
<input type="text" name="username" id="username" size='20' value="Enter your username..." /><br/><br/> {{public_key}}
<label for='password'>Your password: &nbsp;&nbsp;</label> </textarea>
<input type="password" name="password" id="password" size='20' value="" class="idleField" /> </div>
</div> <div id="box2" style="display:none;">
<p></p> <h2>Enter your username and password for https authentication access</h2><br/>
</div> <div style="margin-left:80px; margin-bottom:20px;">
</div> <label for='username'>Your username:&nbsp;&nbsp;</label>
</div> <input type="text" name="username" id="username" size='20' value="Enter your username..." /><br/><br/>
<div class="menu-box-left"> <label for='password'>Your password: &nbsp;&nbsp;</label>
<ul id="modelist"> <input type="password" name="password" id="password" size='20' value="" class="idleField" />
<li class="checked"><input type="radio" name="security" id="nothing" value="nothing" /><label for="nothing">ReadOnly</label></li> </div>
<li><input type="radio" name="security" id="ssh" value="SSH" checked /><label for="ssh">SSH Mode</label></li> <p></p>
<li style="border-bottom:none"><input type="radio" name="security" id="https" value="HTTPS" /><label for="https">Https Mode</label></li> </div>
</ul> </div>
</div> </div>
<div class="clear"></div><br/> <div class="menu-box-left" style="width: 115px;">
<div id="file_navigation"> <ul id="modelist">
<h2 class='title'>Your project folder</h2><br/> <li class="checked"><input type="radio" name="security" id="nothing" value="nothing" /><label for="nothing">ReadOnly</label></li>
<div id="fileTree" class="file_tree"></div> <li><input type="radio" name="security" id="ssh" value="SSH" checked /><label for="ssh">SSH Mode</label></li>
<li style="border-bottom:none"><input type="radio" name="security" id="https" value="HTTPS" /><label for="https">Https Mode</label></li>
</ul>
</div>
<div class="clear"></div><br/>
<!--Fin tab1-->
</div>
<div id="tab2" class="tabContents">
<h2>Content of your cloned project</h2><br/>
<div id="fileTree" class="file_tree_tabs"></div>
</div>
</div>
</div> </div>
{% endblock %} {% endblock %}
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7