Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show Upload Options on Table when no slides #249

Merged
merged 7 commits into from
Mar 25, 2020
Merged

Show Upload Options on Table when no slides #249

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39d2d68
Merge pull request #245 from camicroscope/develop
birm Mar 23, 2020
b47f925
fixed missing id in app/signup/signup.html
AbdulRashidReshamwala Mar 25, 2020
4c8538e
added missing id attribute to in put field in apps/signup/signup.html
AbdulRashidReshamwala Mar 25, 2020
2fe35d6
fixed missing id attribute of email input field in apps/signup/signu…
AbdulRashidReshamwala Mar 25, 2020
f559624
fixed issue where upload and reload pages would not show if there was…
AbdulRashidReshamwala Mar 25, 2020
c8c76c2
fix upload issues
AbdulRashidReshamwala Mar 25, 2020
a488301
Moved buttons above the table
AbdulRashidReshamwala Mar 25, 2020
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
2 changes: 1 addition & 1 deletion apps/landing/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ <h3>Source Code</h3>



</html>
</html>
4 changes: 2 additions & 2 deletions apps/signup/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<H1>User Signup</H1>

<div class="txtb">
<input type="text" onblur="validateEmail(this);" placeholder="Email" >
<input id="name" type="text" onblur="validateEmail(this);" placeholder="Email" >
</div>
<div class="txtb">
<input id="collections" type="text" placeholder="['list','of','collections']">
Expand Down Expand Up @@ -113,4 +113,4 @@ <H1>User Signup</H1>
}
</script>
</body>
</html>
</html>
143 changes: 72 additions & 71 deletions apps/table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,87 +100,88 @@ <h3 class="text-center h3 mb-0">Available Slides</h3>
</select>
<input id="search-table" type="text" class="form-control" placeholder="Search&hellip;">
</div>
<button type="button" class="btn btn-success float-right mb-2"
onclick="(()=>{location.reload();return false;})()">Reload</button>
<button type="button" class="btn btn-primary float-right mb-2 mr-2" data-toggle="modal"
data-target="#upload-dialog">Upload</button>
</div>
</div>
<table id='datatables' class="table table-striped"></table>
</div>



</div>
<button type="button" class="btn btn-success float-right mb-2"
onclick="(()=>{location.reload();return false;})()">Reload</button>
<button type="button" class="btn btn-primary float-right mb-2 mr-2" data-toggle="modal"
data-target="#upload-dialog">Upload</button>
<div class="modal fade" id="upload-dialog" tabindex="-1" role="dialog"
aria-labelledby="title-of-dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="title-of-dialog">Upload New Slide</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div>
<div id="upload_form">
<div class="alert alert-info" role="alert">

<h3>Steps for uploading.</h3>
<ul>
<li>Select the file as Input. The <b>Token</b> field should be filled automatically, and start uploading.</li>
<li> Provide the destination filename with extension.</li>
<li>Click on the <b>Finish Upload</b> to complete the upload </li>
<li>Finally <b>Post</b> it to caMicroscope</li>
</ul>
</div>
<div>
<form>
<table class="table table-borderless" cellpadding="5" cellspacing="0">
<tr>
<td align="right"><b>Files</b></td>
<td id="fileUploadInput"><input type="file" id="input"
onchange="handle_upload(this.files)" multiple></td>
</tr>
<tr id="fileIdRow">
<td align="right"><b>ID</b></td>
</tr>
<tr id="filenameRow">
<td align="right"><b>Filename</b></td>
</tr>
<tr id="tokenRow">
<td align="right"><b>Token</b></td>
</tr>
<tr id="slidenameRow">
<td align="right"><b>Slidename</b></td>
</tr>
</table>

<div class="text-center">
<button class="btn btn-primary" type="button" id="finish_btn"
value="Finish Upload" onclick="validateForm(finish_upload)">Finish
Upload</button>
<button class="btn btn-secondary" type="button" id="check_btn"
value="Check" onclick="CheckBtn()">Check</button>
<button class="btn btn-success" type="button" id="post_btn" value="Post"
onclick="validateForm(PostBtn)">Post</button>
</div>

</form>
</div>
<div class="text-center p-2">
<div id="load_status" class="p-1"></div>
<div id="json_table"></div>
</div>
aria-labelledby="title-of-dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="title-of-dialog">Upload New Slide</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div>
<div id="upload_form">
<div class="alert alert-info" role="alert">

<h3>Steps for uploading.</h3>
<ul>
<li>Select the file as Input. The <b>Token</b> field should be filled automatically, and start uploading.</li>
<li> Provide the destination filename with extension.</li>
<li>Click on the <b>Finish Upload</b> to complete the upload </li>
<li>Finally <b>Post</b> it to caMicroscope</li>
</ul>
</div>
<div>
<form>
<table class="table table-borderless" cellpadding="5" cellspacing="0">
<tr>
<td align="right"><b>Files</b></td>
<td id="fileUploadInput"><input type="file" id="input"
onchange="handle_upload(this.files)" multiple></td>
</tr>
<tr id="fileIdRow">
<td align="right"><b>ID</b></td>
</tr>
<tr id="filenameRow">
<td align="right"><b>Filename</b></td>
</tr>
<tr id="tokenRow">
<td align="right"><b>Token</b></td>
</tr>
<tr id="slidenameRow">
<td align="right"><b>Slidename</b></td>
</tr>
</table>

<div class="text-center">
<button class="btn btn-primary" type="button" id="finish_btn"
value="Finish Upload" onclick="validateForm(finish_upload)">Finish
Upload</button>
<button class="btn btn-secondary" type="button" id="check_btn"
value="Check" onclick="CheckBtn()">Check</button>
<button class="btn btn-success" type="button" id="post_btn" value="Post"
onclick="validateForm(PostBtn)">Post</button>
</div>

</form>
</div>
<div class="text-center p-2">
<div id="load_status" class="p-1"></div>
<div id="json_table"></div>
</div>
</div>

</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>

</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div>
</div>

</div>

</div>

<div class="text-center text-white bg-dark p-3" style="position: static;bottom: 0;width: 100%;">
Expand Down