Skip to content
This repository has been archived by the owner on Jun 8, 2023. It is now read-only.

Add spinner for token input #78

Merged
merged 3 commits into from
Jun 8, 2016
Merged

Add spinner for token input #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8aac439
Add spinner for token input
jin8 Jun 8, 2016
c793534
Merge branch 'develop' of https://github.com/AutoDo/AutoDo
jin8 Jun 8, 2016
2916da4
Changed main.html
jin8 Jun 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 51 additions & 6 deletions AutoDoApp/templates/AutoDoApp/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel='stylesheet' href='https://code.getmdl.io/1.1.3/material.indigo-pink.min.css'>
<script defer src='https://code.getmdl.io/1.1.3/material.min.js'></script>
<script src='https://ajax.googleapis.com/ajax/libs/jquery/1.12.2/jquery.min.js'></script>
<!--
<!--
<link rel='stylesheet' href='static/css/styles.css'>
<link rel='stylesheet' href='static/css/dialog-polyfill.css'>
<script src="static/js/main.js"></script>
Expand All @@ -25,7 +25,6 @@
<script src="{% static 'AutoDoApp/js/dialog-polyfill.js' %}"></script>
<script src="{% static 'AutoDoApp/js/js.cookie.js' %}"></script>


<title>AutoDo</title>
</head>
<body class='project mdl-color--grey-100 mdl-color-text--grey-700 mdl-base'>
Expand Down Expand Up @@ -65,7 +64,7 @@ <h5> {{ item.project_name }} &nbsp; <a href="{{ item.project_url }}">{{ item.pro
<div class='mdl-cell mdl-cell--6-col'>
<label class='mdl-switch mdl-js-switch mdl-js-ripple-effect'>
<span class='mdl-switch__label'>Update on Every Commit</span>
<input type='checkbox' class='mdl-switch__input' checked>
<input type='checkbox' class='mdl-switch__input'>
</label>
</div>
<div class='mdl-cell mdl-cell--6-col right'>
Expand Down Expand Up @@ -127,13 +126,17 @@ <h6>Introduction</h6>
<dialog id="dialog-token" class="mdl-dialog">
<div class="mdl-dialog__content">
<form>
<div class="mdl-textfield mdl-js-textfield">
<div class="mdl-textfield mdl-js-textfield token-input">
<input class="mdl-textfield__input" type="text" id="token">
<label class="mdl-textfield__label" for="token">Token...</label>
</div>
<div id="spinner-token" class="mdl-spinner mdl-js-spinner is-active" style="display:none;"></div>
<p id="token-result" style="display:none;"> Complete saving </p>

<div class="right">
<button class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect token-save'>save</button>
<button class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect token-cancel'>cancel</button>
<button class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect token-done' style="display:none;">done</button>
</div>


Expand All @@ -145,7 +148,7 @@ <h6>Introduction</h6>

<div class="mdl-dialog__content">
<p id="status">Generating a Document</p>
<div id="spinner" class="mdl-spinner mdl-js-spinner is-active"></div>
<div id="spinner-generate" class="mdl-spinner mdl-js-spinner is-active"></div>
<div class="right">
<button class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect generate-ok'>okay</button>
</div>
Expand Down Expand Up @@ -190,8 +193,50 @@ <h6>Introduction</h6>
});
$('.token-save').click(function(event){
event.preventDefault();
$("#spinner-token").show();
$(".token-input").hide();
$(".token-cancel").hide();
$(".token-save").hide();


//ajax

$.ajax({
url: "../generate/",
type: "POST",
data: JSON.stringify({"github_url": url,
"desc": project_description}),
contentType: 'application/json; charset=utf-8',
beforeSend: function (xhr) {
dialog_generate.showModal();
},
error: function (result) {

},
success: function (result) {

},
complete: function (result) {
$("#spinner-token").hide();
$("#token-result").show();
$('.token-done').show();

//dialog_generate.close();
//dialog_generate.close();
},
timeout: 10000 //10 second
});




});

$('.token-done').click(function(event){
event.preventDefault();
dialog_token.close();
});

$(".generate-ok").click(function(event){
event.preventDefault();
dialog_generate.close();
Expand Down Expand Up @@ -226,7 +271,7 @@ <h6>Introduction</h6>

},
complete: function (result) {
$("#spinner").hide();
$("#spinner-generate").hide();
$(".generate-ok").show();

//dialog_generate.close();
Expand Down
4 changes: 3 additions & 1 deletion static/AutoDoApp/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
$(document).ready(function() {
$("body").on("click",".edit",function(event) {
alert("edit");
event.preventDefault();
var edit = $(this);
var save =edit.next();
Expand All @@ -23,6 +24,7 @@ $(document).ready(function() {
});

$('body').on("click",".save",function(event) {
alert("save");
event.preventDefault();
var save = $(this);
var edit = $(this).prev();
Expand Down Expand Up @@ -60,7 +62,7 @@ $(document).ready(function() {
"<div class='mdl-cell mdl-cell--6-col'>"+
"<label class='mdl-switch mdl-js-switch mdl-js-ripple-effect'>"+
"<span class='mdl-switch__label'>Update on Every Commit</span>"+
"<input type='checkbox' class='mdl-switch__input' checked>"+
"<input type='checkbox' class='mdl-switch__input'>"+
"</label>"+
"</div>"+
"<div class='mdl-cell mdl-cell--6-col right'>"+
Expand Down