Commit 5d472df2 authored by Alain Takoudjou's avatar Alain Takoudjou

Update webrunner UI, fix JavaScript error

parent 51ab20f4
...@@ -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;
......
...@@ -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;
......
...@@ -3,13 +3,24 @@ ...@@ -3,13 +3,24 @@
// //
(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);
if(showDelayTimer){clearTimeout(showDelayTimer);}
if(isShow){
$box.fadeOut('normal', function() {
setupBox();
});
}
else{setupBox();}
function setupBox(){
$box.empty(); $box.empty();
$box.css('top','-1000px'); $box.css('top','-1000px');
$box.show(); $box.show();
...@@ -20,28 +31,37 @@ ...@@ -20,28 +31,37 @@
$(window).scroll(function(){ $(window).scroll(function(){
$box.animate({top:$(window).scrollTop()+"px" },{queue: false, duration: 350}); $box.animate({top:$(window).scrollTop()+"px" },{queue: false, duration: 350});
}); });
var h = $("#bcontent").height()+5; h = $("#bcontent").height()+5;
$("#pClose").bind("click", function() { $("#pClose").bind("click", function() {
close(); close();
}); });
showBox();
if(option.duration != 0){
showDelayTimer = setTimeout(function(){
showDelayTimer = null;
close();
}, option.duration);
}
}
function showBox(){
if(option.load){ if(option.load){
$(window).load(function(){ $(window).load(function(){
$box.css('top', + ($(window).scrollTop() - h) +'px'); $box.css('top', + ($(window).scrollTop() - h) +'px');
$box.animate({ top:"+=" + h + "px" }, "slow"); $box.animate({ top:"+=" + h + "px" }, "slow");
isShow = true;
}); });
} }
else{ else{
$box.css('top', + ($(window).scrollTop() - h) +'px'); $box.css('top', + ($(window).scrollTop() - h) +'px');
$box.animate({ top:"+=" + h + "px" }, "slow"); $box.animate({ top:"+=" + h + "px" }, "slow");
isShow = true;
} }
if(option.duration != 0){
setTimeout(function(){
close();
}, option.duration);
} }
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;
});
}); });
} }
} }
......
...@@ -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();
......
...@@ -3,28 +3,37 @@ ...@@ -3,28 +3,37 @@
{% 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}}" />
<button class="button" id="clone">clone</button>
<img class="waitting" id="imgwaitting" src="{{ url_for('static', filename='images/waiting.gif') }}" alt="" />
<br/><br/>
</div>
<br/>
<h2>Set your Security Mode</h2>
<div class="menu-box-right" style="width: 592px;">
<div style="background:#fff; padding:10px; min-height:100px; font-size:14px;"> <div style="background:#fff; padding:10px; min-height:100px; font-size:14px;">
<div id="box0"> <div id="box0">
<h2>Clone Repository without using HTTPS and SSH</h2><br/> <h2>Clone Repository without using HTTPS and SSH</h2><br/>
...@@ -35,7 +44,7 @@ ...@@ -35,7 +44,7 @@
</div> </div>
<div id="box1" style="display:none"> <div id="box1" style="display:none">
<h2>You can use this public key to setup your repository</h2><br/> <h2>You can use this public key to setup your repository</h2><br/>
<textarea class="public_key" readonly> <textarea class="mb_style public_key" readonly>
{{public_key}} {{public_key}}
</textarea> </textarea>
</div> </div>
...@@ -50,17 +59,21 @@ ...@@ -50,17 +59,21 @@
<p></p> <p></p>
</div> </div>
</div> </div>
</div> </div>
<div class="menu-box-left"> <div class="menu-box-left" style="width: 115px;">
<ul id="modelist"> <ul id="modelist">
<li class="checked"><input type="radio" name="security" id="nothing" value="nothing" /><label for="nothing">ReadOnly</label></li> <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> <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> <li style="border-bottom:none"><input type="radio" name="security" id="https" value="HTTPS" /><label for="https">Https Mode</label></li>
</ul> </ul>
</div> </div>
<div class="clear"></div><br/> <div class="clear"></div><br/>
<div id="file_navigation"> <!--Fin tab1-->
<h2 class='title'>Your project folder</h2><br/> </div>
<div id="fileTree" class="file_tree"></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